Mon Apr 1 18:08:48 2024 UTC (56d)
lang/gcc10: Fix include-order-dependent types on QNX


(js)
diff -r1.24 -r1.25 pkgsrc/lang/gcc10/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/gcc10/distinfo
diff -r1.8 -r1.9 pkgsrc/lang/gcc10-libs/Makefile
diff -r0 -r1.1 pkgsrc/lang/gcc10/patches/patch-gcc_ginclude_stddef.h
diff -r1.1 -r0 pkgsrc/lang/gcc10/patches/patch-libobjc_objc_runtime.h
diff -r1.1 -r0 pkgsrc/lang/gcc10/patches/patch-libstdc++-v3_libsupc++_cxxabi.h
diff -r1.1 -r0 pkgsrc/lang/gcc10/patches/patch-libstdc++-v3_libsupc++_cxxabi_init_exception.h
Tue Apr 2 03:08:48 2024
Thu Jan 1 09:00:00 1970
pkgsrc/lang/gcc10/patches/patch-libobjc_objc_runtime.h,v
anoncvs not yet been updated
Tue Apr 2 03:08:48 2024
Thu Jan 1 09:00:00 1970
pkgsrc/lang/gcc10/patches/patch-libstdc++-v3_libsupc++_cxxabi.h,v
anoncvs not yet been updated
Tue Apr 2 03:08:48 2024
Thu Jan 1 09:00:00 1970
pkgsrc/lang/gcc10/patches/patch-libstdc++-v3_libsupc++_cxxabi_init_exception.h,v
anoncvs not yet been updated
cvs diff -r1.24 -r1.25 pkgsrc/lang/gcc10/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc10/Makefile 2024/04/01 15:34:06 1.24
+++ pkgsrc/lang/gcc10/Makefile 2024/04/01 18:08:48 1.25
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.24 2024/04/01 15:34:06 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.25 2024/04/01 18:08:48 js Exp $
2 2
3PKGNAME= ${GCC_PKGNAME}-${GCC10_DIST_VERSION} 3PKGNAME= ${GCC_PKGNAME}-${GCC10_DIST_VERSION}
4## When bumping the PKGREVISION of this package the PKGREVISION of 4## When bumping the PKGREVISION of this package the PKGREVISION of
5## lang/gcc10-libs needs to be bumped to be at least 1 more than the 5## lang/gcc10-libs needs to be bumped to be at least 1 more than the
6## PKGREVISION of this package! 6## PKGREVISION of this package!
7PKGREVISION= 1 7PKGREVISION= 2
8 8
9COMMENT= The GNU Compiler Collection (GCC) - 10.0 Release Series 9COMMENT= The GNU Compiler Collection (GCC) - 10.0 Release Series
10 10
11LANGS= c 11LANGS= c
12 12
13.include "Makefile.common" 13.include "Makefile.common"
14 14
15# In some cases LINKER_RPATH_FLAG needs a trailing space. 15# In some cases LINKER_RPATH_FLAG needs a trailing space.
16LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /} 16LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
17 17
18## The Library rpath to use in end programs. 18## The Library rpath to use in end programs.
19LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} ${LDFLAGS:M-Wl,-z*} 19LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} ${LDFLAGS:M-Wl,-z*}
20 20
cvs diff -r1.17 -r1.18 pkgsrc/lang/gcc10/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc10/distinfo 2024/04/01 14:33:57 1.17
+++ pkgsrc/lang/gcc10/distinfo 2024/04/01 18:08:48 1.18
@@ -1,62 +1,60 @@ @@ -1,62 +1,60 @@
1$NetBSD: distinfo,v 1.17 2024/04/01 14:33:57 js Exp $ 1$NetBSD: distinfo,v 1.18 2024/04/01 18:08:48 js Exp $
2 2
3BLAKE2s (gcc-10.5.0.tar.xz) = af4a8b262d9d4e534e8e1c311897e68e7d64f147ad1eed42e77f9674da188bf3 3BLAKE2s (gcc-10.5.0.tar.xz) = af4a8b262d9d4e534e8e1c311897e68e7d64f147ad1eed42e77f9674da188bf3
4SHA512 (gcc-10.5.0.tar.xz) = d86dbc18b978771531f4039465e7eb7c19845bf607dc513c97abf8e45ffe1086a99d98f83dfb7b37204af22431574186de9d5ff80c8c3c3a98dbe3983195bffd 4SHA512 (gcc-10.5.0.tar.xz) = d86dbc18b978771531f4039465e7eb7c19845bf607dc513c97abf8e45ffe1086a99d98f83dfb7b37204af22431574186de9d5ff80c8c3c3a98dbe3983195bffd
5Size (gcc-10.5.0.tar.xz) = 77846412 bytes 5Size (gcc-10.5.0.tar.xz) = 77846412 bytes
6BLAKE2s (isl-0.16.1.tar.bz2) = 01c3fc657326e81414986eb7ede6f73e540b97009745ced125cdf7f4a8d80f61 6BLAKE2s (isl-0.16.1.tar.bz2) = 01c3fc657326e81414986eb7ede6f73e540b97009745ced125cdf7f4a8d80f61
7SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b 7SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
8Size (isl-0.16.1.tar.bz2) = 1626446 bytes 8Size (isl-0.16.1.tar.bz2) = 1626446 bytes
9SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791 9SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791
10SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a 10SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
11SHA1 (patch-gcc_Makefile.in) = a47571d8340702d1a86d0dfb7df654280c6a6ee6 11SHA1 (patch-gcc_Makefile.in) = a47571d8340702d1a86d0dfb7df654280c6a6ee6
12SHA1 (patch-gcc_config.gcc) = 4767d5b16794f4485879ed10e172cb2f86bc0777 12SHA1 (patch-gcc_config.gcc) = 4767d5b16794f4485879ed10e172cb2f86bc0777
13SHA1 (patch-gcc_config.host) = 8920ce841f6088b365c9b590e3ea9535bd880b40 13SHA1 (patch-gcc_config.host) = 8920ce841f6088b365c9b590e3ea9535bd880b40
14SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = 87185f5c2e2dbe4195cb19fe6213d2d616d5519b 14SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = 87185f5c2e2dbe4195cb19fe6213d2d616d5519b
15SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827 15SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827
16SHA1 (patch-gcc_config_aarch64_driver-aarch64.c) = 7e17b49924ddd9ff33d049d6539e4df77d14d3e5 16SHA1 (patch-gcc_config_aarch64_driver-aarch64.c) = 7e17b49924ddd9ff33d049d6539e4df77d14d3e5
17SHA1 (patch-gcc_config_arm_arm.h) = 9d554349869d67d6393552c33a7824f0dd53cb11 17SHA1 (patch-gcc_config_arm_arm.h) = 9d554349869d67d6393552c33a7824f0dd53cb11
18SHA1 (patch-gcc_config_arm_bpabi.h) = 0b0de5ad95442e34397cb46739ef6e36048d6f45 18SHA1 (patch-gcc_config_arm_bpabi.h) = 0b0de5ad95442e34397cb46739ef6e36048d6f45
19SHA1 (patch-gcc_config_arm_elf.h) = 57748157084319cb92d892f2ea5b2f3355567551 19SHA1 (patch-gcc_config_arm_elf.h) = 57748157084319cb92d892f2ea5b2f3355567551
20SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 85eb89de6f2e64fac50251f06d7e4eab35903dae 20SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 85eb89de6f2e64fac50251f06d7e4eab35903dae
21SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 367d83c808fd7b5b1989d0490b532ad06b425b31 21SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 367d83c808fd7b5b1989d0490b532ad06b425b31
22SHA1 (patch-gcc_config_sparc_sparc.c) = e9cb956f3769642bcd0ba4a477d16c73dea46014 22SHA1 (patch-gcc_config_sparc_sparc.c) = e9cb956f3769642bcd0ba4a477d16c73dea46014
23SHA1 (patch-gcc_configure) = 6a2d8eeeed2bf08c3c81291178e669dc91c913ce 23SHA1 (patch-gcc_configure) = 6a2d8eeeed2bf08c3c81291178e669dc91c913ce
24SHA1 (patch-gcc_ggc-common.c) = 3e325767922ab7d2079fdb9a3d6b6aa531a2fea5 24SHA1 (patch-gcc_ggc-common.c) = 3e325767922ab7d2079fdb9a3d6b6aa531a2fea5
 25SHA1 (patch-gcc_ginclude_stddef.h) = bb9c7c85decd29d4b76bb59c1f640e7e958b1971
