CVS commit: pkgsrc/lang/gcc13-gnat

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/gcc13-gnat
From: "Dmytro Kazankov" <dkazankov%netbsd.org@localhost>
Date: Wed, 9 Jul 2025 17:10:44 +0000

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Wed Jul  9 17:10:44 UTC 2025

Modified Files:
        pkgsrc/lang/gcc13-gnat: Makefile buildlink3.mk

Log Message:
lang/gcc13-gnat: make it easier to use the package in child library packages

* Eliminate use of GNAT_PREFIX variable - its definition
  will be moved to gcc.mk and will be used in child packages
* Start unbinding of build process of gcc*-gnat packages from gcc.mk
* Use BUILDLINK_FNAME_TRANSFORM instead of PREPEND_PATH


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc13-gnat/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc13-gnat/buildlink3.mk

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.8 pkgsrc/lang/gcc13-gnat/Makefile:1.9
--- pkgsrc/lang/gcc13-gnat/Makefile:1.8 Wed Jul  2 18:09:02 2025
+++ pkgsrc/lang/gcc13-gnat/Makefile     Wed Jul  9 17:10:43 2025
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2025/07/02 18:09:02 dkazankov Exp $
+# $NetBSD: Makefile,v 1.9 2025/07/09 17:10:43 dkazankov Exp $
 
-GCC_PKGNAME=           gcc13
-GCC_DIST_VERSION=      13.4.0
-
-PKGNAME=       ${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}
-#PKGREVISION=  4
-COMMENT=       GNAT Compiler and Ada tools
-DISTNAME=      gcc-${GCC_DIST_VERSION}
+DISTNAME=      gcc-${PKGVERSION_NOREV}
+PKGNAME=       gcc13-gnat-13.4.0
+PKGREVISION=   1
 CATEGORIES=    lang
-MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
+MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/${DISTNAME}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    dkazankov%NetBSD.org@localhost
 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
 
 INFO_FILES=            yes
@@ -43,9 +40,7 @@ CHECK_PORTABILITY_SKIP+=      gcc/configure.o
 OBJDIR=                        ${WRKDIR}/build
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIGURE_SCRIPT=      ${WRKSRC}/configure
-GNAT_SUBPREFIX=                ${GCC_PKGNAME}-gnat
-GNAT_PREFIX=           ${PREFIX}/${GNAT_SUBPREFIX}
-GNU_CONFIGURE_PREFIX=  ${GNAT_PREFIX}
+GNU_CONFIGURE_PREFIX=  ${PREFIX}/${PKGBASE}
 
 .include "options.mk"
 
@@ -63,8 +58,8 @@ LDFLAGS_FOR_TARGET=   ${COMPILER_RPATH_FLA
 # boot-ldflags by configure but because we are supply the boot-ldflags
 # we mash supply them.
 BOOT_LDFLAGS=          -static-libstdc++ -static-libgcc
-BOOT_LDFLAGS+=         ${COMPILER_RPATH_FLAG}${GNAT_PREFIX}/lib
-BOOT_LDFLAGS+=         ${COMPILER_RPATH_FLAG}${GNAT_PREFIX}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC_DIST_VERSION}/adalib
+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)
@@ -105,8 +100,8 @@ CONFIGURE_ARGS+=    --enable-languages=c,c+
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --enable-host-shared
 CONFIGURE_ARGS+=       --enable-long-long
-CONFIGURE_ARGS+=       --with-local-prefix=${GNAT_PREFIX:Q}
-CONFIGURE_ARGS+=       --with-gxx-include-dir=${GNAT_PREFIX}/include/c++
+CONFIGURE_ARGS+=       --with-local-prefix=${PREFIX}/${PKGBASE}
+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}
@@ -205,13 +200,7 @@ TEST_DEPENDS+=     dejagnu-[0-9]*:../../deve
 
 GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
-       ${FIND} ${GNAT_SUBPREFIX} \( -type f -or -type l \) -print | ${SORT};
-
-.include "../../archivers/zstd/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-zstd=${BUILDLINK_PREFIX.zstd}
-
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+       ${FIND} ${PKGBASE} \( -type f -or -type l \) -print | ${SORT};
 
 pre-configure:
        ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
@@ -223,13 +212,19 @@ post-test:
 
 post-install:
 # Fix group write mode
-       ${CHMOD} g-w ${DESTDIR}${GNAT_PREFIX}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC_DIST_VERSION}/adainclude/standard.ads.h
+       ${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}${GNAT_PREFIX}/bin/gnat && \
-               ( cd ${DESTDIR}${GNAT_PREFIX}/bin ; ${LN} -f gnat ada )
+       ${TEST} -f ${DESTDIR}${PREFIX}/${PKGBASE}/bin/gnat && \
+               ( cd ${DESTDIR}${PREFIX}/${PKGBASE}/bin ; ${LN} -f gnat ada )
 .if ${MACHINE_PLATFORM:MSunOS-*-*86*} && ${OS_VERSION} != "5.11"
-       ${SH} files/values.c ${DESTDIR}${GNAT_PREFIX}/bin/gcc -m32 || ${TRUE}
-       ${SH} files/values.c ${DESTDIR}${GNAT_PREFIX}/bin/gcc -m64 || ${TRUE}
+       ${SH} files/values.c ${DESTDIR}${PREFIX}/${PKGBASE}/bin/gcc -m32 || ${TRUE}
+       ${SH} files/values.c ${DESTDIR}${PREFIX}/${PKGBASE}/bin/gcc -m64 || ${TRUE}
 .endif
 
+.include "../../archivers/zstd/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-zstd=${BUILDLINK_PREFIX.zstd}
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/gcc13-gnat/buildlink3.mk
diff -u pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.4 pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.5
--- pkgsrc/lang/gcc13-gnat/buildlink3.mk:1.4    Wed Jul  2 18:09:02 2025
+++ pkgsrc/lang/gcc13-gnat/buildlink3.mk        Wed Jul  9 17:10:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2025/07/02 18:09:02 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2025/07/09 17:10:43 dkazankov Exp $
 
 BUILDLINK_TREE+=       gcc13-gnat
 
@@ -7,30 +7,23 @@ GCC13_GNAT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gcc13-gnat+=     gcc13-gnat>=13.1.0
 BUILDLINK_ABI_DEPENDS.gcc13-gnat+=     gcc13-gnat>=13.4.0
-BUILDLINK_PKGSRCDIR.gcc13-gnat=                ../../lang/gcc13-gnat
+BUILDLINK_PKGSRCDIR.gcc13-gnat?=       ../../lang/gcc13-gnat
 BUILDLINK_DEPMETHOD.gcc13-gnat?=       build
 
-PREPEND_PATH+= ${BUILDLINK_DIR}/gcc13-gnat/bin
+ADALIB_BASE=           lib/gcc/${MACHINE_GNU_PLATFORM}/13.4.0
 
-GNU_TARGET_MACHINE?=   ${MACHINE_GNU_PLATFORM}
-
-ADALIB_PREFIX=         gcc13-gnat/lib/gcc/${GNU_TARGET_MACHINE}/13.4.0
-
-BUILDLINK_FILES.gcc13-gnat+=   gcc13-gnat/${GNU_TARGET_MACHINE}/lib/*
+BUILDLINK_FNAME_TRANSFORM.gcc13-gnat+= -e "s|^${BUILDLINK_DIR}/gcc13-gnat/|${BUILDLINK_DIR}/|g"
 
 BUILDLINK_INCDIRS.gcc13-gnat+= gcc13-gnat/include
-BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/include
-BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/include-fixed
-BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/plugin/include
-BUILDLINK_INCDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/adainclude
+BUILDLINK_INCDIRS.gcc13-gnat+= gcc13-gnat/${ADALIB_BASE}/include
+BUILDLINK_INCDIRS.gcc13-gnat+= gcc13-gnat/${ADALIB_BASE}/adainclude
 
 BUILDLINK_LIBDIRS.gcc13-gnat+= gcc13-gnat/lib
-BUILDLINK_LIBDIRS.gcc13-gnat+= ${ADALIB_PREFIX}
-BUILDLINK_LIBDIRS.gcc13-gnat+= ${ADALIB_PREFIX}/adalib
-BUILDLINK_LIBDIRS.gcc13-gnat+= gcc13-gnat/${GNU_TARGET_MACHINE}/lib
+BUILDLINK_LIBDIRS.gcc13-gnat+= gcc13-gnat/${ADALIB_BASE}
+BUILDLINK_LIBDIRS.gcc13-gnat+= gcc13-gnat/${ADALIB_BASE}/adalib
 
 BUILDLINK_CONTENTS_FILTER.gcc13-gnat=  ${EGREP} \
-                                       '(bin/.*|include/.*|lib/.*|libexec/.*|${GNU_TARGET_MACHINE}/lib/.*)'
+                                       '(bin/.*|include/.*|lib/.*|libexec/.*)'
 
 pkgbase := gcc13-gnat
 .include "../../mk/pkg-build-options.mk"

Prev by Date: CVS commit: pkgsrc/biology/plinkseq
Next by Date: CVS commit: pkgsrc/lang/nawk/files
Previous by Thread: CVS commit: pkgsrc/biology/plinkseq
Next by Thread: CVS commit: pkgsrc/lang/nawk/files
Indexes:

Home | Main Index | Thread Index | Old Index