Date: Sun, 07 Jun 2026 10:57:50 +0000 From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Alastair Hogge <agh@riseup.net> Subject: git: dca58708f52c - main - lang/gnat1[2-4]: Restore check-phase Message-ID: <6a254eae.27814.3b258cbb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=dca58708f52c9dece16980bc1f85294888af2a3c commit dca58708f52c9dece16980bc1f85294888af2a3c Author: Alastair Hogge <agh@riseup.net> AuthorDate: 2026-06-07 00:51:02 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2026-06-07 10:56:52 +0000 lang/gnat1[2-4]: Restore check-phase lang/gnat12,13, and 14: * After PR 294657, restore the testing target check-phase, move the if conditional on ${UID} != 0 below the GNAT Ports' internal _ marked variables, and drop bsd.port.options.mk, and terminate the Port with bsd.port.post.mk over bsd.port.mk * Add fix for rpath (PR 292708) * Move ${PIE_UNSAFE} to the correct block (portclippy) * Move gettext-runtime from ${USES} to ${NLS_USES} * Regroup internal variables and sort * Remove ${EXTRACT_CMD} from aarch64 specific section syncing with the update to the Ports Mk infrastructure (D57295) which by default now uses LC_ALL=en_US.UTF-8 in the environment * Sort ${GNU_CONFIGURE_PREFIX} * Specific to GNAT-12, follow GNAT-13 and 14's use of ${MASTER_SITE_GCC} in ${MASTER_SITES}; sort the architecture specific ${PLIST_SUB} entries PR: 295872 Co-authored-by: Marcin Cieślak <saper@saper.info> Reported by: Sulev-Madis Silber --- lang/gnat12/Makefile | 51 ++++++++++++++++++++++++++------------------------- lang/gnat13/Makefile | 38 +++++++++++++++++++------------------- lang/gnat14/Makefile | 38 +++++++++++++++++++------------------- 3 files changed, 64 insertions(+), 63 deletions(-) diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile index 7a8c7c445db4..c7b0a0651c13 100644 --- a/lang/gnat12/Makefile +++ b/lang/gnat12/Makefile @@ -1,7 +1,7 @@ PORTNAME= gnat12 DISTVERSION= 12.4.0 CATEGORIES= lang -MASTER_SITES= http://gcc.gnu.org/pub/gcc/releases/gcc-${DISTVERSION}/:gcc \ +MASTER_SITES= ${MASTER_SITE_GCC:C|%SUBDIR%|${MASTER_SITE_SUBDIR}|}:gcc \ LOCAL/thierry:gnat MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION} DISTFILES= gcc-${DISTVERSION}.tar.xz:gcc @@ -21,13 +21,13 @@ LIB_DEPENDS= libgmp.so:math/gmp \ RUN_DEPENDS= ${LOCALBASE}/bin/as:devel/binutils \ gcc${_GCC_VER}>0:lang/gcc${_GCC_VER} -USES= bison gettext-runtime gmake iconv libtool localbase tar:xz +USES= bison gmake iconv libtool localbase tar:xz USE_BINUTILS= yes USE_LDCONFIG= ${_TARGLIB} GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${_PKG_PREFIX} GNU_CONFIGURE_MANPREFIX= ${_PKG_PREFIX}/share +GNU_CONFIGURE_PREFIX= ${_PKG_PREFIX} CONFIGURE_ARGS= --disable-bootstrap \ --disable-libgomp \ --disable-libmudflap \ @@ -51,15 +51,18 @@ CONFIGURE_TARGET= ${_GNAT_ARCH}-portbld-${_PLATFORM} MAKE_ENV+= PATH=${_TOOLCHAIN_PATHS} INSTALL_TARGET= install-strip + +PIE_UNSAFE= yes + MANDIRS= ${_PKG_PREFIX}/share/man BINARY_ALIAS= make=${GMAKE} + WRKSRC= ${WRKDIR}/gcc-${DISTVERSION} + PLIST_SUB= ASSET_FILE=${_ASSET_FILE} \ CONFTRGT=${CONFIGURE_TARGET} \ VER=${DISTVERSION} -PIE_UNSAFE= yes - OPTIONS_DEFINE= ASSETS NLS .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_amd64+= MULTILIB @@ -92,17 +95,12 @@ MULTILIB_CONFIGURE_ENABLE= multilib .else CONFIGURE_ARGS+= --disable-multilib .endif +NLS_USES= gettext-runtime NLS_CONFIGURE_ON= --enable-nls NLS_CONFIGURE_OFF= --disable-nls PREVASSET_DISTFILES+= ${_PREV_ASSET_FILE}.tar.xz:gnat PREVASSET_VARS= _GCC6AUX_PATH=${WRKDIR}/${_PREV_ASSET_FILE}/bin -.include <bsd.port.pre.mk> - -.if ${UID} != 0 -BINMODE= 755 -.endif - _ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION} _GCC_VER= ${DISTVERSION:R:R} _GNATBIND= ${_GCC6AUX_PATH}/gnatbind @@ -115,13 +113,17 @@ _PLATFORM= ${OPSYS:tl}${OSREL} _PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV} _PREV_ASSET_GCC= ${PREV_ASSET_VER:R:R} _PREV_ASSET_OSREL?= ${OSREL:R} -_PREV_ASSET_VER?= 12.3.0 _PREV_ASSET_REV?= _1 +_PREV_ASSET_VER?= 12.3.0 _REV_FILE= ${WRKSRC}/gcc/REVISION _TARGLIB= ${_PKG_PREFIX}/lib ${_PKG_PREFIX}/lib/gcc${_GCC_VER} _TOOLCHAIN_PATHS= /sbin:/bin:/usr/sbin:/usr/bin:${_GCC6AUX_PATH}:${PREFIX}/bin:${LOCALBASE}/bin -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> + +.if ${UID} != 0 +BINMODE= 755 +.endif .if ${ARCH} == i386 LIB_DIR_32= "" @@ -137,25 +139,24 @@ PLIST_SUB+= LIB32=" " .endif .if ${ARCH} == amd64 -PLIST_SUB+= AMD64=" " \ +PLIST_SUB+= 64BIT=" " \ AARCH64="@comment " \ - X86=" " \ - 64BIT=" " + AMD64=" " \ + X86=" " .elif ${ARCH} == i386 -PLIST_SUB+= AMD64="@comment " \ +PLIST_SUB+= 64BIT="@comment " \ AARCH64="@comment " \ - X86=" " \ - 64BIT="@comment " -.elif ${ARCH} == aarch64 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar -PLIST_SUB+= X86="@comment " \ AMD64="@comment " \ + X86=" " +.elif ${ARCH} == aarch64 +PLIST_SUB+= 64BIT=" " \ AARCH64=" " \ - 64BIT=" " + AMD64="@comment " \ + X86="@comment " .endif pre-configure: - ${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" | \ + ${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" -o -name "*freebsd64.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|!static:[[:blank:]]|!static: --hash-style=gnu -rpath ${PREFIX}/gnat${_GCC_VER}/lib |' ${ECHO} "-=> GNAT ${_OS_LABEL4VERS}" > ${_REV_FILE} ${ECHO} "release" > ${_PHASE_FILE} @@ -185,4 +186,4 @@ post-stage-ASSETS-on: >> ${PKGMESSAGE} ${ECHO_CMD} "(and adjust distinfo)" >> ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/lang/gnat13/Makefile b/lang/gnat13/Makefile index 4ef12cc4bfb6..221b3a1416e7 100644 --- a/lang/gnat13/Makefile +++ b/lang/gnat13/Makefile @@ -19,13 +19,13 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr RUN_DEPENDS= ${LOCALBASE}/bin/as:devel/binutils -USES= bison gettext-runtime gmake iconv libtool localbase tar:xz +USES= bison gmake iconv libtool localbase tar:xz USE_BINUTILS= yes USE_LDCONFIG= ${_TARGLIB} GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${_PKG_PREFIX} GNU_CONFIGURE_MANPREFIX= ${_PKG_PREFIX}/share +GNU_CONFIGURE_PREFIX= ${_PKG_PREFIX} CONFIGURE_ARGS= --disable-bootstrap \ --disable-libgomp \ --disable-libmudflap \ @@ -49,15 +49,18 @@ CONFIGURE_TARGET= ${_GNAT_ARCH}-portbld-${_PLATFORM} MAKE_ENV+= PATH=${_TOOLCHAIN_PATHS} INSTALL_TARGET= install-strip + +PIE_UNSAFE= yes + MANDIRS= ${_PKG_PREFIX}/share/man BINARY_ALIAS= make=${GMAKE} + WRKSRC= ${WRKDIR}/gcc-${DISTVERSION} + PLIST_SUB= ASSET_FILE=${_ASSET_FILE} \ CONFTRGT=${CONFIGURE_TARGET} \ VER=${DISTVERSION} -PIE_UNSAFE= yes - OPTIONS_DEFINE= ASSETS NLS .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_amd64+= MULTILIB @@ -90,37 +93,35 @@ MULTILIB_CONFIGURE_ENABLE= multilib .else CONFIGURE_ARGS+= --disable-multilib .endif +NLS_USES= gettext-runtime NLS_CONFIGURE_ON= --enable-nls NLS_CONFIGURE_OFF= --disable-nls PREVASSET_DISTFILES+= ${_PREV_ASSET_FILE}.tar.xz:gnat PREVASSET_VARS= _GNAT12_PATH=${WRKDIR}/${_PREV_ASSET_FILE}/bin -_OSVERARCH= ${OSVERSION}${ARCH} - -.include <bsd.port.pre.mk> - -.if ${UID} != 0 -BINMODE= 755 -.endif _ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION} _GCC_VER= ${DISTVERSION:R:R} _GNATBIND= ${_GNAT12_PATH}/gnatbind _GNATMAKE= ${_GNAT12_PATH}/gnatmake _GNAT_ARCH= ${ARCH:S/amd64/x86_64/} +_OSVERARCH= ${OSVERSION}${ARCH} _OS_LABEL4VERS= [${OPSYS}${_GNAT_ARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}] _PHASE_FILE= ${WRKSRC}/gcc/DEV-PHASE _PKG_PREFIX= ${PREFIX}/${PORTNAME} _PLATFORM= ${OPSYS:tl}${OSREL} +_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV} +_PREV_ASSET_OSREL= ${OSREL:R} +_PREV_ASSET_REV= +_PREV_ASSET_VER= 13.2.0 _REV_FILE= ${WRKSRC}/gcc/REVISION _TARGLIB= ${_PKG_PREFIX}/lib ${_PKG_PREFIX}/lib/gcc${_GCC_VER} _TOOLCHAIN_PATHS= /sbin:/bin:/usr/sbin:/usr/bin:${_GNAT12_PATH}:${PREFIX}/bin:${LOCALBASE}/bin -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> -_PREV_ASSET_OSREL= ${OSREL:R} -_PREV_ASSET_VER= 13.2.0 -_PREV_ASSET_REV= -_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV} +.if ${UID} != 0 +BINMODE= 755 +.endif .if ${ARCH} == i386 || ${ARCH} == aarch64 LIB_DIR_32= "" @@ -136,7 +137,6 @@ PLIST_SUB+= 32BITS="" . endif .endif .if ${ARCH} == aarch64 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar PLIST_SUB+= ARM="" \ NOARM="@comment " .else @@ -145,7 +145,7 @@ PLIST_SUB+= ARM="@comment " \ .endif pre-configure: - ${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" | \ + ${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" -o -name "*freebsd64.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|!static:[[:blank:]]|!static: --hash-style=gnu -rpath ${PREFIX}/gnat${_GCC_VER}/lib |' ${ECHO} "-=> GNAT ${_OS_LABEL4VERS}" > ${_REV_FILE} ${ECHO} "release" > ${_PHASE_FILE} @@ -175,4 +175,4 @@ post-stage-ASSETS-on: >> ${PKGMESSAGE} ${ECHO_CMD} "(and adjust distinfo)" >> ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/lang/gnat14/Makefile b/lang/gnat14/Makefile index 7b78819e15f0..d16160d87711 100644 --- a/lang/gnat14/Makefile +++ b/lang/gnat14/Makefile @@ -19,13 +19,13 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr RUN_DEPENDS= ${LOCALBASE}/bin/as:devel/binutils -USES= bison gettext-runtime gmake iconv libtool localbase tar:xz +USES= bison gmake iconv libtool localbase tar:xz USE_BINUTILS= yes USE_LDCONFIG= ${_TARGLIB} GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${_PKG_PREFIX} GNU_CONFIGURE_MANPREFIX= ${_PKG_PREFIX}/share +GNU_CONFIGURE_PREFIX= ${_PKG_PREFIX} CONFIGURE_ARGS= --disable-bootstrap \ --disable-libgomp \ --disable-libmudflap \ @@ -49,15 +49,18 @@ CONFIGURE_TARGET= ${_GNAT_ARCH}-portbld-${_PLATFORM} MAKE_ENV+= PATH=${_TOOLCHAIN_PATHS} INSTALL_TARGET= install-strip + +PIE_UNSAFE= yes + MANDIRS= ${_PKG_PREFIX}/share/man BINARY_ALIAS= make=${GMAKE} + WRKSRC= ${WRKDIR}/gcc-${DISTVERSION} + PLIST_SUB= ASSET_FILE=${_ASSET_FILE} \ CONFTRGT=${CONFIGURE_TARGET} \ VER=${DISTVERSION} -PIE_UNSAFE= yes - OPTIONS_DEFINE= ASSETS NLS .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_amd64+= MULTILIB @@ -90,37 +93,35 @@ MULTILIB_CONFIGURE_ENABLE= multilib .else CONFIGURE_ARGS+= --disable-multilib .endif +NLS_USES= gettext-runtime NLS_CONFIGURE_ON= --enable-nls NLS_CONFIGURE_OFF= --disable-nls PREVASSET_DISTFILES+= ${_PREV_ASSET_FILE}.tar.xz:gnat PREVASSET_VARS= _GNAT13_PATH=${WRKDIR}/${_PREV_ASSET_FILE}/bin -_OSVERARCH= ${OSVERSION}${ARCH} - -.include <bsd.port.pre.mk> - -.if ${UID} != 0 -BINMODE= 755 -.endif _ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION} _GCC_VER= ${DISTVERSION:R:R} _GNATBIND= ${_GNAT13_PATH}/gnatbind _GNATMAKE= ${_GNAT13_PATH}/gnatmake _GNAT_ARCH= ${ARCH:S/amd64/x86_64/} +_OSVERARCH= ${OSVERSION}${ARCH} _OS_LABEL4VERS= [${OPSYS}${_GNAT_ARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}] _PHASE_FILE= ${WRKSRC}/gcc/DEV-PHASE _PKG_PREFIX= ${PREFIX}/${PORTNAME} _PLATFORM= ${OPSYS:tl}${OSREL} +_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV} +_PREV_ASSET_OSREL= ${OSREL:R} +_PREV_ASSET_REV= +_PREV_ASSET_VER= 13.2.0 # To be updated when assets for 14 will be available _REV_FILE= ${WRKSRC}/gcc/REVISION _TARGLIB= ${_PKG_PREFIX}/lib ${_PKG_PREFIX}/lib/gcc${_GCC_VER} _TOOLCHAIN_PATHS= /sbin:/bin:/usr/sbin:/usr/bin:${_GNAT13_PATH}:${PREFIX}/bin:${LOCALBASE}/bin -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> -_PREV_ASSET_OSREL= ${OSREL:R} -_PREV_ASSET_VER= 13.2.0 # To be updated when assets for 14 will be available -_PREV_ASSET_REV= -_PREV_ASSET_FILE= gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_ASSET_VER}${_PREV_ASSET_REV} +.if ${UID} != 0 +BINMODE= 755 +.endif .if ${ARCH} == i386 || ${ARCH} == aarch64 LIB_DIR_32= "" @@ -136,7 +137,6 @@ PLIST_SUB+= 32BITS="" . endif .endif .if ${ARCH} == aarch64 -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar PLIST_SUB+= ARM="" \ NOARM="@comment " .else @@ -145,7 +145,7 @@ PLIST_SUB+= ARM="@comment " \ .endif pre-configure: - ${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" | \ + ${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" -o -name "*freebsd64.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|!static:[[:blank:]]|!static: --hash-style=gnu -rpath ${PREFIX}/gnat${_GCC_VER}/lib |' ${ECHO} "-=> GNAT ${_OS_LABEL4VERS}" > ${_REV_FILE} ${ECHO} "release" > ${_PHASE_FILE} @@ -175,4 +175,4 @@ post-stage-ASSETS-on: >> ${PKGMESSAGE} ${ECHO_CMD} "(and adjust distinfo)" >> ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a254eae.27814.3b258cbb>