CVS commit: pkgsrc/lang/gcc9

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Jan  6 15:43:51 UTC 2020

Modified Files:
        pkgsrc/lang/gcc9: Makefile PLIST

Log Message:
lang/gcc9: fix build on NetBSD-9.0_RC1-amd64

gcc9 needs to install the fixed malloc.h in that configuration.
On NetBSD-8.0-amd64 this was not necessary though.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc9/Makefile pkgsrc/lang/gcc9/PLIST

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

Modified files:

Index: pkgsrc/lang/gcc9/Makefile
diff -u pkgsrc/lang/gcc9/Makefile:1.1 pkgsrc/lang/gcc9/Makefile:1.2
--- pkgsrc/lang/gcc9/Makefile:1.1       Sun Jan  5 21:15:45 2020
+++ pkgsrc/lang/gcc9/Makefile   Mon Jan  6 15:43:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/05 21:15:45 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2020/01/06 15:43:51 rillig Exp $
 
 GCC9_PKGBASE=  gcc9
 GCC9_VERSION=  9.2.0
@@ -180,6 +180,11 @@ post-install:
        ${TEST} -f ${DESTDIR}${GCC9_PREFIX}/bin/cc \
        || (cd ${DESTDIR}${GCC9_PREFIX}/bin && ${LN} -f gcc cc)
 
+PLIST_VARS+=           fixed-malloc
+.if ${MACHINE_PLATFORM:MNetBSD-9.*-*}
+PLIST.fixed-malloc=    yes
+.endif
+
 PRINT_PLIST_AWK+=      { gsub("${MACHINE_GNU_PLATFORM}", "$${MACHINE_GNU_PLATFORM}"); }
 
 .include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/lang/gcc9/PLIST
diff -u pkgsrc/lang/gcc9/PLIST:1.1 pkgsrc/lang/gcc9/PLIST:1.2
--- pkgsrc/lang/gcc9/PLIST:1.1  Sun Jan  5 21:15:45 2020
+++ pkgsrc/lang/gcc9/PLIST      Mon Jan  6 15:43:51 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/01/05 21:15:45 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/01/06 15:43:51 rillig Exp $
 gcc9/bin/c++
 gcc9/bin/cc
 gcc9/bin/cpp
@@ -834,6 +834,7 @@ gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${P
 gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/README
 gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/curses.h
 gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/limits.h
+${PLIST.fixed-malloc}gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/malloc.h
 gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/math.h
 gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_fil.h
 gcc9/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_lookup.h