Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -4205,3 +4205,4 @@ libtraceevent.so.1 libtraceevent-1.6.2_1
libtracefs.so.1 libtracefs-1.4.2_1
libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
1 change: 1 addition & 0 deletions srcpkgs/cpp-hocon-devel
17 changes: 10 additions & 7 deletions srcpkgs/cpp-hocon/template
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# Template file for 'cpp-hocon'
pkgname=cpp-hocon
version=0.3.0
revision=4
revision=5
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
makedepends="boost-devel leatherman-devel libcurl-devel"
short_desc="C++ port of the Typesafe Config library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/puppetlabs/cpp-hocon/"
distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz"
checksum=dab02354046f05aca6275c746d7583ee5f71853aa5b1d93529564632e184c3dd

post_install() {
# this package is a static library,
# needs to be rebuild when update boost,
# force an shlib-dependencies
vbin build/bin/libcpp-hocon_test
cpp-hocon-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.so"
}
}
13 changes: 13 additions & 0 deletions srcpkgs/facter/patches/shared_cpp_hcon.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
https://github.com/archlinux/svntogit-community/blob/0eb74a76c976a7fd638fbf6cd1c3b47be3dccd8b/trunk/shared_cpp_hcon.patch

diff --git a/cmake/FindCPPHOCON.cmake b/cmake/FindCPPHOCON.cmake
index 00ba8bd..0df0a51 100644
--- a/cmake/FindCPPHOCON.cmake
+++ b/cmake/FindCPPHOCON.cmake
@@ -1,5 +1,5 @@
include(FindDependency)
-find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a")
+find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.so")

include(FeatureSummary)
set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon")
8 changes: 4 additions & 4 deletions srcpkgs/facter/template
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
revision=4
revision=5
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
hostmakedepends="ruby-devel"
makedepends="boost-devel cpp-hocon leatherman-devel libblkid-devel libcurl-devel
makedepends="boost-devel cpp-hocon-devel leatherman-devel libblkid-devel libcurl-devel
ruby-devel yaml-cpp-devel"
depends="net-tools ruby"
short_desc="Collect and display system facts"
Expand All @@ -18,13 +18,13 @@ checksum=196c69b1ae325dbf11f68025eb12b9c53c054bee9112bd4f3e2ece8c5fe76571

pre_configure() {
case "$XBPS_TARGET_MACHINE" in
mips*) sed -i lib/CMakeLists.txt -e'/add_subdirectory(tests)/d' ;;
mips*) vsed -i lib/CMakeLists.txt -e'/add_subdirectory(tests)/d' ;;
esac
}

post_build() {
# fixup vendor_ruby usr/lib{32,64} install path to always use usr/lib
vsed -i build/lib/cmake_install.cmake -e "s;lib32;lib;g" -e "s;lib64;lib;g"
vsed -i build/lib/cmake_install.cmake -e "s;lib\(32\|64\);lib;g"
}

facter-devel_package() {
Expand Down
1 change: 0 additions & 1 deletion srcpkgs/leatherman/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
revision=3
revision=4
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
Expand Down