CVS commit: pkgsrc/lang/gcc9

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 29 09:03:15 UTC 2023

Modified Files:
        pkgsrc/lang/gcc9: Makefile distinfo options.mk version.mk
Removed Files:
        pkgsrc/lang/gcc9/patches: patch-gcc_gimplify.c

Log Message:
gcc9: update to 9.5.0.

2 years of bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/gcc9/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc9/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc9/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc9/version.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/gcc9/patches/patch-gcc_gimplify.c

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.41 pkgsrc/lang/gcc9/Makefile:1.42
--- pkgsrc/lang/gcc9/Makefile:1.41      Sun Jan  1 12:59:39 2023
+++ pkgsrc/lang/gcc9/Makefile   Sun Jan 29 09:03:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2023/01/01 12:59:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.42 2023/01/29 09:03:15 wiz Exp $
 
 GCC_PKGNAME=   gcc9
 .include "version.mk"
@@ -8,7 +8,6 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC9_DIST_VERS
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc9-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=   10
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC9_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
@@ -204,7 +203,7 @@ GENERATE_PLIST+= \
 CHECK_BUILTIN.zlib:=   yes
 .include "../../devel/zlib/builtin.mk"
 CHECK_BUILTIN.zlib:=   no
-.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
+.if ${USE_BUILTIN.zlib:tl} == yes
 CONFIGURE_ARGS+=       --with-system-zlib
 .include "../../devel/zlib/buildlink3.mk"
 .else

Index: pkgsrc/lang/gcc9/distinfo
diff -u pkgsrc/lang/gcc9/distinfo:1.10 pkgsrc/lang/gcc9/distinfo:1.11
--- pkgsrc/lang/gcc9/distinfo:1.10      Sun Jan  1 12:59:39 2023
+++ pkgsrc/lang/gcc9/distinfo   Sun Jan 29 09:03:15 2023
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.10 2023/01/01 12:59:39 tsutsui Exp $
+$NetBSD: distinfo,v 1.11 2023/01/29 09:03:15 wiz Exp $
 
-BLAKE2s (gcc-9.3.0.tar.xz) = 5c639411181a47ee872fb45b59ad686402f6422c6cdcfdac995925b58c9373ad
-SHA512 (gcc-9.3.0.tar.xz) = 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-Size (gcc-9.3.0.tar.xz) = 70533868 bytes
+BLAKE2s (gcc-9.5.0.tar.xz) = 9b2a0eb5aedbaa8a5a09f96fa2bd09cdf7ab22a4c35a89799f55a90dc0ee45d8
+SHA512 (gcc-9.5.0.tar.xz) = cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
+Size (gcc-9.5.0.tar.xz) = 72462752 bytes
 SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
 SHA1 (patch-gcc_config_sparc_sparc.c) = a415d1b23d6bf0c9c3c492787274929a291b78f2
-SHA1 (patch-gcc_gimplify.c) = f933a033d4a6c11fa82c8c9c6785842ba7993862
 SHA1 (patch-gcc_targhooks.c) = af240cc417e479741d5067063904f827a02295cc
 SHA1 (patch-libgfortran_io_format.c) = 9bbc5e4f6277bdec785b3690fd08259939a2aa1a
 SHA1 (patch-libgfortran_io_list__read.c) = 589cdb8dcd180b781ededc086e8775224fca5779

Index: pkgsrc/lang/gcc9/options.mk
diff -u pkgsrc/lang/gcc9/options.mk:1.5 pkgsrc/lang/gcc9/options.mk:1.6
--- pkgsrc/lang/gcc9/options.mk:1.5     Thu May 14 19:19:13 2020
+++ pkgsrc/lang/gcc9/options.mk Sun Jan 29 09:03:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/05/14 19:19:13 joerg Exp $
+# $NetBSD: options.mk,v 1.6 2023/01/29 09:03:15 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc9
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -42,7 +42,6 @@ PKG_SUGGESTED_OPTIONS+=       gcc-multilib
 ###
 ### Don't install libgcc if it's older than the system one
 ###
-PLIST_VARS+=           libgcc
 .if !${PKG_OPTIONS:Malways-libgcc}
 
 .  for dir in ${_OPSYS_LIB_DIRS}
@@ -62,27 +61,21 @@ post-install: delete-installed-libgcc
 
 delete-installed-libgcc: .PHONY
        ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete
-.  else
-PLIST.libgcc=          yes
 .  endif
-.else
-PLIST.libgcc=          yes
 .endif
 
 .if ${PLIST.libgcc:Uno} == "yes"
-LDFLAGS+=      -Wl,-rpath,${PREFIX}/gcc9/lib
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/gcc9/lib
 .endif
 
 ###
 ### Native Language Support
 ###
-PLIST_VARS+=           nls
 .if ${PKG_OPTIONS:Mnls}
 USE_TOOLS+=            msgfmt
 CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=             ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
-PLIST.nls=             yes
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .else
@@ -114,7 +107,6 @@ LIBS.SunOS+=                -lgmp
 .  include "../../math/mpfr/buildlink3.mk"
 .endif
 
-PLIST_VARS+=           objcxx
 .if ${PKG_OPTIONS:Mgcc-objc++}
 .  if !${PKG_OPTIONS:Mgcc-c++}
 PKG_OPTIONS+=          gcc-c++
@@ -122,24 +114,19 @@ PKG_OPTIONS+=             gcc-c++
 .  if !${PKG_OPTIONS:Mgcc-objc}
 PKG_OPTIONS+=          gcc-objc
 .  endif
-PLIST.objcxx=          yes
 LANGS+=                        obj-c++
 .endif
 
-PLIST_VARS+=           objc
 .if ${PKG_OPTIONS:Mgcc-objc}
 LANGS+=                        objc
-PLIST.objc=            yes
 .endif
 
 .if ${PKG_OPTIONS:Mgcc-go}
 LANGS+=                        go
 .endif
 
-PLIST_VARS+=           fortran
 .if ${PKG_OPTIONS:Mgcc-fortran}
 LANGS+=                        fortran
-PLIST.fortran=         yes
 .endif
 
 .if ${PKG_OPTIONS:Mgcc-c++}

Index: pkgsrc/lang/gcc9/version.mk
diff -u pkgsrc/lang/gcc9/version.mk:1.1 pkgsrc/lang/gcc9/version.mk:1.2
--- pkgsrc/lang/gcc9/version.mk:1.1     Wed Sep  2 16:11:28 2020
+++ pkgsrc/lang/gcc9/version.mk Sun Jan 29 09:03:15 2023
@@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.1 2020/09/02 16:11:28 ryoon Exp $
-GCC9_DIST_VERSION:=    9.3.0
+# $NetBSD: version.mk,v 1.2 2023/01/29 09:03:15 wiz Exp $
+GCC9_DIST_VERSION:=    9.5.0