25SHA1 (patch-gcc_lto_lto.c) = 7bd85ac8ade76a28c394f6fbe5d495f91824f79f 26SHA1 (patch-gcc_lto_lto.c) = 7bd85ac8ade76a28c394f6fbe5d495f91824f79f
26SHA1 (patch-gcc_opts-common.c) = 8cfb8e50a8690b1094449f4eb2d278ddeeb4b633 27SHA1 (patch-gcc_opts-common.c) = 8cfb8e50a8690b1094449f4eb2d278ddeeb4b633
27SHA1 (patch-gcc_opts-jobserver.h) = 7206af8d26fa773ce1df9234ee5cdd4afcc80918 28SHA1 (patch-gcc_opts-jobserver.h) = 7206af8d26fa773ce1df9234ee5cdd4afcc80918
28SHA1 (patch-gcc_plugin.c) = fe897fa051c5a1e69af423c354a07baa7332043e 29SHA1 (patch-gcc_plugin.c) = fe897fa051c5a1e69af423c354a07baa7332043e
29SHA1 (patch-gcc_targhooks.c) = b28d8a9696d07bbfb00b7d8c55193ba99447ff1d 30SHA1 (patch-gcc_targhooks.c) = b28d8a9696d07bbfb00b7d8c55193ba99447ff1d
30SHA1 (patch-gmp_gen-sieve.c) = 7e95627a7f46e9db965de5620999c7bdc6ef6606 31SHA1 (patch-gmp_gen-sieve.c) = 7e95627a7f46e9db965de5620999c7bdc6ef6606
31SHA1 (patch-gmp_mpn_generic_compute_powtab.c) = 2301acc51d23bb5558360f133c037a39dec2bd7f 32SHA1 (patch-gmp_mpn_generic_compute_powtab.c) = 2301acc51d23bb5558360f133c037a39dec2bd7f
32SHA1 (patch-gmp_mpz_millerrabin.c) = dc92fc81042028ffa1722a85cf42f225bee32cd5 33SHA1 (patch-gmp_mpz_millerrabin.c) = dc92fc81042028ffa1722a85cf42f225bee32cd5
33SHA1 (patch-gmp_mpz_nextprime.c) = 12d7ba775972bf8ef1501131dbbb4bffeb4b0214 34SHA1 (patch-gmp_mpz_nextprime.c) = 12d7ba775972bf8ef1501131dbbb4bffeb4b0214
34SHA1 (patch-gmp_mpz_primorial_ui.c) = 973d4faadb27bb353bf68f28fd76a5bf0d6315fb 35SHA1 (patch-gmp_mpz_primorial_ui.c) = 973d4faadb27bb353bf68f28fd76a5bf0d6315fb
35SHA1 (patch-gmp_primesieve.c) = 3477e4de710bc1eb4297d53e54dc7173cf961217 36SHA1 (patch-gmp_primesieve.c) = 3477e4de710bc1eb4297d53e54dc7173cf961217
36SHA1 (patch-include_plugin-api.h) = f39ef61b50b08daf85872ce2764877f5bc32779d 37SHA1 (patch-include_plugin-api.h) = f39ef61b50b08daf85872ce2764877f5bc32779d
37SHA1 (patch-isl_configure) = 5523c76d95b229b3cd25461b4c2b7af24bf2534e 38SHA1 (patch-isl_configure) = 5523c76d95b229b3cd25461b4c2b7af24bf2534e
38SHA1 (patch-libffi_configure) = 22006b20d7f655e2455a7ad613d676703b6c1ccc 39SHA1 (patch-libffi_configure) = 22006b20d7f655e2455a7ad613d676703b6c1ccc
39SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 27b84a11378fb648dfaad0c70abedd77a0a1c1a8 40SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 27b84a11378fb648dfaad0c70abedd77a0a1c1a8
40SHA1 (patch-libgcc_config.host) = 1dda38390749c8727281099d86d763e1896a54b1 41SHA1 (patch-libgcc_config.host) = 1dda38390749c8727281099d86d763e1896a54b1
41SHA1 (patch-libgcc_crtstuff.c) = 38d03a3b417aa3116986641f0f7b595166206623 42SHA1 (patch-libgcc_crtstuff.c) = 38d03a3b417aa3116986641f0f7b595166206623
42SHA1 (patch-libgfortran_intrinsics_execute_command_line.c) = 05b554ffce113efa6b92cae1dfeda6dfefeed92c 43SHA1 (patch-libgfortran_intrinsics_execute_command_line.c) = 05b554ffce113efa6b92cae1dfeda6dfefeed92c
43SHA1 (patch-libgfortran_intrinsics_string_intrinsics_inc.c) = 2c027c7bd318342c0498d46f9712a55a86ab76c7 44SHA1 (patch-libgfortran_intrinsics_string_intrinsics_inc.c) = 2c027c7bd318342c0498d46f9712a55a86ab76c7
44SHA1 (patch-libgfortran_io_format.c) = 9bbc5e4f6277bdec785b3690fd08259939a2aa1a 45SHA1 (patch-libgfortran_io_format.c) = 9bbc5e4f6277bdec785b3690fd08259939a2aa1a
45SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0 46SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
46SHA1 (patch-libgfortran_io_list__read.c) = 589cdb8dcd180b781ededc086e8775224fca5779 47SHA1 (patch-libgfortran_io_list__read.c) = 589cdb8dcd180b781ededc086e8775224fca5779
47SHA1 (patch-libgfortran_io_read.c) = cf21493396d07a5e8ad0dfb70a8d25a11482fc98 48SHA1 (patch-libgfortran_io_read.c) = cf21493396d07a5e8ad0dfb70a8d25a11482fc98
48SHA1 (patch-libgfortran_runtime_environ.c) = c7217704a00f4c0314bbc1838ac6fc966cc854d0 49SHA1 (patch-libgfortran_runtime_environ.c) = c7217704a00f4c0314bbc1838ac6fc966cc854d0
49SHA1 (patch-libiberty_pex-unix.c) = 52896635b2578e8338a82ad3a3e9fd4d911c8489 50SHA1 (patch-libiberty_pex-unix.c) = 52896635b2578e8338a82ad3a3e9fd4d911c8489
50SHA1 (patch-libobjc_objc_runtime.h) = 420137482a6e3fa1f9dc4196e60dfde47a80f68a 
51SHA1 (patch-libquadmath_printf_printf_fphex.c) = 4e3927bb2ba9013e1ef69e38d0481c930b77a2fc 51SHA1 (patch-libquadmath_printf_printf_fphex.c) = 4e3927bb2ba9013e1ef69e38d0481c930b77a2fc
52SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 9c862bd2e07f8724646896a9f93bb8bb15bb4185 52SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 9c862bd2e07f8724646896a9f93bb8bb15bb4185
53SHA1 (patch-libquadmath_strtod_strtod__l.c) = 1a3a419218fb260c1c4a0ed08f5a72bde683d039 53SHA1 (patch-libquadmath_strtod_strtod__l.c) = 1a3a419218fb260c1c4a0ed08f5a72bde683d039
54SHA1 (patch-libstdc++-v3_include_bits_std_abs.h) = 2a32b52dc2d958085525461bd6da0a7b299ee09d 54SHA1 (patch-libstdc++-v3_include_bits_std_abs.h) = 2a32b52dc2d958085525461bd6da0a7b299ee09d
55SHA1 (patch-libstdc++-v3_include_bits_stl_function.h) = 2757a988fb0a19825abb9963dc236effa9e3ea80 55SHA1 (patch-libstdc++-v3_include_bits_stl_function.h) = 2757a988fb0a19825abb9963dc236effa9e3ea80
56SHA1 (patch-libstdc++-v3_include_c_global_cmath) = 24ec0941fcad205ce090b969a90ce5e85e235775 56SHA1 (patch-libstdc++-v3_include_c_global_cmath) = 24ec0941fcad205ce090b969a90ce5e85e235775
57SHA1 (patch-libstdc++-v3_include_c_global_cstring) = 0a87e7939448957bb352d8a50d5d3cb07f2f9a5d 57SHA1 (patch-libstdc++-v3_include_c_global_cstring) = 0a87e7939448957bb352d8a50d5d3cb07f2f9a5d
58SHA1 (patch-libstdc++-v3_include_c_global_cwchar) = 9408c1876183fa3f9d4440acdc96217c8a47ed87 58SHA1 (patch-libstdc++-v3_include_c_global_cwchar) = 9408c1876183fa3f9d4440acdc96217c8a47ed87
59SHA1 (patch-libstdc++-v3_libsupc++_cxxabi.h) = 3bf8c2c8528f9374d157fa47e8ad0d13fc16b8a4 
60SHA1 (patch-libstdc++-v3_libsupc++_cxxabi_init_exception.h) = 260c4af26e88e0015f54b04910cf91dd2ee8cb5f 
61SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = 4183b00a5ee6e61524da4755c825a0c08fd01ed6 59SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = 4183b00a5ee6e61524da4755c825a0c08fd01ed6
62SHA1 (patch-libstdc++-v3_src_c++11_system_error.cc) = 2c4b5326f4a4f518b202055aa3fbcc76c27f51dd 60SHA1 (patch-libstdc++-v3_src_c++11_system_error.cc) = 2c4b5326f4a4f518b202055aa3fbcc76c27f51dd
cvs diff -r1.8 -r1.9 pkgsrc/lang/gcc10-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc10-libs/Makefile 2024/04/01 15:31:13 1.8
+++ pkgsrc/lang/gcc10-libs/Makefile 2024/04/01 18:08:48 1.9
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.8 2024/04/01 15:31:13 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.9 2024/04/01 18:08:48 js Exp $
2 2
3GCC_PKGNAME= gcc10 3GCC_PKGNAME= gcc10
4.include "../../lang/${GCC_PKGNAME}/version.mk" 4.include "../../lang/${GCC_PKGNAME}/version.mk"
5 5
6DISTNAME= gcc-${GCC10_DIST_VERSION} 6DISTNAME= gcc-${GCC10_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-libs-${GCC10_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-libs-${GCC10_DIST_VERSION}
8 8
9## The PKGREVISION of this package needs to be at least 1 more than the 9## The PKGREVISION of this package needs to be at least 1 more than the
10## PKGREVISION of the lang/gcc10 package so that with the dependence pattern 10## PKGREVISION of the lang/gcc10 package so that with the dependence pattern
11## '{gcc10,gcc10-libs}>=10.2.*' pkg_add will choose gcc10-libs over gcc10. 11## '{gcc10,gcc10-libs}>=10.2.*' pkg_add will choose gcc10-libs over gcc10.
12PKGREVISION= 2 12PKGREVISION= 3
13 13
14CATEGORIES= lang 14CATEGORIES= lang
15MASTER_SITES= # empty 15MASTER_SITES= # empty
16DISTFILES= # empty 16DISTFILES= # empty
17 17
18MAINTAINER= pkgsrc-users@NetBSD.org 18MAINTAINER= pkgsrc-users@NetBSD.org
19HOMEPAGE= https://gcc.gnu.org/ 19HOMEPAGE= https://gcc.gnu.org/
20COMMENT= The GNU Compiler Collection (GCC) support shared libraries 20COMMENT= The GNU Compiler Collection (GCC) support shared libraries
21LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 21LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
22 22
23USE_TOOLS+= pax 23USE_TOOLS+= pax
24 24
25NO_BUILD= yes 25NO_BUILD= yes
File Added: pkgsrc/lang/gcc10/patches/patch-gcc_ginclude_stddef.h
$NetBSD: patch-gcc_ginclude_stddef.h,v 1.1 2024/04/01 18:08:48 js Exp $

Include the system <stddef.h> first, as otherwise we'll end up without
ptrdiff_t and size_t depending on include order.

--- gcc/ginclude/stddef.h.orig	2023-07-07 07:08:19.000000000 +0000
+++ gcc/ginclude/stddef.h
@@ -21,6 +21,10 @@ a copy of the GCC Runtime Library Except
 see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
+#ifdef __QNX__
+# include_next <stddef.h>
+#endif
+
 /*
  * ISO C Standard:  7.17  Common definitions  <stddef.h>
  */
File Deleted: pkgsrc/lang/gcc10/patches/patch-libobjc_objc_runtime.h
File Deleted: pkgsrc/lang/gcc10/patches/patch-libstdc++-v3_libsupc++_cxxabi.h
File Deleted: pkgsrc/lang/gcc10/patches/patch-libstdc++-v3_libsupc++_cxxabi_init_exception.h