gcc15-gnat*: pkglinting

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gcc15-gnat*: pkglinting
From: Dmytro Kazankov (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 9 May 2025 09:06:19 +0000
Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dkazankov%NetBSD.org@localhost>
Pushed By:	dkazankov
Date:		Fri May 9 11:59:21 2025 +0300
Changeset:	b61a10326ff4f458922ef02e36cd7eda1310415a

Modified Files:
	gcc15-gnat-libs/Makefile
	gcc15-gnat-libs/buildlink3.mk
	gcc15-gnat/Makefile
	gcc15-gnat/buildlink3.mk
	gcc15-gnat/options.mk

Log Message:
gcc15-gnat*: pkglinting

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b61a10326ff4f458922ef02e36cd7eda1310415a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc15-gnat-libs/Makefile      |  2 +-
 gcc15-gnat-libs/buildlink3.mk |  6 +++---
 gcc15-gnat/Makefile           | 23 ++++++++++++-----------
 gcc15-gnat/buildlink3.mk      |  2 +-
 gcc15-gnat/options.mk         |  6 +++---
 5 files changed, 20 insertions(+), 19 deletions(-)

diffs:
diff --git a/gcc15-gnat-libs/Makefile b/gcc15-gnat-libs/Makefile
index 55cb101404..1919e656b4 100644
--- a/gcc15-gnat-libs/Makefile
+++ b/gcc15-gnat-libs/Makefile
@@ -31,7 +31,7 @@ TOOL_DEPENDS+=		${GCC_PKGNAME}-${GCC_DIST_VERSION}{,nb[0-9]*}:../../wip/${GCC_PK
 .include "../../mk/bsd.prefs.mk"
 
 LIBGCC_SUBPREFIX=	${GCC_PKGNAME}
-LIBGCC_PREFIX=		${LOCALBASE}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX=		${PREFIX}/${LIBGCC_SUBPREFIX}
 GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_PKGNAME
 BUILD_DEFS+=		GCC_TARGET_MACHINE
diff --git a/gcc15-gnat-libs/buildlink3.mk b/gcc15-gnat-libs/buildlink3.mk
index d71f9f8c8d..08a1eb0369 100644
--- a/gcc15-gnat-libs/buildlink3.mk
+++ b/gcc15-gnat-libs/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_API_DEPENDS.gcc15-gnat-libs+=	gcc15-gnat-libs>=15.1.0
 .else
 BUILDLINK_API_DEPENDS.gcc15-gnat-libs+=	{gcc15-gnat,gcc15-gnat-libs}>=15.1.0
 .endif
-BUILDLINK_PKGSRCDIR.gcc15-gnat-libs=	../../wip/gcc15-gnat-libs
+BUILDLINK_PKGSRCDIR.gcc15-gnat-libs?=	../../wip/gcc15-gnat-libs
 BUILDLINK_DEPMETHOD.gcc15-gnat-libs?=	full
 
 GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
@@ -19,9 +19,9 @@ TARGET_LIBDIR.gcc15-gnat-libs=	${PREFIX}/gcc15-gnat/${GCC_TARGET_MACHINE}/lib
 
 BUILDLINK_PASSTHRU_DIRS+=	${TARGET_LIBDIR.gcc15-gnat-libs}
 
-BUILDLINK_FILES.gcc15-gnat-libs=	#empty
+BUILDLINK_FILES.gcc15-gnat-libs?=	#empty
 BUILDLINK_AUTO_VARS.gcc15-gnat-libs=	no
-BUILDLINK_AUTO_DIRS.gcc15-gnat-libs=	no
+BUILDLINK_AUTO_DIRS.gcc15-gnat-libs?=	no
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/gcc15-gnat/Makefile b/gcc15-gnat/Makefile
index 5fb46bc2d3..4c3dcc3502 100644
--- a/gcc15-gnat/Makefile
+++ b/gcc15-gnat/Makefile
@@ -26,8 +26,9 @@ TOOL_DEPENDS+=	gcc10-aux-[0-9]*:../../lang/gcc10-aux
 
 USE_TOOLS+=		gmake makeinfo sed perl flex bison
 USE_TOOLS.NetBSD+=	gsed
-TEXINFO_REQD=		7.0
-BISON_REQD=		3.5
+# Built-in Texinfo can no longer process GCC 15's files
+TEXINFO_REQD+=		7.0
+BISON_REQD+=		3.5
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_STRICT=	no
@@ -56,13 +57,13 @@ BROKEN_ON_PLATFORM=	*-*-i386
 
 .include "options.mk"
 
-BOOTC_BASE=		${LOCALBASE}/gcc10-aux
+BOOTC_BASE=		${PREFIX}/gcc10-aux
 BOOTC_LD_LIBRARY_PATH=	${BOOTC_BASE}/lib:${BOOTC_BASE}/lib/gcc/${MACHINE_GNU_PLATFORM}/10.3.0:${BOOTC_BASE}/lib/gcc/${MACHINE_GNU_PLATFORM}/10.3.0/adalib
 
 CONFIGURE_ENV+=		CC_FOR_BUILD=${BOOTC_BASE}/bin/gcc
 CONFIGURE_ENV+=		CXX_FOR_BUILD=${BOOTC_BASE}/bin/g++
 
-MAKE_ENV+=	LD_LIBRARY_PATH=${BOOTC_LD_LIBRARY_PATH}
+MAKE_ENV+=	LD_LIBRARY_PATH=${BOOTC_LD_LIBRARY_PATH:Q}
 
 ## Build outside ${WRKSRC}
 OBJDIR=			${WRKDIR}/build
@@ -133,14 +134,14 @@ CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--with-gxx-include-dir='${GCC_PREFIX}/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}
+CONFIGURE_ARGS+=	--with-stage1-ldflags=${STAGE1_LDFLAGS:M*:Q}
+CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:M*:Q}
 # causes build errors even when using lang/gcc* to self host
 CONFIGURE_ARGS.SunOS+=	--disable-libsanitizer
 # multilib on Darwin requires fat-binaries
 CONFIGURE_ARGS.Darwin+=	--disable-multilib
 .if !empty(OSX_SDK_PATH)
-CONFIGURE_ARGS.Darwin+=	--with-sysroot=${OSX_SDK_PATH}
+CONFIGURE_ARGS.Darwin+=	--with-sysroot=${OSX_SDK_PATH:Q}
 .endif
 MAKE_ENV.NetBSD+=	ac_cv_func_clock_gettime=yes
 MAKE_ENV.NetBSD+=	ac_cv_func_gethostbyname_r=no
@@ -210,19 +211,19 @@ BUILD_DEFS+=		GCC_TARGET_MACHINE
 .if ${OPSYS} == "NetBSD"
 SUBST_CLASSES+=		select
 SUBST_MESSAGE.select=	Replace select with __gnat_select in ${SUBST_FILES.select}
-SUBST_STAGE.select=	post-patch
+SUBST_STAGE.select=	pre-configure
 SUBST_FILES.select=	gcc/ada/libgnat/g-socthi.ads
 SUBST_SED.select=	-e "s,\"select\",\"__gnat_select\","
 
 SUBST_CLASSES+=			nanosleep
 SUBST_MESSAGE.nanosleep=	Replace nanosleep with __gnat_nanosleep in ${SUBST_FILES.nanosleep}
-SUBST_STAGE.nanosleep=		post-patch
+SUBST_STAGE.nanosleep=		pre-configure
 SUBST_FILES.nanosleep=		gcc/ada/libgnat/s-osprim__posix.adb
 SUBST_SED.nanosleep=		-e "s,\"nanosleep\",\"__gnat_nanosleep\","
 
 SUBST_CLASSES+=			gettimeofday
 SUBST_MESSAGE.gettimeofday=	Replace gettimeofday with __gnat_gettimeofday in ${SUBST_FILES.gettimeofday}
-SUBST_STAGE.gettimeofday=	post-patch
+SUBST_STAGE.gettimeofday=	pre-configure
 SUBST_FILES.gettimeofday=	gcc/ada/libgnat/s-osprim__posix.adb
 SUBST_SED.gettimeofday=		-e "s,\"gettimeofday\",\"__gnat_gettimeofday\","
 .endif
@@ -245,7 +246,7 @@ post-install:
 	${CHMOD} g-w ${DESTDIR}${GCC_PREFIX}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC_DIST_VERSION}/adainclude/standard.ads.h
 # Create old name that modern gnat no longer provides
 	${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/gnat && \
-		( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gnat ada )
+		( ${RUN} cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gnat ada )
 .if ${MACHINE_PLATFORM:MSunOS-*-*86*} && ${OS_VERSION} != "5.11"
 	${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
 	${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
diff --git a/gcc15-gnat/buildlink3.mk b/gcc15-gnat/buildlink3.mk
index 0b3726c307..f3bfe8e651 100644
--- a/gcc15-gnat/buildlink3.mk
+++ b/gcc15-gnat/buildlink3.mk
@@ -7,7 +7,7 @@ GCC15_GNAT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gcc15-gnat+=	gcc15-gnat>=15
 BUILDLINK_ABI_DEPENDS.gcc15-gnat+=	gcc15-gnat>=15.1
-BUILDLINK_PKGSRCDIR.gcc15-gnat=		../../wip/gcc15-gnat
+BUILDLINK_PKGSRCDIR.gcc15-gnat?=	../../wip/gcc15-gnat
 BUILDLINK_DEPMETHOD.gcc15-gnat?=	build
 
 PREPEND_PATH+=	${BUILDLINK_DIR}/gcc15-gnat/bin
diff --git a/gcc15-gnat/options.mk b/gcc15-gnat/options.mk
index d32a55daa5..7bacca0701 100644
--- a/gcc15-gnat/options.mk
+++ b/gcc15-gnat/options.mk
@@ -9,11 +9,11 @@ PKG_SUGGESTED_OPTIONS=	gcc-graphite
 .if ${OPSYS} == "NetBSD"
 #PKG_SUGGESTED_OPTIONS+=	nls
 .elif ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=	nls
+PKG_SUGGESTED_OPTIONS+=		nls
 .elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+=	nls
+PKG_SUGGESTED_OPTIONS+=		nls
 .elif ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
+PKG_SUGGESTED_OPTIONS+=		gcc-inplace-math
 .endif
 
 ###
Prev by Date: ladybird-git: regen PLIST & distinfo
Next by Date: spirv-tools: update to 2025.1.
Previous by Thread: ladybird-git: regen PLIST & distinfo
Next by Thread: spirv-tools: update to 2025.1.
Indexes:
Home | Main Index | Thread Index | Old Index