Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Feb 2022 21:17:58 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2455cf5ad8b8 - main - math/gap: Fix gac by installing a minimal subset of object files
Message-ID:  <202202182117.21ILHwsi090604@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2455cf5ad8b8a5d2bf69677a4696fc1a6c95849e

commit 2455cf5ad8b8a5d2bf69677a4696fc1a6c95849e
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-02-18 21:16:24 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-02-18 21:17:52 +0000

    math/gap: Fix gac by installing a minimal subset of object files
    
    ... gac is a GAP compiler, it compiles *.gap sources into binaries.
---
 math/gap/Makefile  |  13 +++-
 math/gap/pkg-plist | 222 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 234 insertions(+), 1 deletion(-)

diff --git a/math/gap/Makefile b/math/gap/Makefile
index caf2e3ec1e92..35dfb11b4b08 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gap
 DISTVERSION=	4.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/gap-system/gap/releases/download/v${DISTVERSION}/
 
@@ -83,6 +83,11 @@ post-install:
 	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/gap-bin lib/libgap.so.0.0.0
 	# install gac executable
 	${INSTALL_SCRIPT} ${WRKSRC}/gac ${STAGEDIR}${PREFIX}/bin/gac
+	${REINPLACE_CMD} -i '' -e ' \
+		s|^\. "$${abs_top_builddir}/sysinfo.gap"|. "${DATADIR}/sysinfo.gap"|; \
+		s|^abs_top_builddir=.*|abs_top_builddir="${DATADIR}/min-builddir"|; \
+		s|^abs_top_srcdir=.*|abs_top_srcdir="${DATADIR}/min-srcdir"| \
+		' ${STAGEDIR}${PREFIX}/bin/gac
 	# prepare and install wrapper
 	@${CAT} ${WRKSRC}/bin/gap.sh | ${SED} -e ' \
 		s:${WRKSRC}:${GAP_LIBDIR}:; \
@@ -91,6 +96,11 @@ post-install:
 		/^exec/s:/gap::; \
 		' > ${WRKSRC}/bin/gap
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/gap ${STAGEDIR}${PREFIX}/bin
+	# min-builddir and min-srcdir
+	${MKDIR} ${STAGEDIR}${DATADIR}/min-builddir ${STAGEDIR}${DATADIR}/min-srcdir
+	${INSTALL_SCRIPT} ${WRKSRC}/libtool ${STAGEDIR}${DATADIR}/min-builddir
+	${RLN} ${STAGEDIR}${PREFIX}/bin/gap ${STAGEDIR}${DATADIR}/min-builddir/gap
+	cd ${WRKSRC}/ && ${COPYTREE_SHARE} obj ${STAGEDIR}${DATADIR}/min-builddir/
 	# install packages
 	${MKDIR} ${STAGEDIR}${DATADIR}/pkg
 .for f in doc etc gen grp lib tst sysinfo.gap
@@ -103,6 +113,7 @@ post-install:
 	${REINPLACE_CMD} -i '' -e ' \
 		s|^GAP_BIN_DIR=.*|GAP_BIN_DIR="${PREFIX}/bin"|; \
 		s|^GAP_LIB_DIR=.*|GAP_LIB_DIR="${PREFIX}/lib"|; \
+		s| -isystem ${PREFIX}/include |&-I${PREFIX}/include/gap |; \
 		' ${STAGEDIR}${DATADIR}/sysinfo.gap
 
 do-test:
diff --git a/math/gap/pkg-plist b/math/gap/pkg-plist
index 47e900fe0947..a7fb95aef451 100644
--- a/math/gap/pkg-plist
+++ b/math/gap/pkg-plist
@@ -695,6 +695,227 @@ lib/libgap.so.0.0.0
 %%DATADIR%%/lib/zmodnz.gi
 %%DATADIR%%/lib/zmodnze.gd
 %%DATADIR%%/lib/zmodnze.gi
