CVS commit: pkgsrc/devel/binutils

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Tue Mar 10 19:01:31 UTC 2020

Modified Files:
        pkgsrc/devel/binutils: Makefile PLIST.common

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/devel/binutils/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/binutils/PLIST.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/binutils/Makefile
diff -u pkgsrc/devel/binutils/Makefile:1.79 pkgsrc/devel/binutils/Makefile:1.80
--- pkgsrc/devel/binutils/Makefile:1.79 Wed Feb  5 06:18:34 2020
+++ pkgsrc/devel/binutils/Makefile      Tue Mar 10 19:01:31 2020
@@ -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 @@ INSTALLATION_DIRS=    ${PKGGNUDIR}bin ${PKG
 
 # 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.ld=    yes
 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].*)) \

Index: pkgsrc/devel/binutils/PLIST.common
diff -u pkgsrc/devel/binutils/PLIST.common:1.29 pkgsrc/devel/binutils/PLIST.common:1.30
--- pkgsrc/devel/binutils/PLIST.common:1.29     Wed Feb  5 06:18:34 2020
+++ pkgsrc/devel/binutils/PLIST.common  Tue Mar 10 19:01:31 2020
@@ -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/ansidecl.h
 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 @@ info/binutils.info
 ${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