diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2023-02-13 08:07:57 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2023-02-13 08:09:56 +0000 |
| commit | c7e073a677e754db2247a179524bcda3bc9f42c6 (patch) | |
| tree | d4ed32b3cdbcdeb95474f630040378ff564147d7 /ports-mgmt | |
| parent | 2d9ee4449f255341b432fc39f2b024a19b5f1bba (diff) | |
| download | ports-c7e073a677e754db2247a179524bcda3bc9f42c6.tar.gz ports-c7e073a677e754db2247a179524bcda3bc9f42c6.zip | |
ports-mgmt/pkg: fix regression in pkg-static and version number
When adding the support for static PIE, we masked the actually
STATIC_ARGS making pkg-static a dynamic binary in all other cases.
While here fix the version numbering which was not updated properly
during the release process.
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 5 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-auto.def | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 5e70aeb1471c..5b8e69da2486 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -24,7 +24,6 @@ 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 @@ -38,6 +37,10 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif +.if defined(WITH_PIE) +MAKE_ARGS+= STATIC_ARG="-static ${STATIC_PIE_ARGS}" +.endif + .if defined(WITH_PKG) .if ${WITH_PKG} == devel IGNORE= WITH_PKG is defined to 'devel', this version is the stable one diff --git a/ports-mgmt/pkg/files/patch-auto.def b/ports-mgmt/pkg/files/patch-auto.def new file mode 100644 index 000000000000..f6e9bdb88b96 --- /dev/null +++ b/ports-mgmt/pkg/files/patch-auto.def @@ -0,0 +1,11 @@ +--- auto.def.orig 2023-02-01 15:55:57 UTC ++++ auto.def +@@ -5,7 +5,7 @@ set med_ver 19 + + set maj_ver 1 + set med_ver 19 +-set min_ver 0 ++set min_ver 1 + set dev_ver 0 + define PKG_API [expr $maj_ver * 1000000 + $med_ver * 1000 + $min_ver] + define VERSION $maj_ver.$med_ver.$min_ver[expr {$dev_ver ? ".$dev_ver" : ""}] |