pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gprlib: lint package, add shlib options handling



Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dkazankov%NetBSD.org@localhost>
Pushed By:	dkazankov
Date:		Tue May 20 06:04:27 2025 +0300
Changeset:	1d1cf6d501c740a400ada52b6f18aaa30865e5b8

Modified Files:
	gprlib/Makefile
	gprlib/buildlink3.mk
	gprlib/distinfo
	gprlib/patches/patch-gpr_gpr.gpr
	gprlib/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb
	gprlib/patches/patch-gpr_src_gpr-version.ads
	gprlib/patches/patch-gpr_src_gpr_imports.c
Added Files:
	gprlib/options.mk
Removed Files:
	gprlib/PLIST

Log Message:
gprlib: lint package, add shlib options handling

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

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

diffstat:
 gprlib/Makefile                                    |  35 +-
 gprlib/PLIST                                       | 382 ---------------------
 gprlib/buildlink3.mk                               |  13 +-
 gprlib/distinfo                                    |   8 +-
 gprlib/options.mk                                  |  21 ++
 gprlib/patches/patch-gpr_gpr.gpr                   |   2 +-
 ...r_src_gpr-util-put__resource__usage____unix.adb |   4 +-
 gprlib/patches/patch-gpr_src_gpr-version.ads       |   2 +-
 gprlib/patches/patch-gpr_src_gpr_imports.c         |   2 +-
 9 files changed, 59 insertions(+), 410 deletions(-)

diffs:
diff --git a/gprlib/Makefile b/gprlib/Makefile
index f9d04f1b4b..e5a8d7518a 100644
--- a/gprlib/Makefile
+++ b/gprlib/Makefile
@@ -1,12 +1,13 @@
 # $NetBSD: Makefile,v 1.0 2024/05/06 15:00:00 dkazankov Exp $
 
-PKGNAME=	gprlib-25.0.0
 DISTNAME=	gprbuild-${PKGVERSION_NOREV}
+PKGNAME=	gprlib-25.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
 GITHUB_PROJECT=	gprbuild
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
+MAINTAINER=	dkazankov%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/AdaCore/gprbuild
 COMMENT=	LIBGPR development libraries
 LICENSE=	gnu-gpl-v3
@@ -16,26 +17,38 @@ HAS_CONFIGURE=	yes
 
 USE_LANGUAGES=	c ada
 
+# GPRLIB 25 uses -gnat2020 switch
 GCC_REQD+=	13
 
-CONFIG_SHELL_FLAGS+=	prefix=${DESTDIR}${PREFIX} ENABLE_SHARED=yes
-CONFIG_SHELL=		${MAKE_PROGRAM}
-CONFIGURE_SCRIPT=	setup
+.include "../../mk/bsd.prefs.mk"
+
+.include "options.mk"
 
-BUILD_TARGET=		libgpr.build
+# Use C preprocessed symbols on NetBSD
+.if ${OPSYS} == "NetBSD"
+SUBST_CLASSES+=			getrusage
+SUBST_MESSAGE.getrusage=	Replace getrusage with __netbsd_getrusage in ${SUBST_FILES.getrusage}
+SUBST_STAGE.getrusage=		pre-configure
+SUBST_FILES.getrusage=		gpr/src/gpr-util-put_resource_usage__unix.adb
+SUBST_SED.getrusage=		-e "s,\"getrusage\",\"__netbsd_getrusage\","
+.endif
+
+CONFIGURE_ARGS+=	prefix=${DESTDIR}${PREFIX}
 
+do-configure:
+	${RUN}${_ULIMIT_CMD} \
+	cd ${WRKSRC} && \
+	${PKGSRC_SETENV} ${CONFIGURE_ENV} \
+	${MAKE_PROGRAM} ${CONFIGURE_ARGS} setup
+
+BUILD_TARGET=		libgpr.build
 INSTALL_TARGET=		libgpr.install
 
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 	${FIND} include lib share \( -type f -or -type l \) -print | ${SORT};
 
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../lang/gcc13-gnat-libs/buildlink3.mk"
-.include "../../wip/gprbuild/buildlink3.mk"
-
-BUILDLINK_DEPMETHOD.xmlada=	full
+.include "../../devel/gprbuild/buildlink3.mk"
 .include "../../wip/xmlada/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/gprlib/PLIST b/gprlib/PLIST
