mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-05 11:33:12 +02:00
facter: update to 4.10.0.
This commit is contained in:
parent
cd2e35ff50
commit
65f7c3f274
3 changed files with 5 additions and 56 deletions
|
@ -1,13 +0,0 @@
|
||||||
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")
|
|
|
@ -1,12 +0,0 @@
|
||||||
Index: facter-3.14.16/lib/src/facts/glib/load_average_resolver.cc
|
|
||||||
===================================================================
|
|
||||||
--- facter-3.14.16.orig/lib/src/facts/glib/load_average_resolver.cc
|
|
||||||
+++ facter-3.14.16/lib/src/facts/glib/load_average_resolver.cc
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
#include <internal/facts/glib/load_average_resolver.hpp>
|
|
||||||
#include <leatherman/logging/logging.hpp>
|
|
||||||
#include <cstdlib>
|
|
||||||
+#include <array>
|
|
||||||
|
|
||||||
#ifdef __sun
|
|
||||||
#include <sys/loadavg.h>
|
|
|
@ -1,37 +1,11 @@
|
||||||
# Template file for 'facter'
|
# Template file for 'facter'
|
||||||
pkgname=facter
|
pkgname=facter
|
||||||
version=3.14.16
|
version=4.10.0
|
||||||
revision=8
|
revision=1
|
||||||
build_style=cmake
|
build_style=gem
|
||||||
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
|
depends="ruby-hocon ruby-thor-1.2"
|
||||||
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
|
|
||||||
hostmakedepends="ruby-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"
|
short_desc="Collect and display system facts"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
homepage="https://puppet.com/docs/puppet/latest/facter.html"
|
homepage="https://puppet.com/docs/puppet/latest/facter.html"
|
||||||
distfiles="https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${version}.tar.gz"
|
checksum=b78a213b9160cded7ab93e7c47c003c618ebd49c6eca549d09a068e27a30a59d
|
||||||
checksum=196c69b1ae325dbf11f68025eb12b9c53c054bee9112bd4f3e2ece8c5fe76571
|
|
||||||
|
|
||||||
pre_configure() {
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
|
||||||
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;lib\(32\|64\);lib;g"
|
|
||||||
}
|
|
||||||
|
|
||||||
facter-devel_package() {
|
|
||||||
short_desc+=" - development files"
|
|
||||||
depends="${makedepends} ${sourcepkg}-${version}_${revision}"
|
|
||||||
pkg_install() {
|
|
||||||
vmove usr/include
|
|
||||||
vmove "usr/lib/*.so"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue