pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/gcc14-gnat
Module Name: pkgsrc
Committed By: dkazankov
Date: Wed Jul 9 17:24:09 UTC 2025
Modified Files:
pkgsrc/lang/gcc14-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.4 -r1.5 pkgsrc/lang/gcc14-gnat/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc14-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/gcc14-gnat/Makefile
diff -u pkgsrc/lang/gcc14-gnat/Makefile:1.4 pkgsrc/lang/gcc14-gnat/Makefile:1.5
--- pkgsrc/lang/gcc14-gnat/Makefile:1.4 Wed Jul 2 06:28:28 2025
+++ pkgsrc/lang/gcc14-gnat/Makefile Wed Jul 9 17:24:08 2025
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2025/07/02 06:28:28 dkazankov Exp $
+# $NetBSD: Makefile,v 1.5 2025/07/09 17:24:08 dkazankov Exp $
-GCC_PKGNAME= gcc14
-GCC_DIST_VERSION= 14.3.0
-
-PKGNAME= ${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}
-PKGREVISION= 1
-COMMENT= GNAT Compiler and Ada tools
-DISTNAME= gcc-${GCC_DIST_VERSION}
+DISTNAME= gcc-${PKGVERSION_NOREV}
+PKGNAME= gcc14-gnat-14.3.0
+PKGREVISION= 2
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
DISTFILES= ${DEFAULT_DISTFILES}
@@ -25,20 +22,14 @@ USE_LANGUAGES= c c++ ada
USE_TOOLS+= gmake makeinfo sed perl
USE_TOOLS.NetBSD+= gsed
+INFO_FILES= yes
GNU_CONFIGURE= yes
GNU_CONFIGURE_STRICT= no
-## Build outside ${WRKSRC}
-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}
-INFO_FILES= yes
-CONFIGURE_ARGS+= --disable-libstdcxx-pch
-
USE_PKGSRC_GCC= yes
+
+.include "../../mk/bsd.prefs.mk"
+
GCC_REQD+= 10
UNLIMIT_RESOURCES+= datasize
@@ -47,10 +38,16 @@ UNLIMIT_RESOURCES+= stacksize
CHECK_PORTABILITY_SKIP+= contrib/*
CHECK_PORTABILITY_SKIP+= gcc/configure.orig_dist
-.include "../../mk/bsd.prefs.mk"
+## Build outside ${WRKSRC}
+OBJDIR= ${WRKDIR}/build
+CONFIGURE_DIRS= ${OBJDIR}
+CONFIGURE_SCRIPT= ${WRKSRC}/configure
+GNU_CONFIGURE_PREFIX= ${PREFIX}/${PKGBASE}
.include "options.mk"
+CONFIGURE_ARGS+= --disable-libstdcxx-pch
+
.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
BUILDLINK_TRANSFORM+= rm:-nodefaultrpaths
CONFIGURE_ARGS+= --disable-darwin-at-rpath
@@ -66,8 +63,8 @@ LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:
# we mash supply them.
LDFLAGS_FOR_TARGET= -static-libstdc++ -static-libgcc
## The Library rpath to use in end programs.
-LDFLAGS_FOR_TARGET+= ${COMPILER_RPATH_FLAG}${GNAT_PREFIX}/lib
-LDFLAGS_FOR_TARGET+= ${COMPILER_RPATH_FLAG}${GNAT_PREFIX}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC_DIST_VERSION}/adalib
+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
# Needed on Darwin when LDFLAGS point to a SDK
@@ -101,17 +98,12 @@ CONFIGURE_ARGS+= --enable-libssp
.endif
CONFIGURE_ARGS+= --enable-languages=ada,c,c++ --enable-stage1-languages=ada,c,c++
-#CONFIGURE_ARGS+= --with-static-standard-libraries
# This will create slightly slower compiler
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-host-shared
-#CONFIGURE_ARGS+= --enable-host-pie
-#CONFIGURE_ARGS+= --enable-host-bind-now
-#CONFIGURE_ARGS+= --enable-default-pie
-#CONFIGURE_ARGS+= --with-newlib
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
@@ -224,18 +216,18 @@ 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
GENERATE_PLIST+= \
cd ${DESTDIR}${PREFIX} && \
- ${FIND} ${GNAT_SUBPREFIX} \( -type f -or -type l \) -print | ${SORT};
+ ${FIND} ${PKGBASE} \( -type f -or -type l \) -print | ${SORT};
.include "../../archivers/zstd/buildlink3.mk"
CONFIGURE_ARGS+= --with-zstd=${BUILDLINK_PREFIX.zstd}
Index: pkgsrc/lang/gcc14-gnat/buildlink3.mk
diff -u pkgsrc/lang/gcc14-gnat/buildlink3.mk:1.2 pkgsrc/lang/gcc14-gnat/buildlink3.mk:1.3
--- pkgsrc/lang/gcc14-gnat/buildlink3.mk:1.2 Wed Jun 11 13:27:04 2025
+++ pkgsrc/lang/gcc14-gnat/buildlink3.mk Wed Jul 9 17:24:08 2025
@@ -1,36 +1,29 @@
-# $NetBSD: buildlink3.mk,v 1.2 2025/06/11 13:27:04 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/07/09 17:24:08 dkazankov Exp $
BUILDLINK_TREE+= gcc14-gnat
.if !defined(GCC14_GNAT_BUILDLINK3_MK)
GCC14_GNAT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gcc14-gnat+= gcc14-gnat>=14
-BUILDLINK_ABI_DEPENDS.gcc14-gnat+= gcc14-gnat>=14.1
-BUILDLINK_PKGSRCDIR.gcc14-gnat= ../../lang/gcc14-gnat
+BUILDLINK_API_DEPENDS.gcc14-gnat+= gcc14-gnat>=14.1.0
+BUILDLINK_ABI_DEPENDS.gcc14-gnat+= gcc14-gnat>=14.3.0
+BUILDLINK_PKGSRCDIR.gcc14-gnat?= ../../lang/gcc14-gnat
BUILDLINK_DEPMETHOD.gcc14-gnat?= build
-PREPEND_PATH+= ${BUILDLINK_DIR}/gcc14-gnat/bin
+ADALIB_BASE= lib/gcc/${MACHINE_GNU_PLATFORM}/14.3.0
-GNU_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
-
-ADALIB_PREFIX= gcc14-gnat/lib/gcc/${GNU_TARGET_MACHINE}/14.3.0
-
-BUILDLINK_FILES.gcc14-gnat+= gcc14-gnat/${GNU_TARGET_MACHINE}/lib/*
+BUILDLINK_FNAME_TRANSFORM.gcc14-gnat+= -e "s|^${BUILDLINK_DIR}/gcc14-gnat/|${BUILDLINK_DIR}/|g"
BUILDLINK_INCDIRS.gcc14-gnat+= gcc14-gnat/include
-BUILDLINK_INCDIRS.gcc14-gnat+= ${ADALIB_PREFIX}/include
-BUILDLINK_INCDIRS.gcc14-gnat+= ${ADALIB_PREFIX}/include-fixed
-BUILDLINK_INCDIRS.gcc14-gnat+= ${ADALIB_PREFIX}/plugin/include
-BUILDLINK_INCDIRS.gcc14-gnat+= ${ADALIB_PREFIX}/adainclude
+BUILDLINK_INCDIRS.gcc14-gnat+= gcc14-gnat/${ADALIB_BASE}/include
+BUILDLINK_INCDIRS.gcc14-gnat+= gcc14-gnat/${ADALIB_BASE}/adainclude
BUILDLINK_LIBDIRS.gcc14-gnat+= gcc14-gnat/lib
-BUILDLINK_LIBDIRS.gcc14-gnat+= ${ADALIB_PREFIX}
-BUILDLINK_LIBDIRS.gcc14-gnat+= ${ADALIB_PREFIX}/adalib
-BUILDLINK_LIBDIRS.gcc14-gnat+= gcc14-gnat/${GNU_TARGET_MACHINE}/lib
+BUILDLINK_LIBDIRS.gcc14-gnat+= gcc14-gnat/${ADALIB_BASE}
+BUILDLINK_LIBDIRS.gcc14-gnat+= gcc14-gnat/${ADALIB_BASE}/adalib
BUILDLINK_CONTENTS_FILTER.gcc14-gnat= ${EGREP} \
- '(bin/.*|include/.*|lib/.*|libexec/.*|${GNU_TARGET_MACHINE}/lib/.*)'
+ '(bin/.*|include/.*|lib/.*|libexec/.*)'
pkgbase := gcc14-gnat
.include "../../mk/pkg-build-options.mk"
Home |
Main Index |
Thread Index |
Old Index