Date: Thu, 19 Jan 2023 10:51:21 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c79ec8590bf6 - main - ports-mgmt/pkg: with build with WITH_PIE Message-ID: <202301191051.30JApL4d020596@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c79ec8590bf684ccbf958adfca966d6590649539 commit c79ec8590bf684ccbf958adfca966d6590649539 Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2023-01-19 10:46:42 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2023-01-19 10:51:05 +0000 ports-mgmt/pkg: with build with WITH_PIE --- ports-mgmt/pkg/Makefile | 1 + ports-mgmt/pkg/files/patch-src_Makefile.autosetup | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 6fa9ee88487f..8e95f12c4606 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -24,6 +24,7 @@ CONFIGURE_ENV= CC_FOR_BUILD="${CC}" USE_SUBMAKE= yes CFLAGS+= -Wno-error CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 +MAKE_ARGS+= STATIC_ARG="${STATIC_PIE_ARG}" OPTIONS_DEFINE= DOCS diff --git a/ports-mgmt/pkg/files/patch-src_Makefile.autosetup b/ports-mgmt/pkg/files/patch-src_Makefile.autosetup new file mode 100644 index 000000000000..4c3991975e7f --- /dev/null +++ b/ports-mgmt/pkg/files/patch-src_Makefile.autosetup @@ -0,0 +1,11 @@ +--- src/Makefile.autosetup.orig 2022-12-11 18:22:41 UTC ++++ src/Makefile.autosetup +@@ -93,7 +93,7 @@ pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat + install: install-static + + pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat.a +- $(CC) -o $@ $(OBJS) $(STATIC_ARG) $(LDFLAGS) $(STATIC_LDFLAGS) ++ $(CC) -o $@ $(OBJS) $(STATIC_ARG) $(STATIC_LDFLAGS) + + install-static: pkg-static + install -d -m 755 $(DESTDIR)$(sbindir)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301191051.30JApL4d020596>