cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all LIBxxx_VERSION hacks, cmake.mk can cope that now

Browse Source
This commit is contained in:
rsadowski 2022-03-18 21:22:19 +00:00
parent f16a083769
commit 690126c524
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/facter/Makefile
View File

@ -50,9 +50,7 @@ CONFIGURE_ARGS+= -DFACTER_RUBY="${LOCALBASE}/lib/libruby${MODRUBY_BINREV}.so" \
# then use a pre-build target to run the ninja `facter-jruby` target
# to generate the JNI header file.
LIBfacter_MAJOR = ${LIBfacter_VERSION:R}
LIBfacter_MINOR = ${LIBfacter_VERSION:E}
SUBST_VARS += MODRUBY_BINREV MODRUBY_REV LIBfacter_MAJOR LIBfacter_MINOR
SUBST_VARS += MODRUBY_BINREV MODRUBY_REV
CXXFLAGS += -pthread

14
sysutils/facter/patches/patch-lib_CMakeLists_txt
View File

@ -1,14 +0,0 @@
- Override library version
Index: lib/CMakeLists.txt
--- lib/CMakeLists.txt.orig
+++ lib/CMakeLists.txt
@@ -354,7 +354,7 @@ add_library(libfactersrc OBJECT ${LIBFACTER_COMMON_SOU
set_target_properties(libfactersrc PROPERTIES POSITION_INDEPENDENT_CODE true)
add_library(libfacter $<TARGET_OBJECTS:libfactersrc>)
if (BUILD_SHARED_LIBS)
- set_target_properties(libfacter PROPERTIES PREFIX "" SUFFIX ".so" IMPORT_PREFIX "" IMPORT_SUFFIX ".so.a" VERSION ${PROJECT_VERSION})
+ set_target_properties(libfacter PROPERTIES PREFIX "" SUFFIX ".so" IMPORT_PREFIX "" IMPORT_SUFFIX ".so.a" VERSION ${LIBfacter_VERSION})
endif()
if(AIX)