deleted file mode 100644
index 0ad8b743ee..0000000000
--- a/gprlib/PLIST
+++ /dev/null
@@ -1,382 +0,0 @@
-@comment $NetBSD: PLIST,v 1.0 2024/05/08 18:00:00 dkazankov Exp $
-include/gpr/gpr.relocatable/gpr-ali.adb
-include/gpr/gpr.relocatable/gpr-ali.ads
-include/gpr/gpr.relocatable/gpr-attr-pm.adb
-include/gpr/gpr.relocatable/gpr-attr-pm.ads
-include/gpr/gpr.relocatable/gpr-attr.adb
-include/gpr/gpr.relocatable/gpr-attr.ads
-include/gpr/gpr.relocatable/gpr-com.ads
-include/gpr/gpr.relocatable/gpr-compilation-process-waiter.adb
-include/gpr/gpr.relocatable/gpr-compilation-process-waiter.ads
-include/gpr/gpr.relocatable/gpr-compilation-process.adb
-include/gpr/gpr.relocatable/gpr-compilation-process.ads
-include/gpr/gpr.relocatable/gpr-compilation-protocol.adb
-include/gpr/gpr.relocatable/gpr-compilation-protocol.ads
-include/gpr/gpr.relocatable/gpr-compilation-slave.adb
-include/gpr/gpr.relocatable/gpr-compilation-slave.ads
-include/gpr/gpr.relocatable/gpr-compilation-sync.adb
-include/gpr/gpr.relocatable/gpr-compilation-sync.ads
-include/gpr/gpr.relocatable/gpr-compilation.adb
-include/gpr/gpr.relocatable/gpr-compilation.ads
-include/gpr/gpr.relocatable/gpr-conf.adb
-include/gpr/gpr.relocatable/gpr-conf.ads
-include/gpr/gpr.relocatable/gpr-cset.adb
-include/gpr/gpr.relocatable/gpr-cset.ads
-include/gpr/gpr.relocatable/gpr-debug.adb
-include/gpr/gpr.relocatable/gpr-debug.ads
-include/gpr/gpr.relocatable/gpr-dect.adb
-include/gpr/gpr.relocatable/gpr-dect.ads
-include/gpr/gpr.relocatable/gpr-env.adb
-include/gpr/gpr.relocatable/gpr-env.ads
-include/gpr/gpr.relocatable/gpr-err-scanner.adb
-include/gpr/gpr.relocatable/gpr-err.adb
-include/gpr/gpr.relocatable/gpr-err.ads
-include/gpr/gpr.relocatable/gpr-erroutc.adb
-include/gpr/gpr.relocatable/gpr-erroutc.ads
-include/gpr/gpr.relocatable/gpr-ext.adb
-include/gpr/gpr.relocatable/gpr-ext.ads
-include/gpr/gpr.relocatable/gpr-jobserver.adb
-include/gpr/gpr.relocatable/gpr-jobserver.ads
-include/gpr/gpr.relocatable/gpr-knowledge.adb
-include/gpr/gpr.relocatable/gpr-knowledge.ads
-include/gpr/gpr.relocatable/gpr-names.adb
-include/gpr/gpr.relocatable/gpr-names.ads
-include/gpr/gpr.relocatable/gpr-nmsc.adb
-include/gpr/gpr.relocatable/gpr-nmsc.ads
-include/gpr/gpr.relocatable/gpr-opt.ads
-include/gpr/gpr.relocatable/gpr-osint.adb
-include/gpr/gpr.relocatable/gpr-osint.ads
-include/gpr/gpr.relocatable/gpr-output.adb
-include/gpr/gpr.relocatable/gpr-output.ads
-include/gpr/gpr.relocatable/gpr-part.adb
-include/gpr/gpr.relocatable/gpr-part.ads
-include/gpr/gpr.relocatable/gpr-pp.adb
-include/gpr/gpr.relocatable/gpr-pp.ads
-include/gpr/gpr.relocatable/gpr-proc.adb
-include/gpr/gpr.relocatable/gpr-proc.ads
-include/gpr/gpr.relocatable/gpr-scans.adb
-include/gpr/gpr.relocatable/gpr-scans.ads
-include/gpr/gpr.relocatable/gpr-script.adb
-include/gpr/gpr.relocatable/gpr-script.ads
-include/gpr/gpr.relocatable/gpr-sdefault.adb
-include/gpr/gpr.relocatable/gpr-sdefault.ads
-include/gpr/gpr.relocatable/gpr-sinput.adb
-include/gpr/gpr.relocatable/gpr-sinput.ads
-include/gpr/gpr.relocatable/gpr-snames.adb
-include/gpr/gpr.relocatable/gpr-snames.ads
-include/gpr/gpr.relocatable/gpr-strt.adb
-include/gpr/gpr.relocatable/gpr-strt.ads
-include/gpr/gpr.relocatable/gpr-tempdir.adb
-include/gpr/gpr.relocatable/gpr-tempdir.ads
-include/gpr/gpr.relocatable/gpr-tree.adb
-include/gpr/gpr.relocatable/gpr-tree.ads
-include/gpr/gpr.relocatable/gpr-util-aux.adb
-include/gpr/gpr.relocatable/gpr-util-aux.ads
-include/gpr/gpr.relocatable/gpr-util-knowledge.adb
-include/gpr/gpr.relocatable/gpr-util-put_resource_usage__unix.adb
-include/gpr/gpr.relocatable/gpr-util.adb
-include/gpr/gpr.relocatable/gpr-util.ads
-include/gpr/gpr.relocatable/gpr-version.adb
-include/gpr/gpr.relocatable/gpr-version.ads
-include/gpr/gpr.relocatable/gpr.adb
-include/gpr/gpr.relocatable/gpr.ads
-include/gpr/gpr.relocatable/gpr_build_util.adb
-include/gpr/gpr.relocatable/gpr_build_util.ads
-include/gpr/gpr.relocatable/gpr_imports.c
-include/gpr/gpr.static-pic/gpr-ali.adb
-include/gpr/gpr.static-pic/gpr-ali.ads
-include/gpr/gpr.static-pic/gpr-attr-pm.adb
-include/gpr/gpr.static-pic/gpr-attr-pm.ads
-include/gpr/gpr.static-pic/gpr-attr.adb
-include/gpr/gpr.static-pic/gpr-attr.ads
-include/gpr/gpr.static-pic/gpr-com.ads
-include/gpr/gpr.static-pic/gpr-compilation-process-waiter.adb
-include/gpr/gpr.static-pic/gpr-compilation-process-waiter.ads
-include/gpr/gpr.static-pic/gpr-compilation-process.adb
-include/gpr/gpr.static-pic/gpr-compilation-process.ads
-include/gpr/gpr.static-pic/gpr-compilation-protocol.adb
-include/gpr/gpr.static-pic/gpr-compilation-protocol.ads
-include/gpr/gpr.static-pic/gpr-compilation-slave.adb
-include/gpr/gpr.static-pic/gpr-compilation-slave.ads
-include/gpr/gpr.static-pic/gpr-compilation-sync.adb
-include/gpr/gpr.static-pic/gpr-compilation-sync.ads
-include/gpr/gpr.static-pic/gpr-compilation.adb
-include/gpr/gpr.static-pic/gpr-compilation.ads
-include/gpr/gpr.static-pic/gpr-conf.adb
-include/gpr/gpr.static-pic/gpr-conf.ads
-include/gpr/gpr.static-pic/gpr-cset.adb
-include/gpr/gpr.static-pic/gpr-cset.ads
-include/gpr/gpr.static-pic/gpr-debug.adb
-include/gpr/gpr.static-pic/gpr-debug.ads
-include/gpr/gpr.static-pic/gpr-dect.adb
-include/gpr/gpr.static-pic/gpr-dect.ads
-include/gpr/gpr.static-pic/gpr-env.adb
-include/gpr/gpr.static-pic/gpr-env.ads
-include/gpr/gpr.static-pic/gpr-err-scanner.adb
-include/gpr/gpr.static-pic/gpr-err.adb
-include/gpr/gpr.static-pic/gpr-err.ads
-include/gpr/gpr.static-pic/gpr-erroutc.adb
-include/gpr/gpr.static-pic/gpr-erroutc.ads
-include/gpr/gpr.static-pic/gpr-ext.adb
-include/gpr/gpr.static-pic/gpr-ext.ads
-include/gpr/gpr.static-pic/gpr-jobserver.adb
-include/gpr/gpr.static-pic/gpr-jobserver.ads
-include/gpr/gpr.static-pic/gpr-knowledge.adb
-include/gpr/gpr.static-pic/gpr-knowledge.ads
-include/gpr/gpr.static-pic/gpr-names.adb
-include/gpr/gpr.static-pic/gpr-names.ads
-include/gpr/gpr.static-pic/gpr-nmsc.adb
-include/gpr/gpr.static-pic/gpr-nmsc.ads
-include/gpr/gpr.static-pic/gpr-opt.ads
-include/gpr/gpr.static-pic/gpr-osint.adb
-include/gpr/gpr.static-pic/gpr-osint.ads
-include/gpr/gpr.static-pic/gpr-output.adb
-include/gpr/gpr.static-pic/gpr-output.ads
-include/gpr/gpr.static-pic/gpr-part.adb
-include/gpr/gpr.static-pic/gpr-part.ads
-include/gpr/gpr.static-pic/gpr-pp.adb
-include/gpr/gpr.static-pic/gpr-pp.ads
-include/gpr/gpr.static-pic/gpr-proc.adb
-include/gpr/gpr.static-pic/gpr-proc.ads
-include/gpr/gpr.static-pic/gpr-scans.adb
-include/gpr/gpr.static-pic/gpr-scans.ads
-include/gpr/gpr.static-pic/gpr-script.adb
-include/gpr/gpr.static-pic/gpr-script.ads
-include/gpr/gpr.static-pic/gpr-sdefault.adb
-include/gpr/gpr.static-pic/gpr-sdefault.ads
-include/gpr/gpr.static-pic/gpr-sinput.adb
-include/gpr/gpr.static-pic/gpr-sinput.ads
-include/gpr/gpr.static-pic/gpr-snames.adb
-include/gpr/gpr.static-pic/gpr-snames.ads
-include/gpr/gpr.static-pic/gpr-strt.adb
-include/gpr/gpr.static-pic/gpr-strt.ads
-include/gpr/gpr.static-pic/gpr-tempdir.adb
-include/gpr/gpr.static-pic/gpr-tempdir.ads
-include/gpr/gpr.static-pic/gpr-tree.adb
-include/gpr/gpr.static-pic/gpr-tree.ads
-include/gpr/gpr.static-pic/gpr-util-aux.adb
-include/gpr/gpr.static-pic/gpr-util-aux.ads
-include/gpr/gpr.static-pic/gpr-util-knowledge.adb
-include/gpr/gpr.static-pic/gpr-util-put_resource_usage__unix.adb
-include/gpr/gpr.static-pic/gpr-util.adb
-include/gpr/gpr.static-pic/gpr-util.ads
-include/gpr/gpr.static-pic/gpr-version.adb
-include/gpr/gpr.static-pic/gpr-version.ads
-include/gpr/gpr.static-pic/gpr.adb
-include/gpr/gpr.static-pic/gpr.ads
-include/gpr/gpr.static-pic/gpr_build_util.adb
-include/gpr/gpr.static-pic/gpr_build_util.ads
-include/gpr/gpr.static-pic/gpr_imports.c
-include/gpr/gpr.static/gpr-ali.adb
-include/gpr/gpr.static/gpr-ali.ads
-include/gpr/gpr.static/gpr-attr-pm.adb
-include/gpr/gpr.static/gpr-attr-pm.ads
-include/gpr/gpr.static/gpr-attr.adb
-include/gpr/gpr.static/gpr-attr.ads
-include/gpr/gpr.static/gpr-com.ads
-include/gpr/gpr.static/gpr-compilation-process-waiter.adb
-include/gpr/gpr.static/gpr-compilation-process-waiter.ads
-include/gpr/gpr.static/gpr-compilation-process.adb
-include/gpr/gpr.static/gpr-compilation-process.ads
-include/gpr/gpr.static/gpr-compilation-protocol.adb
-include/gpr/gpr.static/gpr-compilation-protocol.ads
-include/gpr/gpr.static/gpr-compilation-slave.adb
-include/gpr/gpr.static/gpr-compilation-slave.ads
-include/gpr/gpr.static/gpr-compilation-sync.adb
-include/gpr/gpr.static/gpr-compilation-sync.ads
-include/gpr/gpr.static/gpr-compilation.adb
-include/gpr/gpr.static/gpr-compilation.ads
-include/gpr/gpr.static/gpr-conf.adb
-include/gpr/gpr.static/gpr-conf.ads
-include/gpr/gpr.static/gpr-cset.adb
-include/gpr/gpr.static/gpr-cset.ads
-include/gpr/gpr.static/gpr-debug.adb
-include/gpr/gpr.static/gpr-debug.ads
-include/gpr/gpr.static/gpr-dect.adb
-include/gpr/gpr.static/gpr-dect.ads
-include/gpr/gpr.static/gpr-env.adb
-include/gpr/gpr.static/gpr-env.ads
-include/gpr/gpr.static/gpr-err-scanner.adb
-include/gpr/gpr.static/gpr-err.adb
-include/gpr/gpr.static/gpr-err.ads
-include/gpr/gpr.static/gpr-erroutc.adb
-include/gpr/gpr.static/gpr-erroutc.ads
-include/gpr/gpr.static/gpr-ext.adb
-include/gpr/gpr.static/gpr-ext.ads
-include/gpr/gpr.static/gpr-jobserver.adb
-include/gpr/gpr.static/gpr-jobserver.ads
-include/gpr/gpr.static/gpr-knowledge.adb
-include/gpr/gpr.static/gpr-knowledge.ads
-include/gpr/gpr.static/gpr-names.adb
-include/gpr/gpr.static/gpr-names.ads
-include/gpr/gpr.static/gpr-nmsc.adb
-include/gpr/gpr.static/gpr-nmsc.ads
-include/gpr/gpr.static/gpr-opt.ads
-include/gpr/gpr.static/gpr-osint.adb
-include/gpr/gpr.static/gpr-osint.ads
-include/gpr/gpr.static/gpr-output.adb
-include/gpr/gpr.static/gpr-output.ads
-include/gpr/gpr.static/gpr-part.adb
-include/gpr/gpr.static/gpr-part.ads
-include/gpr/gpr.static/gpr-pp.adb
-include/gpr/gpr.static/gpr-pp.ads
-include/gpr/gpr.static/gpr-proc.adb
-include/gpr/gpr.static/gpr-proc.ads
-include/gpr/gpr.static/gpr-scans.adb
-include/gpr/gpr.static/gpr-scans.ads
-include/gpr/gpr.static/gpr-script.adb
-include/gpr/gpr.static/gpr-script.ads
-include/gpr/gpr.static/gpr-sdefault.adb
-include/gpr/gpr.static/gpr-sdefault.ads
-include/gpr/gpr.static/gpr-sinput.adb
-include/gpr/gpr.static/gpr-sinput.ads
-include/gpr/gpr.static/gpr-snames.adb
-include/gpr/gpr.static/gpr-snames.ads
-include/gpr/gpr.static/gpr-strt.adb
-include/gpr/gpr.static/gpr-strt.ads
-include/gpr/gpr.static/gpr-tempdir.adb
-include/gpr/gpr.static/gpr-tempdir.ads
-include/gpr/gpr.static/gpr-tree.adb
-include/gpr/gpr.static/gpr-tree.ads
-include/gpr/gpr.static/gpr-util-aux.adb
-include/gpr/gpr.static/gpr-util-aux.ads
-include/gpr/gpr.static/gpr-util-knowledge.adb
-include/gpr/gpr.static/gpr-util-put_resource_usage__unix.adb
-include/gpr/gpr.static/gpr-util.adb
-include/gpr/gpr.static/gpr-util.ads
-include/gpr/gpr.static/gpr-version.adb
-include/gpr/gpr.static/gpr-version.ads
-include/gpr/gpr.static/gpr.adb
-include/gpr/gpr.static/gpr.ads
-include/gpr/gpr.static/gpr_build_util.adb
-include/gpr/gpr.static/gpr_build_util.ads
-include/gpr/gpr.static/gpr_imports.c
-lib/gpr/relocatable/gpr/gpr-ali.ali
-lib/gpr/relocatable/gpr/gpr-attr-pm.ali
-lib/gpr/relocatable/gpr/gpr-attr.ali
-lib/gpr/relocatable/gpr/gpr-com.ali
-lib/gpr/relocatable/gpr/gpr-compilation-process-waiter.ali
-lib/gpr/relocatable/gpr/gpr-compilation-process.ali
-lib/gpr/relocatable/gpr/gpr-compilation-protocol.ali
-lib/gpr/relocatable/gpr/gpr-compilation-slave.ali
-lib/gpr/relocatable/gpr/gpr-compilation-sync.ali
-lib/gpr/relocatable/gpr/gpr-compilation.ali
-lib/gpr/relocatable/gpr/gpr-conf.ali
-lib/gpr/relocatable/gpr/gpr-cset.ali
-lib/gpr/relocatable/gpr/gpr-debug.ali
-lib/gpr/relocatable/gpr/gpr-dect.ali
-lib/gpr/relocatable/gpr/gpr-env.ali
-lib/gpr/relocatable/gpr/gpr-err.ali
-lib/gpr/relocatable/gpr/gpr-erroutc.ali
-lib/gpr/relocatable/gpr/gpr-ext.ali
-lib/gpr/relocatable/gpr/gpr-jobserver.ali
-lib/gpr/relocatable/gpr/gpr-knowledge.ali
-lib/gpr/relocatable/gpr/gpr-names.ali
-lib/gpr/relocatable/gpr/gpr-nmsc.ali
-lib/gpr/relocatable/gpr/gpr-opt.ali
-lib/gpr/relocatable/gpr/gpr-osint.ali
-lib/gpr/relocatable/gpr/gpr-output.ali
-lib/gpr/relocatable/gpr/gpr-part.ali
-lib/gpr/relocatable/gpr/gpr-pp.ali
-lib/gpr/relocatable/gpr/gpr-proc.ali
-lib/gpr/relocatable/gpr/gpr-scans.ali
-lib/gpr/relocatable/gpr/gpr-script.ali
-lib/gpr/relocatable/gpr/gpr-sdefault.ali
-lib/gpr/relocatable/gpr/gpr-sinput.ali
-lib/gpr/relocatable/gpr/gpr-snames.ali
-lib/gpr/relocatable/gpr/gpr-strt.ali
-lib/gpr/relocatable/gpr/gpr-tempdir.ali
-lib/gpr/relocatable/gpr/gpr-tree.ali
-lib/gpr/relocatable/gpr/gpr-util-aux.ali
-lib/gpr/relocatable/gpr/gpr-util.ali
-lib/gpr/relocatable/gpr/gpr-version.ali
-lib/gpr/relocatable/gpr/gpr.ali
-lib/gpr/relocatable/gpr/gpr_build_util.ali
-lib/gpr/relocatable/gpr/libgnatprj.so
-lib/gpr/static-pic/gpr/gpr-ali.ali
-lib/gpr/static-pic/gpr/gpr-attr-pm.ali
-lib/gpr/static-pic/gpr/gpr-attr.ali
-lib/gpr/static-pic/gpr/gpr-com.ali
-lib/gpr/static-pic/gpr/gpr-compilation-process-waiter.ali
-lib/gpr/static-pic/gpr/gpr-compilation-process.ali
-lib/gpr/static-pic/gpr/gpr-compilation-protocol.ali
-lib/gpr/static-pic/gpr/gpr-compilation-slave.ali
-lib/gpr/static-pic/gpr/gpr-compilation-sync.ali
-lib/gpr/static-pic/gpr/gpr-compilation.ali
-lib/gpr/static-pic/gpr/gpr-conf.ali
-lib/gpr/static-pic/gpr/gpr-cset.ali
-lib/gpr/static-pic/gpr/gpr-debug.ali
-lib/gpr/static-pic/gpr/gpr-dect.ali
-lib/gpr/static-pic/gpr/gpr-env.ali
-lib/gpr/static-pic/gpr/gpr-err.ali
-lib/gpr/static-pic/gpr/gpr-erroutc.ali
-lib/gpr/static-pic/gpr/gpr-ext.ali
-lib/gpr/static-pic/gpr/gpr-jobserver.ali
-lib/gpr/static-pic/gpr/gpr-knowledge.ali
-lib/gpr/static-pic/gpr/gpr-names.ali
-lib/gpr/static-pic/gpr/gpr-nmsc.ali
-lib/gpr/static-pic/gpr/gpr-opt.ali
-lib/gpr/static-pic/gpr/gpr-osint.ali
-lib/gpr/static-pic/gpr/gpr-output.ali
-lib/gpr/static-pic/gpr/gpr-part.ali
-lib/gpr/static-pic/gpr/gpr-pp.ali
-lib/gpr/static-pic/gpr/gpr-proc.ali
-lib/gpr/static-pic/gpr/gpr-scans.ali
-lib/gpr/static-pic/gpr/gpr-script.ali
-lib/gpr/static-pic/gpr/gpr-sdefault.ali
-lib/gpr/static-pic/gpr/gpr-sinput.ali
-lib/gpr/static-pic/gpr/gpr-snames.ali
-lib/gpr/static-pic/gpr/gpr-strt.ali
-lib/gpr/static-pic/gpr/gpr-tempdir.ali
-lib/gpr/static-pic/gpr/gpr-tree.ali
-lib/gpr/static-pic/gpr/gpr-util-aux.ali
-lib/gpr/static-pic/gpr/gpr-util.ali
-lib/gpr/static-pic/gpr/gpr-version.ali
-lib/gpr/static-pic/gpr/gpr.ali
-lib/gpr/static-pic/gpr/gpr_build_util.ali
-lib/gpr/static-pic/gpr/libgnatprj.a
-lib/gpr/static/gpr/gpr-ali.ali
-lib/gpr/static/gpr/gpr-attr-pm.ali
-lib/gpr/static/gpr/gpr-attr.ali
-lib/gpr/static/gpr/gpr-com.ali
-lib/gpr/static/gpr/gpr-compilation-process-waiter.ali
-lib/gpr/static/gpr/gpr-compilation-process.ali
-lib/gpr/static/gpr/gpr-compilation-protocol.ali
-lib/gpr/static/gpr/gpr-compilation-slave.ali
-lib/gpr/static/gpr/gpr-compilation-sync.ali
-lib/gpr/static/gpr/gpr-compilation.ali
-lib/gpr/static/gpr/gpr-conf.ali
-lib/gpr/static/gpr/gpr-cset.ali
-lib/gpr/static/gpr/gpr-debug.ali
-lib/gpr/static/gpr/gpr-dect.ali
-lib/gpr/static/gpr/gpr-env.ali
-lib/gpr/static/gpr/gpr-err.ali
-lib/gpr/static/gpr/gpr-erroutc.ali
-lib/gpr/static/gpr/gpr-ext.ali
-lib/gpr/static/gpr/gpr-jobserver.ali
-lib/gpr/static/gpr/gpr-knowledge.ali
-lib/gpr/static/gpr/gpr-names.ali
-lib/gpr/static/gpr/gpr-nmsc.ali
-lib/gpr/static/gpr/gpr-opt.ali
-lib/gpr/static/gpr/gpr-osint.ali
-lib/gpr/static/gpr/gpr-output.ali
-lib/gpr/static/gpr/gpr-part.ali
-lib/gpr/static/gpr/gpr-pp.ali
-lib/gpr/static/gpr/gpr-proc.ali
-lib/gpr/static/gpr/gpr-scans.ali
-lib/gpr/static/gpr/gpr-script.ali
-lib/gpr/static/gpr/gpr-sdefault.ali
-lib/gpr/static/gpr/gpr-sinput.ali
-lib/gpr/static/gpr/gpr-snames.ali
-lib/gpr/static/gpr/gpr-strt.ali
-lib/gpr/static/gpr/gpr-tempdir.ali
-lib/gpr/static/gpr/gpr-tree.ali
-lib/gpr/static/gpr/gpr-util-aux.ali
-lib/gpr/static/gpr/gpr-util.ali
-lib/gpr/static/gpr/gpr-version.ali
-lib/gpr/static/gpr/gpr.ali
-lib/gpr/static/gpr/gpr_build_util.ali
-lib/gpr/static/gpr/libgnatprj.a
-lib/libgnatprj.so
-share/gpr/gpr.gpr
-share/gpr/manifests/gpr
diff --git a/gprlib/buildlink3.mk b/gprlib/buildlink3.mk
index d8ba90712c..8257c9e08c 100644
--- a/gprlib/buildlink3.mk
+++ b/gprlib/buildlink3.mk
@@ -6,19 +6,16 @@ BUILDLINK_TREE+=	gprlib
 GPRLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gprlib+=	gprlib>=24.0.0
