pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/binutils devel/binutils: Unbreak build on Linux



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a1ff8642ae2
branches:  trunk
changeset: 412643:8a1ff8642ae2
user:      bacon <bacon%pkgsrc.org@localhost>
date:      Tue Mar 10 19:01:31 2020 +0000

description:
devel/binutils: Unbreak build on Linux

Currently libctf builds but does not install on Linux.
The Linux implementation of libctf is very new, so we disable it in pkgsrc
for now pending future updates and thorough testing.

diffstat:

 devel/binutils/Makefile     |  10 ++++++++--
 devel/binutils/PLIST.common |  10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r 2264904fc70f -r 8a1ff8642ae2 devel/binutils/Makefile
--- a/devel/binutils/Makefile   Tue Mar 10 18:14:17 2020 +0000
+++ b/devel/binutils/Makefile   Tue Mar 10 19:01:31 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2020/02/05 06:18:34 rillig Exp $
+# $NetBSD: Makefile,v 1.80 2020/03/10 19:01:31 bacon Exp $
 
 DISTNAME=      binutils-2.34
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=binutils/}
 EXTRACT_SUFX=  .tar.bz2
@@ -50,7 +51,7 @@
 
 # gprof (XXX: and others?) cannot be built on all platforms
 #
-PLIST_VARS+=   gprof ld gold SunOS
+PLIST_VARS+=   gprof ld gold SunOS CTF
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -66,6 +67,11 @@
 PLIST.SunOS=   yes
 .endif
 
+# Temporary: libctf should be mature on Linux in the near future
+.if ${OPSYS} != Linux
+PLIST.CTF=     yes
+.endif
+
 .if ${OPSYS} == DragonFly \
        || (${OPSYS} == FreeBSD && empty(OS_VERSION:M[12345678].*)) \
        || (${OPSYS} == OpenBSD && empty(OS_VERSION:M[1234].*)) \
diff -r 2264904fc70f -r 8a1ff8642ae2 devel/binutils/PLIST.common
--- a/devel/binutils/PLIST.common       Tue Mar 10 18:14:17 2020 +0000
+++ b/devel/binutils/PLIST.common       Tue Mar 10 19:01:31 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.29 2020/02/05 06:18:34 rillig Exp $
+@comment $NetBSD: PLIST.common,v 1.30 2020/03/10 19:01:31 bacon Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
@@ -68,8 +68,8 @@
 include/bfd.h
 include/bfd_stdint.h
 include/bfdlink.h
-include/ctf-api.h
-include/ctf.h
+${PLIST.CTF}include/ctf-api.h
+${PLIST.CTF}include/ctf.h
 include/diagnostics.h
 include/dis-asm.h
 include/plugin-api.h
@@ -80,8 +80,8 @@
 ${PLIST.gprof}info/gprof.info
 info/ld.info
 lib/libbfd.la
-lib/libctf-nobfd.la
-lib/libctf.la
+${PLIST.CTF}lib/libctf-nobfd.la
+${PLIST.CTF}lib/libctf.la
 lib/libopcodes.la
 man/man1/gaddr2line.1
 man/man1/gar.1



Home | Main Index | Thread Index | Old Index