svn commit: r564105 - in head/security/rnp: . files
Stefan Eßer
se at FreeBSD.org
Fri Feb 5 10:49:31 UTC 2021
Author: se
Date: Fri Feb 5 10:49:30 2021
New Revision: 564105
URL: https://svnweb.freebsd.org/changeset/ports/564105
Log:
Fix build in poudriere
Fetching a cmake helper file was (rightfully) blocked when building with
poudriere, leding to an abort in the configure phase.
Instead of fetching the cmake helper as an additional distfile, provide
the relevant functionality in a local version that uses port system
information instead of trying to obtain the version number from the
sources.
Reported by: kai
Added:
head/security/rnp/files/
head/security/rnp/files/version.cmake (contents, props changed)
Modified:
head/security/rnp/Makefile
Modified: head/security/rnp/Makefile
==============================================================================
--- head/security/rnp/Makefile Fri Feb 5 10:31:49 2021 (r564104)
+++ head/security/rnp/Makefile Fri Feb 5 10:49:30 2021 (r564105)
@@ -16,8 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
LICENSE_PERMS_OCB_Patent= dist-mirror dist-sell pkg-mirror pkg-sell \
auto-accept
-BROKEN= Not yet diagnosed pkg-fallout errors in configure phase, local builds succeed
-
LIB_DEPENDS= libbotan-2.so:security/botan2 \
libjson-c.so:devel/json-c
@@ -27,5 +25,10 @@ GH_ACCOUNT= rnpgp
CMAKE_ARGS= -DBUILD_SHARED_LIBS=on \
-DBUILD_TESTING=off
+
+pre-configure:
+ ${CP} ${FILESDIR}/version.cmake ${WRKSRC}/cmake/
+ ${REINPLACE_CMD} 's/%%DISTVERSION%%/${DISTVERSION}/' \
+ ${WRKSRC}/cmake/version.cmake
.include <bsd.port.mk>
Added: head/security/rnp/files/version.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/rnp/files/version.cmake Fri Feb 5 10:49:30 2021 (r564105)
@@ -0,0 +1,9 @@
+function(determine_version source_dir var_prefix)
+ set(RNP_VERSION %%DISTVERSION%% PARENT_SCOPE)
+ set(RNP_VERSION_NCOMMITS 0 PARENT_SCOPE)
+ set(RNP_VERSION_GIT_REV 0 PARENT_SCOPE)
+ set(RNP_VERSION_IS_DIRTY FALSE PARENT_SCOPE)
+ set(RNP_VERSION_COMMIT_TIMESTAMP 0 PARENT_SCOPE)
+ set(RNP_VERSION_SUFFIX "" PARENT_SCOPE)
+ set(RNP_VERSION_FULL %%DISTVERSION%% PARENT_SCOPE)
+endfunction()
More information about the svn-ports-all
mailing list