+%%DATADIR%%/min-builddir/gap
+%%DATADIR%%/min-builddir/libtool
+%%DATADIR%%/min-builddir/obj/gen/.deps/gap_version.d
+%%DATADIR%%/min-builddir/obj/gen/.libs/gap_version.o
+%%DATADIR%%/min-builddir/obj/gen/gap_version.lo
+%%DATADIR%%/min-builddir/obj/src/.deps/ariths.d
+%%DATADIR%%/min-builddir/obj/src/.deps/bags.d
+%%DATADIR%%/min-builddir/obj/src/.deps/blister.d
+%%DATADIR%%/min-builddir/obj/src/.deps/bool.d
+%%DATADIR%%/min-builddir/obj/src/.deps/c_oper1.d
+%%DATADIR%%/min-builddir/obj/src/.deps/c_type1.d
+%%DATADIR%%/min-builddir/obj/src/.deps/calls.d
+%%DATADIR%%/min-builddir/obj/src/.deps/code.d
+%%DATADIR%%/min-builddir/obj/src/.deps/collectors.d
+%%DATADIR%%/min-builddir/obj/src/.deps/compiler.d
+%%DATADIR%%/min-builddir/obj/src/.deps/compstat.d
+%%DATADIR%%/min-builddir/obj/src/.deps/costab.d
+%%DATADIR%%/min-builddir/obj/src/.deps/cyclotom.d
+%%DATADIR%%/min-builddir/obj/src/.deps/debug.d
+%%DATADIR%%/min-builddir/obj/src/.deps/dt.d
+%%DATADIR%%/min-builddir/obj/src/.deps/dteval.d
+%%DATADIR%%/min-builddir/obj/src/.deps/error.d
+%%DATADIR%%/min-builddir/obj/src/.deps/exprs.d
+%%DATADIR%%/min-builddir/obj/src/.deps/ffdata.d
+%%DATADIR%%/min-builddir/obj/src/.deps/finfield.d
+%%DATADIR%%/min-builddir/obj/src/.deps/funcs.d
+%%DATADIR%%/min-builddir/obj/src/.deps/gap.d
+%%DATADIR%%/min-builddir/obj/src/.deps/gasman.d
+%%DATADIR%%/min-builddir/obj/src/.deps/gvars.d
+%%DATADIR%%/min-builddir/obj/src/.deps/hookintrprtr.d
+%%DATADIR%%/min-builddir/obj/src/.deps/info.d
+%%DATADIR%%/min-builddir/obj/src/.deps/integer.d
+%%DATADIR%%/min-builddir/obj/src/.deps/intfuncs.d
+%%DATADIR%%/min-builddir/obj/src/.deps/intrprtr.d
+%%DATADIR%%/min-builddir/obj/src/.deps/io.d
+%%DATADIR%%/min-builddir/obj/src/.deps/iostream.d
+%%DATADIR%%/min-builddir/obj/src/.deps/libgap-api.d
+%%DATADIR%%/min-builddir/obj/src/.deps/listfunc.d
+%%DATADIR%%/min-builddir/obj/src/.deps/listoper.d
+%%DATADIR%%/min-builddir/obj/src/.deps/lists.d
+%%DATADIR%%/min-builddir/obj/src/.deps/macfloat.d
+%%DATADIR%%/min-builddir/obj/src/.deps/modules.d
+%%DATADIR%%/min-builddir/obj/src/.deps/modules_builtin.d
+%%DATADIR%%/min-builddir/obj/src/.deps/objcftl.d
+%%DATADIR%%/min-builddir/obj/src/.deps/objects.d
+%%DATADIR%%/min-builddir/obj/src/.deps/objfgelm.d
+%%DATADIR%%/min-builddir/obj/src/.deps/objpcgel.d
+%%DATADIR%%/min-builddir/obj/src/.deps/objset.d
+%%DATADIR%%/min-builddir/obj/src/.deps/opers.d
+%%DATADIR%%/min-builddir/obj/src/.deps/permutat.d
+%%DATADIR%%/min-builddir/obj/src/.deps/plist.d
+%%DATADIR%%/min-builddir/obj/src/.deps/pperm.d
+%%DATADIR%%/min-builddir/obj/src/.deps/precord.d
+%%DATADIR%%/min-builddir/obj/src/.deps/profile.d
+%%DATADIR%%/min-builddir/obj/src/.deps/range.d
+%%DATADIR%%/min-builddir/obj/src/.deps/rational.d
+%%DATADIR%%/min-builddir/obj/src/.deps/read.d
+%%DATADIR%%/min-builddir/obj/src/.deps/records.d
+%%DATADIR%%/min-builddir/obj/src/.deps/saveload.d
+%%DATADIR%%/min-builddir/obj/src/.deps/scanner.d
+%%DATADIR%%/min-builddir/obj/src/.deps/sctable.d
+%%DATADIR%%/min-builddir/obj/src/.deps/set.d
+%%DATADIR%%/min-builddir/obj/src/.deps/stats.d
+%%DATADIR%%/min-builddir/obj/src/.deps/streams.d
+%%DATADIR%%/min-builddir/obj/src/.deps/stringobj.d
+%%DATADIR%%/min-builddir/obj/src/.deps/syntaxtree.d
+%%DATADIR%%/min-builddir/obj/src/.deps/sysfiles.d
+%%DATADIR%%/min-builddir/obj/src/.deps/sysmem.d
+%%DATADIR%%/min-builddir/obj/src/.deps/system.d
+%%DATADIR%%/min-builddir/obj/src/.deps/tietze.d
+%%DATADIR%%/min-builddir/obj/src/.deps/trans.d
+%%DATADIR%%/min-builddir/obj/src/.deps/vars.d
+%%DATADIR%%/min-builddir/obj/src/.deps/vec8bit.d
+%%DATADIR%%/min-builddir/obj/src/.deps/vecffe.d
+%%DATADIR%%/min-builddir/obj/src/.deps/vecgf2.d
+%%DATADIR%%/min-builddir/obj/src/.deps/vector.d
+%%DATADIR%%/min-builddir/obj/src/.deps/weakptr.d
+%%DATADIR%%/min-builddir/obj/src/.libs/ariths.o
+%%DATADIR%%/min-builddir/obj/src/.libs/bags.o
+%%DATADIR%%/min-builddir/obj/src/.libs/blister.o
+%%DATADIR%%/min-builddir/obj/src/.libs/bool.o
+%%DATADIR%%/min-builddir/obj/src/.libs/c_oper1.o
+%%DATADIR%%/min-builddir/obj/src/.libs/c_type1.o
+%%DATADIR%%/min-builddir/obj/src/.libs/calls.o
+%%DATADIR%%/min-builddir/obj/src/.libs/code.o
+%%DATADIR%%/min-builddir/obj/src/.libs/collectors.o
+%%DATADIR%%/min-builddir/obj/src/.libs/compiler.o
+%%DATADIR%%/min-builddir/obj/src/.libs/compstat.o
+%%DATADIR%%/min-builddir/obj/src/.libs/costab.o
+%%DATADIR%%/min-builddir/obj/src/.libs/cyclotom.o
+%%DATADIR%%/min-builddir/obj/src/.libs/debug.o
+%%DATADIR%%/min-builddir/obj/src/.libs/dt.o
+%%DATADIR%%/min-builddir/obj/src/.libs/dteval.o
+%%DATADIR%%/min-builddir/obj/src/.libs/error.o
+%%DATADIR%%/min-builddir/obj/src/.libs/exprs.o
+%%DATADIR%%/min-builddir/obj/src/.libs/ffdata.o
+%%DATADIR%%/min-builddir/obj/src/.libs/finfield.o
+%%DATADIR%%/min-builddir/obj/src/.libs/funcs.o
+%%DATADIR%%/min-builddir/obj/src/.libs/gap.o
+%%DATADIR%%/min-builddir/obj/src/.libs/gasman.o
+%%DATADIR%%/min-builddir/obj/src/.libs/gvars.o
+%%DATADIR%%/min-builddir/obj/src/.libs/hookintrprtr.o
+%%DATADIR%%/min-builddir/obj/src/.libs/info.o
+%%DATADIR%%/min-builddir/obj/src/.libs/integer.o
+%%DATADIR%%/min-builddir/obj/src/.libs/intfuncs.o
+%%DATADIR%%/min-builddir/obj/src/.libs/intrprtr.o
+%%DATADIR%%/min-builddir/obj/src/.libs/io.o
+%%DATADIR%%/min-builddir/obj/src/.libs/iostream.o
+%%DATADIR%%/min-builddir/obj/src/.libs/libgap-api.o
+%%DATADIR%%/min-builddir/obj/src/.libs/listfunc.o
+%%DATADIR%%/min-builddir/obj/src/.libs/listoper.o
+%%DATADIR%%/min-builddir/obj/src/.libs/lists.o
+%%DATADIR%%/min-builddir/obj/src/.libs/macfloat.o
+%%DATADIR%%/min-builddir/obj/src/.libs/modules.o
+%%DATADIR%%/min-builddir/obj/src/.libs/modules_builtin.o
+%%DATADIR%%/min-builddir/obj/src/.libs/objcftl.o
+%%DATADIR%%/min-builddir/obj/src/.libs/objects.o
+%%DATADIR%%/min-builddir/obj/src/.libs/objfgelm.o
+%%DATADIR%%/min-builddir/obj/src/.libs/objpcgel.o
+%%DATADIR%%/min-builddir/obj/src/.libs/objset.o
+%%DATADIR%%/min-builddir/obj/src/.libs/opers.o
+%%DATADIR%%/min-builddir/obj/src/.libs/permutat.o
+%%DATADIR%%/min-builddir/obj/src/.libs/plist.o
+%%DATADIR%%/min-builddir/obj/src/.libs/pperm.o
+%%DATADIR%%/min-builddir/obj/src/.libs/precord.o
+%%DATADIR%%/min-builddir/obj/src/.libs/profile.o
+%%DATADIR%%/min-builddir/obj/src/.libs/range.o
+%%DATADIR%%/min-builddir/obj/src/.libs/rational.o
+%%DATADIR%%/min-builddir/obj/src/.libs/read.o
+%%DATADIR%%/min-builddir/obj/src/.libs/records.o
+%%DATADIR%%/min-builddir/obj/src/.libs/saveload.o
+%%DATADIR%%/min-builddir/obj/src/.libs/scanner.o
+%%DATADIR%%/min-builddir/obj/src/.libs/sctable.o
+%%DATADIR%%/min-builddir/obj/src/.libs/set.o
+%%DATADIR%%/min-builddir/obj/src/.libs/stats.o
+%%DATADIR%%/min-builddir/obj/src/.libs/streams.o
+%%DATADIR%%/min-builddir/obj/src/.libs/stringobj.o
+%%DATADIR%%/min-builddir/obj/src/.libs/syntaxtree.o
+%%DATADIR%%/min-builddir/obj/src/.libs/sysfiles.o
+%%DATADIR%%/min-builddir/obj/src/.libs/sysmem.o
+%%DATADIR%%/min-builddir/obj/src/.libs/system.o
+%%DATADIR%%/min-builddir/obj/src/.libs/tietze.o
+%%DATADIR%%/min-builddir/obj/src/.libs/trans.o
+%%DATADIR%%/min-builddir/obj/src/.libs/vars.o
+%%DATADIR%%/min-builddir/obj/src/.libs/vec8bit.o
+%%DATADIR%%/min-builddir/obj/src/.libs/vecffe.o
+%%DATADIR%%/min-builddir/obj/src/.libs/vecgf2.o
+%%DATADIR%%/min-builddir/obj/src/.libs/vector.o
+%%DATADIR%%/min-builddir/obj/src/.libs/weakptr.o
+%%DATADIR%%/min-builddir/obj/src/ariths.lo
+%%DATADIR%%/min-builddir/obj/src/bags.lo
+%%DATADIR%%/min-builddir/obj/src/blister.lo
+%%DATADIR%%/min-builddir/obj/src/bool.lo
+%%DATADIR%%/min-builddir/obj/src/c_oper1.lo
+%%DATADIR%%/min-builddir/obj/src/c_type1.lo
+%%DATADIR%%/min-builddir/obj/src/calls.lo
+%%DATADIR%%/min-builddir/obj/src/code.lo
+%%DATADIR%%/min-builddir/obj/src/collectors.lo
+%%DATADIR%%/min-builddir/obj/src/compiler.lo
+%%DATADIR%%/min-builddir/obj/src/compstat.lo
+%%DATADIR%%/min-builddir/obj/src/costab.lo
+%%DATADIR%%/min-builddir/obj/src/cyclotom.lo
+%%DATADIR%%/min-builddir/obj/src/debug.lo
+%%DATADIR%%/min-builddir/obj/src/dt.lo
+%%DATADIR%%/min-builddir/obj/src/dteval.lo
+%%DATADIR%%/min-builddir/obj/src/error.lo
+%%DATADIR%%/min-builddir/obj/src/exprs.lo
+%%DATADIR%%/min-builddir/obj/src/ffdata.lo
+%%DATADIR%%/min-builddir/obj/src/finfield.lo
+%%DATADIR%%/min-builddir/obj/src/funcs.lo
+%%DATADIR%%/min-builddir/obj/src/gap.lo
+%%DATADIR%%/min-builddir/obj/src/gasman.lo
+%%DATADIR%%/min-builddir/obj/src/gvars.lo
+%%DATADIR%%/min-builddir/obj/src/hookintrprtr.lo
+%%DATADIR%%/min-builddir/obj/src/info.lo
+%%DATADIR%%/min-builddir/obj/src/integer.lo
+%%DATADIR%%/min-builddir/obj/src/intfuncs.lo
+%%DATADIR%%/min-builddir/obj/src/intrprtr.lo
+%%DATADIR%%/min-builddir/obj/src/io.lo
+%%DATADIR%%/min-builddir/obj/src/iostream.lo
+%%DATADIR%%/min-builddir/obj/src/libgap-api.lo
+%%DATADIR%%/min-builddir/obj/src/listfunc.lo
+%%DATADIR%%/min-builddir/obj/src/listoper.lo
+%%DATADIR%%/min-builddir/obj/src/lists.lo
+%%DATADIR%%/min-builddir/obj/src/macfloat.lo
+%%DATADIR%%/min-builddir/obj/src/modules.lo
+%%DATADIR%%/min-builddir/obj/src/modules_builtin.lo
+%%DATADIR%%/min-builddir/obj/src/objcftl.lo
+%%DATADIR%%/min-builddir/obj/src/objects.lo
+%%DATADIR%%/min-builddir/obj/src/objfgelm.lo
+%%DATADIR%%/min-builddir/obj/src/objpcgel.lo
+%%DATADIR%%/min-builddir/obj/src/objset.lo
+%%DATADIR%%/min-builddir/obj/src/opers.lo
+%%DATADIR%%/min-builddir/obj/src/permutat.lo
+%%DATADIR%%/min-builddir/obj/src/plist.lo
+%%DATADIR%%/min-builddir/obj/src/pperm.lo
+%%DATADIR%%/min-builddir/obj/src/precord.lo
+%%DATADIR%%/min-builddir/obj/src/profile.lo
+%%DATADIR%%/min-builddir/obj/src/range.lo
+%%DATADIR%%/min-builddir/obj/src/rational.lo
+%%DATADIR%%/min-builddir/obj/src/read.lo
+%%DATADIR%%/min-builddir/obj/src/records.lo
+%%DATADIR%%/min-builddir/obj/src/saveload.lo
+%%DATADIR%%/min-builddir/obj/src/scanner.lo
+%%DATADIR%%/min-builddir/obj/src/sctable.lo
+%%DATADIR%%/min-builddir/obj/src/set.lo
+%%DATADIR%%/min-builddir/obj/src/stats.lo
+%%DATADIR%%/min-builddir/obj/src/streams.lo
+%%DATADIR%%/min-builddir/obj/src/stringobj.lo
+%%DATADIR%%/min-builddir/obj/src/syntaxtree.lo
+%%DATADIR%%/min-builddir/obj/src/sysfiles.lo
+%%DATADIR%%/min-builddir/obj/src/sysmem.lo
+%%DATADIR%%/min-builddir/obj/src/system.lo
+%%DATADIR%%/min-builddir/obj/src/tietze.lo
+%%DATADIR%%/min-builddir/obj/src/trans.lo
+%%DATADIR%%/min-builddir/obj/src/vars.lo
+%%DATADIR%%/min-builddir/obj/src/vec8bit.lo
+%%DATADIR%%/min-builddir/obj/src/vecffe.lo
+%%DATADIR%%/min-builddir/obj/src/vecgf2.lo
+%%DATADIR%%/min-builddir/obj/src/vector.lo
+%%DATADIR%%/min-builddir/obj/src/weakptr.lo
 %%ADDPACK%%%%DATADIR%%/pkg/FactInt-%%FACT_INT_VER%%/CHANGES
 %%ADDPACK%%%%DATADIR%%/pkg/FactInt-%%FACT_INT_VER%%/LICENSE
 %%ADDPACK%%%%DATADIR%%/pkg/FactInt-%%FACT_INT_VER%%/PackageInfo.g
@@ -12669,3 +12890,4 @@ lib/libgap.so.0.0.0
 %%DATADIR%%/tst/teststandard/union.tst
 %%DATADIR%%/tst/teststandard/varnames.tst
 %%DATADIR%%/tst/testutil.g
+@dir %%DATADIR%%/min-srcdir



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202182117.21ILHwsi090604>