pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/gcc13-gnat
Module Name: pkgsrc
Committed By: dkazankov
Date: Wed Oct 15 20:04:57 UTC 2025
Modified Files:
pkgsrc/lang/gcc13-gnat: Makefile buildlink3.mk distinfo options.mk
pkgsrc/lang/gcc13-gnat/patches: patch-gcc_ada_adaint.c
patch-gcc_ada_adaint.h patch-gcc_ada_libgnat_g-socthi.ads
patch-gcc_ada_libgnat_g-socthi____bsd.adb
patch-gcc_config_arm_arm.h patch-gcc_config_arm_bpabi.h
patch-gcc_config_arm_elf.h patch-gcc_config_arm_netbsd-eabi.h
patch-gcc_config_arm_netbsd-elf.h
Added Files:
pkgsrc/lang/gcc13-gnat/patches: patch-isl_configure
patch-libgcc_config_t-darwin-libgccs1
Removed Files:
pkgsrc/lang/gcc13-gnat/patches:
patch-gcc_ada_libgnat_s-osprim____posix.adb
Log Message:
gcc13-gnat: migrate to new bootstrap, some patch and option changes
* Move conditional NetBSD specific patches to SUBST framework.
* Default math now use inplace option.
* GCC's inplace graphite changed to distribution downloading variant.
* NetBSD builds migrated to the new bootstrap compiler.
Other platforms uses old build with gcc10-aux package which still
doesn't work.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc13-gnat/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc13-gnat/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc13-gnat/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc13-gnat/options.mk
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.c \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.h \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi.ads \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi____bsd.adb \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_arm.h \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_bpabi.h \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_elf.h \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-eabi.h
cvs rdiff -u -r1.2 -r0 \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_s-osprim____posix.adb
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-elf.h
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc13-gnat/patches/patch-isl_configure
cvs rdiff -u -r0 -r1.3 \
pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config_t-darwin-libgccs1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/gcc13-gnat/Makefile
diff -u pkgsrc/lang/gcc13-gnat/Makefile:1.10 pkgsrc/lang/gcc13-gnat/Makefile:1.11
--- pkgsrc/lang/gcc13-gnat/Makefile:1.10 Fri Aug 15 16:57:57 2025
+++ pkgsrc/lang/gcc13-gnat/Makefile Wed Oct 15 20:04:57 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2025/08/15 16:57:57 dkazankov Exp $
+# $NetBSD: Makefile,v 1.11 2025/10/15 20:04:57 dkazankov Exp $
DISTNAME= gcc-${PKGVERSION_NOREV}
PKGNAME= gcc13-gnat-13.4.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/${DISTNAME}/}
EXTRACT_SUFX= .tar.xz
@@ -12,6 +12,15 @@ HOMEPAGE= https://gcc.gnu.org/
COMMENT= GNAT Compiler and Ada tools
LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+# The list is copy of one from gcc6-aux as it used as a bootstrapper
+ONLY_FOR_PLATFORM= DragonFly-*-x86_64 \
+ FreeBSD-*-i386 \
+ FreeBSD-*-x86_64 \
+ SunOS-5.1[1-9]*-i386 \
+ SunOS-5.1[1-9]*-x86_64 \
+ NetBSD-*-i386 \
+ NetBSD-*-x86_64
+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114065
BROKEN_ON_PLATFORM= *-*-i386
@@ -28,10 +37,8 @@ CHECK_RELRO_SUPPORTED= no
.include "../../mk/bsd.prefs.mk"
DISTFILES= ${DEFAULT_DISTFILES}
-EXTRACT_ONLY= ${DEFAULT_DISTFILES}
-USE_LANGUAGES= c c++ ada
-GCC_REQD+= 10
+USE_LANGUAGES= #
UNLIMIT_RESOURCES+= datasize
UNLIMIT_RESOURCES+= stacksize
@@ -39,6 +46,25 @@ UNLIMIT_RESOURCES+= stacksize
CHECK_PORTABILITY_SKIP+= contrib/*
CHECK_PORTABILITY_SKIP+= gcc/configure.orig_dist
+USE_GCC_BOOTSTRAP= no
+
+.if ${OPSYS} == NetBSD
+BOOT_DISTNAME= gcc-bootstrap-${MACHINE_GNU_PLATFORM}-10.5.0.tar.bz2
+SITES.${BOOT_DISTNAME}= ${MASTER_SITE_BACKUP}
+
+USE_GCC_BOOTSTRAP= yes
+.endif
+
+.if ${USE_GCC_BOOTSTRAP:U:tl} == "yes"
+DISTFILES+= ${BOOT_DISTNAME}
+CC= ${WRKDIR}/gcc-bootstrap/bin/gcc
+CXX= ${WRKDIR}/gcc-bootstrap/bin/g++
+.else
+TOOL_DEPENDS+= gcc10-aux-[0-9]*:../../lang/gcc10-aux
+CC= ${PREFIX}/gcc10-aux/bin/gcc
+CXX= ${PREFIX}/gcc10-aux/bin/g++
+.endif
+
## Build outside ${WRKSRC}
OBJDIR= ${WRKDIR}/build
CONFIGURE_DIRS= ${OBJDIR}
@@ -47,15 +73,38 @@ GNU_CONFIGURE_PREFIX= ${PREFIX}/${PKGBAS
.include "options.mk"
-CONFIGURE_ARGS+= --disable-libstdcxx-pch
+# Use C preprocessed symbols on NetBSD (only)
+.if ${OPSYS} == "NetBSD"
+SUBST_CLASSES+= patch1
+SUBST_MESSAGE.patch1= Replace nanosleep, gettimeofday in ${SUBST_FILES.patch1}
+SUBST_STAGE.patch1= pre-configure
+SUBST_FILES.patch1= gcc/ada/libgnat/s-osprim__posix.adb
+SUBST_SED.patch1= -e "s,\"nanosleep\",\"__gnat_nanosleep\","
+SUBST_SED.patch1+= -e "s,\"gettimeofday\",\"__gnat_gettimeofday\","
+
+SUBST_CLASSES+= patch2
+SUBST_MESSAGE.patch2= Replace select with __gnat_select in ${SUBST_FILES.patch2}
+SUBST_STAGE.patch2= pre-configure
+SUBST_FILES.patch2= gcc/ada/libgnat/g-socthi.ads
+SUBST_SED.patch2= -e "s,\"select\",\"__gnat_select\","
+
+SUBST_CLASSES+= patch3
+SUBST_MESSAGE.patch3= Replace socket with __gnat_socket in ${SUBST_FILES.patch3}
+SUBST_STAGE.patch3= pre-configure
+SUBST_FILES.patch3= gcc/ada/libgnat/g-socthi__bsd.adb
+SUBST_SED.patch3= -e "s,\"socket\",\"__gnat_socket\","
+.endif
-STAGE1_LDFLAGS= ${LDFLAGS} -static
+CONFIGURE_ARGS+= --disable-libstdcxx-pch
# In some cases LINKER_RPATH_FLAG needs a trailing space.
LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
## The Library rpath to use in end programs.
-LDFLAGS_FOR_TARGET= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS_FOR_TARGET= ${COMPILER_RPATH_FLAG}${PREFIX}/${PKGBASE}/${MACHINE_GNU_PLATFORM}/lib
+LDFLAGS_FOR_TARGET+= ${COMPILER_RPATH_FLAG}${PREFIX}/${PKGBASE}/lib
+LDFLAGS_FOR_TARGET+= ${COMPILER_RPATH_FLAG}${PREFIX}/${PKGBASE}/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/adalib
+LDFLAGS_FOR_TARGET+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
# The "-static-libstdc++ -static-libgcc" flags are normally added to the
# boot-ldflags by configure but because we are supply the boot-ldflags
@@ -63,11 +112,15 @@ LDFLAGS_FOR_TARGET= ${COMPILER_RPATH_FLA
BOOT_LDFLAGS= -static-libstdc++ -static-libgcc
BOOT_LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/${PKGBASE}/lib
BOOT_LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/${PKGBASE}/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/adalib
-BOOT_LDFLAGS+= ${LDFLAGS_FOR_TARGET}
+
# Needed on Darwin when LDFLAGS point to a SDK
.if !empty(OSX_SDK_PATH)
-BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
+BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
.endif
+
+## For target librarys and libjava programs.
+CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
+
# GCC does not understand this option; remove it, or stage build will fail
BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
@@ -98,7 +151,7 @@ CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC
CONFIGURE_ENV+= CXX_FOR_BUILD=${NATIVE_CXX:Q}
.endif
-CONFIGURE_ARGS+= --enable-languages=c,c++,ada --enable-stage1-languages=c++,ada
+CONFIGURE_ARGS+= --enable-languages=ada,c,c++
# This will create slightly slower compiler
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-host-shared
@@ -107,7 +160,6 @@ CONFIGURE_ARGS+= --with-local-prefix=${P
CONFIGURE_ARGS+= --with-gxx-include-dir=${PREFIX}/${PKGBASE}/include/c++
CONFIGURE_ARGS+= --enable-__cxa_atexit
CONFIGURE_ARGS+= --enable-threads=posix
-CONFIGURE_ARGS+= --with-stage1-ldflags=${STAGE1_LDFLAGS:Q}
CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
# causes build errors even when using lang/gcc13 to self host
CONFIGURE_ARGS.SunOS+= --disable-libsanitizer
@@ -218,7 +270,7 @@ post-install:
${CHMOD} g-w ${DESTDIR}${PREFIX}/${PKGBASE}/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/adainclude/standard.ads.h
# Create old name that modern gnat no longer provides
${TEST} -f ${DESTDIR}${PREFIX}/${PKGBASE}/bin/gnat && \
- ( cd ${DESTDIR}${PREFIX}/${PKGBASE}/bin ; ${LN} -f gnat ada )
+ ( ${RUN} cd ${DESTDIR}${PREFIX}/${PKGBASE}/bin && ${LN} -f gnat ada )
.if ${MACHINE_PLATFORM:MSunOS-*-*86*} && ${OS_VERSION} != "5.11"
${SH} files/values.c ${DESTDIR}${PREFIX}/${PKGBASE}/bin/gcc -m32 || ${TRUE}
${SH} files/values.c ${DESTDIR}${PREFIX}/${PKGBASE}/bin/gcc -m64 || ${TRUE}
@@ -231,3 +283,14 @@ CONFIGURE_ARGS+= --with-zstd=${BUILDLINK
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+
+.if ${USE_GCC_BOOTSTRAP:U:tl} == "yes"
+PREPEND_PATH+= ${WRKDIR}/gcc-bootstrap/bin
+.else
+PREPEND_PATH+= ${PREFIX}/gcc10-aux/bin
+.endif
+
+CFLAGS= -O2
+CPPFLAGS= #empty
+CXXFLAGS= -O2
+LDFLAGS= -static-libstdc++ -static-libgcc
Index: pkgsrc/lang/gcc13-gnat/buildlink3.mk
diff -u pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.6 pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.7
--- pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.6 Wed Jul 30 19:22:48 2025
+++ pkgsrc/lang/gcc13-gnat/buildlink3.mk Wed Oct 15 20:04:57 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2025/07/30 19:22:48 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2025/10/15 20:04:57 dkazankov Exp $
BUILDLINK_TREE+= gcc13-gnat
@@ -11,12 +11,12 @@ BUILDLINK_PKGSRCDIR.gcc13-gnat?= ../../l
BUILDLINK_DEPMETHOD.gcc13-gnat?= build
ADA_PROJECT_PATH= ${BUILDLINK_DIR}/lib/gnat
-MAKE_ENV+= ADA_PROJECT_PATH=${ADA_PROJECT_PATH}
+MAKE_ENV+= ADA_PROJECT_PATH=${ADA_PROJECT_PATH:Q}
ADALIB_BASE= lib/gcc/${MACHINE_GNU_PLATFORM}/13.4.0
ADA_INCLUDE_PATH= ${BUILDLINK_DIR}/include:${BUILDLINK_DIR}/${ADALIB_BASE}/adainclude:${BUILDLINK_DIR}/${ADALIB_BASE}/include
-MAKE_ENV+= ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH}
+MAKE_ENV+= ADA_INCLUDE_PATH=${ADA_INCLUDE_PATH:Q}
BUILDLINK_FNAME_TRANSFORM.gcc13-gnat+= -e "s|^${BUILDLINK_DIR}/gcc13-gnat/|${BUILDLINK_DIR}/|g"
Index: pkgsrc/lang/gcc13-gnat/distinfo
diff -u pkgsrc/lang/gcc13-gnat/distinfo:1.7 pkgsrc/lang/gcc13-gnat/distinfo:1.8
--- pkgsrc/lang/gcc13-gnat/distinfo:1.7 Wed Jul 2 18:09:02 2025
+++ pkgsrc/lang/gcc13-gnat/distinfo Wed Oct 15 20:04:57 2025
@@ -1,36 +1,43 @@
-$NetBSD: distinfo,v 1.7 2025/07/02 18:09:02 dkazankov Exp $
+$NetBSD: distinfo,v 1.8 2025/10/15 20:04:57 dkazankov Exp $
BLAKE2s (gcc-13.4.0.tar.xz) = 5c8d3fd323e2e2d35a6eddf09298c80a36d6963543a09cd2d439add36e3ab863
SHA512 (gcc-13.4.0.tar.xz) = 9b4b83ecf51ef355b868608b8d257b2fa435c06d2719cb86657a7c2c2a0828ff4ce04e9bac1055bbcad8ed5b4da524cafaef654785e23a50233d95d89201e35f
Size (gcc-13.4.0.tar.xz) = 88530720 bytes
+BLAKE2s (gcc-bootstrap-x86_64--netbsd-10.5.0.tar.bz2) = 90d731f859fde9db5e416a233eea6fe487bf9c45b974708a5913cbd0cafed0d3
+SHA512 (gcc-bootstrap-x86_64--netbsd-10.5.0.tar.bz2) = e649dc8473c6c526bb447f42235abe7d4abf57d3ab2fe22bb5ca4303f2f08f85a501121c61e0104b17a3dd8c76d54b6925a25401bdccd5590ddab92bed948d70
+Size (gcc-bootstrap-x86_64--netbsd-10.5.0.tar.bz2) = 70613322 bytes
+BLAKE2s (isl-0.24.tar.xz) = a3013b0d39b7fe68a1b3e15dc7e925b347d555348ee946a80f5319a76973cd61
+SHA512 (isl-0.24.tar.xz) = ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
+Size (isl-0.24.tar.xz) = 1930956 bytes
SHA1 (patch-fixincludes_inclhack.def) = 9ed633ac175b2180f79e10c96dccd39999bfa348
SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
SHA1 (patch-gcc_ada_Makefile.rtl) = ab068e2580ac1c93c8f27e13aa7331c486080ed0
-SHA1 (patch-gcc_ada_adaint.c) = 67cd2ba303924daaaa2896a73f299f257ebd2101
-SHA1 (patch-gcc_ada_adaint.h) = 0956155bac85df664a8761fd03aec3e12fff89a2
+SHA1 (patch-gcc_ada_adaint.c) = ae87ae97c73d94ef891cd49bdea69c16e8e26bb8
+SHA1 (patch-gcc_ada_adaint.h) = 51195bad13850412a4691bfbb242ad11e3a5a2c7
SHA1 (patch-gcc_ada_cstreams.c) = 9008ec849de15df4e32a75a7353ede097eca9e38
SHA1 (patch-gcc_ada_libgnarl_s-osinte____netbsd.adb) = fe5cffa06d2ad8af6ab71bbd64fb4d3e0f65c3d8
SHA1 (patch-gcc_ada_libgnarl_s-osinte____netbsd.ads) = d6d7eee6f7d90d006f5f6209afb7925551d4aba8
SHA1 (patch-gcc_ada_libgnarl_s-taprop____posix.adb) = 3f3b8d4fd41a9889392021c7cb69130c9033b3b0
-SHA1 (patch-gcc_ada_libgnat_g-socthi.ads) = 9039eb4e649b81b92ef889925f584938c3eb94a6
-SHA1 (patch-gcc_ada_libgnat_g-socthi____bsd.adb) = f1635b16099d2c4a6e0f2a53de9eb549aea0bc2e
-SHA1 (patch-gcc_ada_libgnat_s-osprim____posix.adb) = 15cb19f3e72b4861b4fda4ff087793d95824f544
+SHA1 (patch-gcc_ada_libgnat_g-socthi.ads) = 0891272cb1c0859d5b304047a3935e3bb5dc0e8b
+SHA1 (patch-gcc_ada_libgnat_g-socthi____bsd.adb) = 5826f932f4f24090367a10a2494bf0298d628082
SHA1 (patch-gcc_ada_s-oscons-tmplt.c) = 9b9d1a74428a5e263d1101f41c3bdb9dd689ec8e
SHA1 (patch-gcc_ada_sysdep.c) = 21c432655a50aadb7378e27af92f7b2dfd96a492
SHA1 (patch-gcc_config.host) = bf95dd21bfdf79d173e745fbd35c9bb99fdf4087
SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = d382c66bcecb4ca8b22a4762a3467878bea64ec2
-SHA1 (patch-gcc_config_arm_arm.h) = 26a00f3b235884da7582cf8e59a58cf047e16add
-SHA1 (patch-gcc_config_arm_bpabi.h) = a73fcb47074b65953305ca3583a7398c5f3b6a66
-SHA1 (patch-gcc_config_arm_elf.h) = 706fab4d39d988bbe9fbf74b4a68263c5d6c9fa3
-SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = b7a6b5042f8852a4b7b8ca6199232e0cea31f91b
-SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 568f537d624199ef9f9f56088fe4fff7e946b2e2
+SHA1 (patch-gcc_config_arm_arm.h) = 8ea21f320440bc93ba051469a2d9c1d923bf20a7
+SHA1 (patch-gcc_config_arm_bpabi.h) = ba9850c0d606188510151b6c8c018d75bfe5b920
+SHA1 (patch-gcc_config_arm_elf.h) = 46b8507e4b0ae03e9eed50067048b34ef991076b
+SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = ae9b0523165e512f2b1644ec63dd7cab41294d4f
+SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 107a79e40d42be0fa1e21e8ee50de66f30e42bfe
SHA1 (patch-gcc_config_nvptx_gen-opt.sh) = 67b8c84f198561c1d964a50946937a0a9cc26749
SHA1 (patch-gcc_configure) = 51fa88946eb1d6aac493d471eced4e84f3fa01d2
SHA1 (patch-gcc_tree.h) = e487cd4ac071b109cd75df86cc0054d26d197622
SHA1 (patch-gnattools_configure) = 403e5576506d1a7f42740dcbfc79c1aee3333169
+SHA1 (patch-isl_configure) = a6295c509bdc82e8b54d7dec5252994532463091
SHA1 (patch-libffi_configure) = 392e46774fdf732bd07de35082d469cc325678ea
SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea
SHA1 (patch-libgcc_config.host) = a25dbebf416bcc94dcd21450fa01220da24d65f1
+SHA1 (patch-libgcc_config_t-darwin-libgccs1) = 75e5c3467bfd5716519a65f4d1a6da169486999e
SHA1 (patch-libgcc_config_t-darwin-min-11) = 8bf932c0c2769c5e2e191626976af31f1c57df7e
SHA1 (patch-libgcc_crtstuff.c) = a16d465039de00c195cf0694560140a9c38f3a25
SHA1 (patch-libgfortran_io_io.h) = b47b12022d1e1aad7c3997542f83dc451c33e62b
Index: pkgsrc/lang/gcc13-gnat/options.mk
diff -u pkgsrc/lang/gcc13-gnat/options.mk:1.3 pkgsrc/lang/gcc13-gnat/options.mk:1.4
--- pkgsrc/lang/gcc13-gnat/options.mk:1.3 Tue Jul 1 20:15:15 2025
+++ pkgsrc/lang/gcc13-gnat/options.mk Wed Oct 15 20:04:57 2025
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2025/07/01 20:15:15 dkazankov Exp $
+# $NetBSD: options.mk,v 1.4 2025/10/15 20:04:57 dkazankov Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gcc13-gnat
PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-graphite
-PKG_SUGGESTED_OPTIONS= gcc-graphite
+PKG_SUGGESTED_OPTIONS= gcc-inplace-math gcc-graphite
.include "../../mk/bsd.fast.prefs.mk"
@@ -88,10 +88,15 @@ LIBS.SunOS+=-lgmp
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-BUILDLINK_API_DEPENDS.isl+=isl>=0.24
. if !empty(PKG_OPTIONS:Mgcc-inplace-math)
-. include "../../math/isl/inplace.mk"
+ISL24= isl-0.24
+SITES.${ISL24}.tar.bz2= ${MASTER_SITE_GNU:=gcc/infrastructure/}
+DISTFILES+= ${ISL24}.tar.xz
+post-extract:
+ ${MV} ${WRKDIR}/${ISL24} ${WRKSRC}/isl
+
. else
+BUILDLINK_API_DEPENDS.isl+=isl>=0.24
. include "../../math/isl/buildlink3.mk"
CONFIGURE_ARGS+=--with-isl=${BUILDLINK_PREFIX.isl}
. endif
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.c
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.c:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.c:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.c:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.c Wed Oct 15 20:04:57 2025
@@ -1,10 +1,9 @@
-$NetBSD: patch-gcc_ada_adaint.c,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_ada_adaint.c,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
NetBSD does not use symbol versioning, which requires some functions
-to be preprocessed in C. This patch adds those functions definitions,
-not only for NetBSD, but for any other system too.
+to be preprocessed in C. This patch adds those functions definitions.
---- gcc/ada/adaint.c.orig 2024-05-21 10:47:37.000000000 +0300
+--- gcc/ada/adaint.c.orig 2025-06-05 19:02:58.000000000 +0300
+++ gcc/ada/adaint.c
@@ -831,7 +831,8 @@
}
@@ -63,7 +62,6 @@ not only for NetBSD, but for any other s
+__gnat_clock_gettime (clockid_t clock_id, struct timespec *tp) {
+ return clock_gettime (clock_id, tp);
+}
-+#endif
+int
+__gnat_nanosleep (const struct timespec *rqtp, struct timespec *rmtp) {
+ return nanosleep (rqtp, rmtp);
@@ -82,6 +80,7 @@ not only for NetBSD, but for any other s
+__gnat_socket (int domain, int type, int protocol) {
+ return socket (domain, type, protocol);
+}
++#endif
+
#ifdef __cplusplus
}
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.h
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.h:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.h:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.h:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_adaint.h Wed Oct 15 20:04:57 2025
@@ -1,12 +1,11 @@
-$NetBSD: patch-gcc_ada_adaint.h,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_ada_adaint.h,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
Due to the lack of symbol versioning in NetBSD, some functions need
-to be exported from C to be used correctly. This patch addresses
-that issue and makes sure that other systems also work correclty.
+to be exported from C to be used correctly.
---- gcc/ada/adaint.h.orig 2024-05-21 10:47:37.000000000 +0300
+--- gcc/ada/adaint.h.orig 2025-06-05 19:02:58.000000000 +0300
+++ gcc/ada/adaint.h
-@@ -348,6 +348,28 @@
+@@ -348,6 +348,26 @@
extern const void * __gnat_get_executable_load_address (void);
@@ -19,7 +18,6 @@ that issue and makes sure that other sys
+extern int __gnat_sigismember (sigset_t *, int);
+extern int __gnat_sigaltstack (const stack_t *, stack_t *);
+extern int __gnat_sigaction (int, const struct sigaction *, struct sigaction *);
-+#endif
+#include <time.h>
+extern int __gnat_nanosleep (const struct timespec *, struct timespec *);
+extern int __gnat_gettimeofday (struct timeval *, struct timezone *);
@@ -27,7 +25,6 @@ that issue and makes sure that other sys
+extern int __gnat_select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
+#include <sys/socket.h>
+extern int __gnat_socket (int, int, int);
-+#if defined(__NetBSD__)
+extern int __gnat_clock_getres (clockid_t, struct timespec *);
+extern int __gnat_clock_gettime (clockid_t, struct timespec *);
+#endif
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi.ads
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi.ads:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi.ads:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi.ads:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi.ads Wed Oct 15 20:04:57 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-gcc_ada_libgnat_g-socthi.ads,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_ada_libgnat_g-socthi.ads,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
-Fix symbol to make it use the C processed one.
+Fix RTS build warning
---- gcc/ada/libgnat/g-socthi.ads.orig 2021-10-09 18:09:40.607907149 +0200
+--- gcc/ada/libgnat/g-socthi.ads.orig 2025-08-08 10:24:06.091262012 +0300
+++ gcc/ada/libgnat/g-socthi.ads
@@ -53,8 +53,6 @@
@@ -13,12 +13,3 @@ Fix symbol to make it use the C processe
function Socket_Errno return Integer renames GNAT.OS_Lib.Errno;
-- Returns last socket error number
-@@ -256,7 +254,7 @@
- pragma Import (C, C_Getsockname, "getsockname");
- pragma Import (C, C_Getsockopt, "getsockopt");
- pragma Import (C, C_Listen, "listen");
-- pragma Import (C, C_Select, "select");
-+ pragma Import (C, C_Select, "__gnat_select");
- pragma Import (C, C_Setsockopt, "setsockopt");
- pragma Import (C, C_Shutdown, "shutdown");
- pragma Import (C, C_Socketpair, "socketpair");
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi____bsd.adb
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi____bsd.adb:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi____bsd.adb:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi____bsd.adb:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_ada_libgnat_g-socthi____bsd.adb Wed Oct 15 20:04:57 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gcc_ada_libgnat_g-socthi____bsd.adb,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_ada_libgnat_g-socthi____bsd.adb,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
Create a g-socthi package that is common to all *BSD systems.
@@ -135,7 +135,7 @@ Create a g-socthi package that is common
+ (Domain : C.int;
+ Typ : C.int;
+ Protocol : C.int) return C.int;
-+ pragma Import (C, Syscall_Socket, "__gnat_socket");
++ pragma Import (C, Syscall_Socket, "socket");
+ -- The socket() function is used to create an unbound socket and returns a
+ -- file descriptor that can be used with other socket functions. Upon
+ -- failure, a -1 is returned and ERRNO is set.
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_arm.h
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_arm.h:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_arm.h:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_arm.h:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_arm.h Wed Oct 15 20:04:57 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-gcc_config_arm_arm.h,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_config_arm_arm.h,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
+
+FIXME
--- gcc/config/arm/arm.h.orig 2024-05-21 10:47:38.000000000 +0300
+++ gcc/config/arm/arm.h
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_bpabi.h
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_bpabi.h:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_bpabi.h:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_bpabi.h:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_bpabi.h Wed Oct 15 20:04:57 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-gcc_config_arm_bpabi.h,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_config_arm_bpabi.h,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
+
+FIXME
--- gcc/config/arm/bpabi.h.orig 2021-04-08 04:56:28.061740583 -0700
+++ gcc/config/arm/bpabi.h
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_elf.h
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_elf.h:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_elf.h:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_elf.h:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_elf.h Wed Oct 15 20:04:57 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-gcc_config_arm_elf.h,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_config_arm_elf.h,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
+
+FIXME
--- gcc/config/arm/elf.h.orig 2021-04-08 04:56:28.065740630 -0700
+++ gcc/config/arm/elf.h
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-eabi.h
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-eabi.h:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-eabi.h:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-eabi.h:1.2 Sat Feb 8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-eabi.h Wed Oct 15 20:04:57 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-gcc_config_arm_netbsd-eabi.h,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-gcc_config_arm_netbsd-eabi.h,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
+
+FIXME
--- gcc/config/arm/netbsd-eabi.h.orig 2021-04-08 04:56:28.065740630 -0700
+++ gcc/config/arm/netbsd-eabi.h
Index: pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-elf.h
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-elf.h:1.1 pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-elf.h:1.2
--- pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-elf.h:1.1 Fri Mar 8 12:02:34 2024
+++ pkgsrc/lang/gcc13-gnat/patches/patch-gcc_config_arm_netbsd-elf.h Wed Oct 15 20:04:57 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-gcc_config_arm_netbsd-elf.h,v 1.1 2024/03/08 12:02:34 wiz Exp $
+$NetBSD: patch-gcc_config_arm_netbsd-elf.h,v 1.2 2025/10/15 20:04:57 dkazankov Exp $
+
+FIXME
--- gcc/config/arm/netbsd-elf.h.orig 2023-04-26 07:09:39.000000000 +0000
+++ gcc/config/arm/netbsd-elf.h
Added files:
Index: pkgsrc/lang/gcc13-gnat/patches/patch-isl_configure
diff -u /dev/null pkgsrc/lang/gcc13-gnat/patches/patch-isl_configure:1.1
--- /dev/null Wed Oct 15 20:04:57 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-isl_configure Wed Oct 15 20:04:57 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-isl_configure,v 1.1 2025/10/15 20:04:57 dkazankov Exp $
+
+Fix unportable test(1) operator.
+
+--- isl/configure.orig 2021-04-26 09:13:19.000000000 +0000
++++ isl/configure
+@@ -20657,7 +20657,7 @@ else
+ HAVE_CXX11_FALSE=
+ fi
+
+- if test "x$with_int" == "ximath-32"; then
++ if test "x$with_int" = "ximath-32"; then
+ SMALL_INT_OPT_TRUE=
+ SMALL_INT_OPT_FALSE='#'
+ else
+@@ -20665,7 +20665,7 @@ else
+ SMALL_INT_OPT_FALSE=
+ fi
+
+-if test "x$with_int" == "ximath-32"; then :
++if test "x$with_int" = "ximath-32"; then :
+
+
+ $as_echo "#define USE_SMALL_INT_OPT /**/" >>confdefs.h
Index: pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config_t-darwin-libgccs1
diff -u /dev/null pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config_t-darwin-libgccs1:1.3
--- /dev/null Wed Oct 15 20:04:57 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config_t-darwin-libgccs1 Wed Oct 15 20:04:57 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-libgcc_config_t-darwin-libgccs1,v 1.3 2025/10/15 20:04:57 dkazankov Exp $
+
+libgcc, Darwin: Drop the legacy library build for macOS >= 15 [PR116809].
+
+We have been building a legacy libgcc_s.1 DSO to support code that
+was built with older compilers.
+
+From macOS 15, the unwinder no longer exports some of the symbols used
+in that library which (a) cuases bootstrap fail and (b) means that the
+legacy library is no longer useful.
+
+No open branch of GCC emits references to this library - and any already
+-built code that depends on the symbols would need rework anyway.
+
+ PR target/116809
+
+See https://github.com/gcc-mirror/gcc/blob/master/libgcc/config/t-darwin-libgccs1.
+
+--- libgcc/config/t-darwin-libgccs1.orig 2024-12-09 03:35:09.522148209 +0000
++++ libgcc/config/t-darwin-libgccs1
+@@ -0,0 +1,2 @@
++# Build a legacy libgcc_s.1
++BUILD_LIBGCCS1 = YES
Home |
Main Index |
Thread Index |
Old Index