-BUILDLINK_PKGSRCDIR.gprlib=	../../wip/gprlib
+BUILDLINK_ABI_DEPENDS.gprlib+=	gprlib>=25.0.0
+BUILDLINK_PKGSRCDIR.gprlib?=	../../wip/gprlib
 BUILDLINK_DEPMETHOD.gprlib?=	build
 
-BUILDLINK_AUTO_VARS.gprlib=	no
-BUILDLINK_AUTO_DIRS.gprlib=	no
-
-BUILDLINK_FILES.gprlib=		lib/libgnatprj.so
-BUILDLINK_FILES.gprlib=		include/gpr/* lib/libgnatprj* lib/gpr/*
-BUILDLINK_FILES.gprlib+=	share/gpr/manifests/gpr share/gpr/gpr.gpr
-
 BUILDLINK_CONTENTS_FILTER.gprlib=	\
 	${EGREP} '(include/.*\.ads$$|lib/.*\.ali$$|lib/.*\.a$$|lib/libgnatprj.*\.so.*$$|share/gpr/manifests/.*|share/gpr/.*\.gpr$$|/gpr\.adb$$|/gpr-util-put_resource_usage__unix\.adb$$)'
 
+pkgbase := gprlib
+.include "../../mk/pkg-build-options.mk"
+
 .endif
 
 BUILDLINK_TREE+=	-gprlib
diff --git a/gprlib/distinfo b/gprlib/distinfo
index 88802a8179..e131ce663c 100644
--- a/gprlib/distinfo
+++ b/gprlib/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (gprbuild-25.0.0.tar.gz) = e9462a136fe46fd9e62e7ba602f746275a41347098f27
 SHA512 (gprbuild-25.0.0.tar.gz) = eb2d7072194323cae90acd0c8683eeb6a806ef6ff2ed4d3496e8b94c5b63dae8a428ec428a3610b380df7e122d7a00d9e9634ef06b5369b165536c99209602ce
 Size (gprbuild-25.0.0.tar.gz) = 940774 bytes
 SHA1 (patch-Makefile) = 62aaca338e57df5c6ae5f008df078b991e9ebfdd
-SHA1 (patch-gpr_gpr.gpr) = 321bce32cb8af1821e2e6b6b8d6ca75194410a0b
-SHA1 (patch-gpr_src_gpr-util-put__resource__usage____unix.adb) = c134d5aad0b90da41eef03cd2e5d98e2f14611fb
-SHA1 (patch-gpr_src_gpr-version.ads) = 40deea3a0eb6cf6a3fda3ed8ed898d4daabe0423
-SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
+SHA1 (patch-gpr_gpr.gpr) = b18713da0795ebefd241414e5e9171ecfa9b79db
+SHA1 (patch-gpr_src_gpr-util-put__resource__usage____unix.adb) = 73cf60af1123151a4177250ac496384cb55e72ec
+SHA1 (patch-gpr_src_gpr-version.ads) = 04f4ec9ff11efc1142960891613bbc80d55fa669
+SHA1 (patch-gpr_src_gpr_imports.c) = 1b72dd42355c7f7189d4a4a8a7bcf7153f206731
diff --git a/gprlib/options.mk b/gprlib/options.mk
new file mode 100644
index 0000000000..d9b9f21a00
--- /dev/null
+++ b/gprlib/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2025/05/09 16:00:00 dkazankov Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.gprlib
+PKG_OPTIONS_OPTIONAL_GROUPS=	shared-libs
+PKG_OPTIONS_GROUP.shared-libs=	enable-shared-libs disable-shared-libs
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Menable-shared-libs)
+CONFIGURE_ARGS+=		ENABLE_SHARED=yes
+USE_GCC_RUNTIME=		yes
+BUILDLINK_DEPMETHOD.xmlada=	full
+.endif
+.if !empty(PKG_OPTIONS:Mdisable-shared-libs)
+CONFIGURE_ARGS+=		ENABLE_SHARED=no
+.endif
+.if empty(PKG_OPTIONS:Menable-shared-libs) && empty(PKG_OPTIONS:Mdisable-shared-libs)
+USE_GCC_RUNTIME=		yes
+BUILDLINK_DEPMETHOD.xmlada=	full
+.endif
diff --git a/gprlib/patches/patch-gpr_gpr.gpr b/gprlib/patches/patch-gpr_gpr.gpr
index 0fc4508009..b05b9e9569 100644
--- a/gprlib/patches/patch-gpr_gpr.gpr
+++ b/gprlib/patches/patch-gpr_gpr.gpr
@@ -3,7 +3,7 @@ $NetBSD: patch-gpr_gpr.gpr,v 1.4 2025/02/08 14:14:49 wiz Exp $
 Fix name conflict with grpc - same as linux distros
 
 --- gpr/gpr.gpr.orig	2023-10-09 21:31:11.000000000 +0300
-+++ gpr/gpr.gpr	2024-05-07 16:34:34.759672549 +0300
++++ gpr/gpr.gpr
 @@ -38,7 +38,7 @@
  
     for Source_Dirs use ("src");
diff --git a/gprlib/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb b/gprlib/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb
index ffe988f0ff..7626f27f2f 100644
--- a/gprlib/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb
+++ b/gprlib/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb
@@ -3,13 +3,13 @@ $NetBSD: patch-gpr_src_gpr-util-put__resource__usage____unix.adb,v 1.1 2024/05/0
 Fix warning at link stage on NetBSD
 
 --- gpr/src/gpr-util-put_resource_usage__unix.adb.orig	2023-10-09 21:31:11.000000000 +0300
-+++ gpr/src/gpr-util-put_resource_usage__unix.adb	2024-05-07 10:36:42.700699231 +0300
++++ gpr/src/gpr-util-put_resource_usage__unix.adb
 @@ -69,7 +69,7 @@
        procedure Print (This : STC.Timeval);
  
        function Getrusage (Who : Integer; usage : out Rusage) return Integer
 -        with Import, Convention => C;
-+        with Import, Convention => C, External_Name => "__netbsd_getrusage";
++        with Import, Convention => C, External_Name => "getrusage";
  
        -----------
        -- Print --
diff --git a/gprlib/patches/patch-gpr_src_gpr-version.ads b/gprlib/patches/patch-gpr_src_gpr-version.ads
index ccb4d02254..0ef0e62008 100644
--- a/gprlib/patches/patch-gpr_src_gpr-version.ads
+++ b/gprlib/patches/patch-gpr_src_gpr-version.ads
@@ -3,7 +3,7 @@ $NetBSD: patch-gpr_src_gpr-version.ads,v 1.1 2024/03/19 13:20:35 wiz Exp $
 Fix incorrect version reporting
 
 --- gpr/src/gpr-version.ads.orig	2023-10-09 21:31:11.000000000 +0300
-+++ gpr/src/gpr-version.ads	2024-03-19 14:10:13.533689309 +0200
++++ gpr/src/gpr-version.ads
 @@ -30,17 +30,17 @@
  
  package GPR.Version is
diff --git a/gprlib/patches/patch-gpr_src_gpr_imports.c b/gprlib/patches/patch-gpr_src_gpr_imports.c
index a50d7d7791..d82851813a 100644
--- a/gprlib/patches/patch-gpr_src_gpr_imports.c
+++ b/gprlib/patches/patch-gpr_src_gpr_imports.c
@@ -3,7 +3,7 @@ $NetBSD: patch-gpr_src_gpr_imports.c,v 1.1 2024/03/12 17:50:13 wiz Exp $
 Add support for NetBSD (same as for FreeBSD) and fix getrusage() warning at linking stage
 
 --- gpr/src/gpr_imports.c.orig	2023-10-09 21:31:11.000000000 +0300
-+++ gpr/src/gpr_imports.c	2023-12-21 19:52:58.220771312 +0200
++++ gpr/src/gpr_imports.c
 @@ -64,6 +64,15 @@
  char __gnat_shared_libgcc_default = STATIC;
  const char *__gnat_default_libgcc_subdir = "lib";


Home | Main Index | Thread Index | Old Index