CVS commit: pkgsrc/lang/gcc9

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Feb  5 10:28:40 UTC 2021

Modified Files:
        pkgsrc/lang/gcc9: Makefile
Removed Files:
        pkgsrc/lang/gcc9: PLIST PLIST.Darwin-x86_64 PLIST.Linux-x86_64
            PLIST.NetBSD-x86_64

Log Message:
lang/gcc9: return to generated PLIST, we don't have an answer to include-fixed

Remove workaround for RHEL 7. This workaround resulted in gcc/configure
failing to find dlfcn.h. The build doesn't appear to need it.

Fixes install on both Fedora 33 and CentOS 7 (the docker image, at least).


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/gcc9/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/lang/gcc9/PLIST
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/gcc9/PLIST.Darwin-x86_64
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/gcc9/PLIST.Linux-x86_64
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/gcc9/PLIST.NetBSD-x86_64

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.25 pkgsrc/lang/gcc9/Makefile:1.26
--- pkgsrc/lang/gcc9/Makefile:1.25      Fri Dec  4 20:45:26 2020
+++ pkgsrc/lang/gcc9/Makefile   Fri Feb  5 10:28:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/12/04 20:45:26 nia Exp $
+# $NetBSD: Makefile,v 1.26 2021/02/05 10:28:40 maya Exp $
 
 GCC_PKGNAME=   gcc9
 .include "version.mk"
@@ -42,16 +42,6 @@ CHECK_PORTABILITY_SKIP+=     contrib/* # not
 
 .include "../../mk/bsd.prefs.mk"
 
-# Prevent compilation error on RedHat EL 7:
-#
-# compute_powtab.c: In function 'mpn_compute_powtab_mul':
-# compute_powtab.c:142:3: error: 'for' loop initial declarations are only allowed in C99 mode
-#    for (long pi = start_idx; pi >= 0; pi--)
-#
-# I know that -std is not a preprocessor flag, but gcc9 ignores the CFLAGS,
-# for whatever reason.
-CPPFLAGS.Linux+=       -std=gnu99
-
 # Even though the build and target host is x86_64-sun-solaris2.11,
 # it fails to compile some seemingly linux-specific code.
 # https://bugs.llvm.org/show_bug.cgi?id=44665
@@ -199,12 +189,9 @@ 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}"); }
+GENERATE_PLIST+= \
+        cd ${DESTDIR}${PREFIX} && \
+        ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"