Date: Thursday, March 28, 2019 @ 20:08:17 Author: shibumi Revision: 445617
archrelease: copy trunk to community-x86_64 Added: facter/repos/community-x86_64/PKGBUILD (from rev 445616, facter/trunk/PKGBUILD) facter/repos/community-x86_64/java10.patch (from rev 445616, facter/trunk/java10.patch) Deleted: facter/repos/community-x86_64/PKGBUILD facter/repos/community-x86_64/java10.patch --------------+ PKGBUILD | 102 ++++++++++++++++++++++++++++----------------------------- java10.patch | 76 +++++++++++++++++++++--------------------- 2 files changed, 89 insertions(+), 89 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-03-28 20:08:07 UTC (rev 445616) +++ PKGBUILD 2019-03-28 20:08:17 UTC (rev 445617) @@ -1,51 +0,0 @@ -# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org> -# Contributor: Jonathan Steel <jsteel at archlinux.org> -# Contributor: Greg Sutcliffe <facter_aur (at) emeraldreverie.orgr> -# Contributor: Hyacinthe Cartiaux <hyacinthe.carti...@free.fr> -# Contributor: Thomas S Hatch <thatch45 (at) Gmail.com> -# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com> -# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com> - -pkgname=facter -pkgver=3.13.0 -pkgrel=1 -pkgdesc="Collect and display system facts" -arch=('x86_64') -url="https://puppetlabs.com/facter" -license=('APACHE') -depends=('ruby' 'yaml-cpp' 'boost-libs' 'curl') -makedepends=('boost' 'cmake' 'java-environment>=10' 'leatherman' 'cpp-hocon' 'java-environment-common') -optdepends=('java-environment: jruby support') -replaces=('cfacter') -source=("https://github.com/puppetlabs/facter/archive/${pkgver}.tar.gz" - 'java10.patch') -sha512sums=('f3c39239d7b0708bd98a3e5de5d5623406edf5e60b6321de1d4ec7c8cf903f3ec777640b9301979f2316e90e97e2aa0a80dc71975239dc715aaba61ec7cc37de' - '0db7f0a636bb31850b4440b3e7acc273cefc4091bd177ffaeb51434f80b142b9a96730d2a31a6ef48bf94dbd1cb21943a18e4f329a75b87718efd06a7124260b') - -prepare() { - cd "${pkgname}-${pkgver}" - - # Replace rb_data_object_alloc symbol with rb_data_object_wrap - # https://tickets.puppetlabs.com/browse/FACT-1291 - sed -i 's/rb_data_object_alloc/rb_data_object_wrap/g' \ - $( grep -rl rb_data_object_alloc lib/src/ruby ) -} - -build() { - cd "${pkgname}-${pkgver}" - - # Do not treat warnings as errors - CXXFLAGS+=' -Wno-error' - - JAVA_HOME=/usr/lib/jvm/default cmake -DCMAKE_INSTALL_PREFIX=/usr - - make -} - -package() { - cd "${pkgname}-${pkgver}" - - make install DESTDIR="${pkgdir}" - - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE -} Copied: facter/repos/community-x86_64/PKGBUILD (from rev 445616, facter/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-03-28 20:08:17 UTC (rev 445617) @@ -0,0 +1,51 @@ +# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org> +# Contributor: Jonathan Steel <jsteel at archlinux.org> +# Contributor: Greg Sutcliffe <facter_aur (at) emeraldreverie.orgr> +# Contributor: Hyacinthe Cartiaux <hyacinthe.carti...@free.fr> +# Contributor: Thomas S Hatch <thatch45 (at) Gmail.com> +# Contributor: Dave Simons <miouhpi (at) Gmail (dot) com> +# Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com> + +pkgname=facter +pkgver=3.13.1 +pkgrel=1 +pkgdesc="Collect and display system facts" +arch=('x86_64') +url="https://puppetlabs.com/facter" +license=('APACHE') +depends=('ruby' 'yaml-cpp' 'boost-libs' 'curl') +makedepends=('boost' 'cmake' 'java-environment>=10' 'leatherman' 'cpp-hocon' 'java-environment-common') +optdepends=('java-environment: jruby support') +replaces=('cfacter') +source=("https://github.com/puppetlabs/facter/archive/${pkgver}.tar.gz" + 'java10.patch') +sha512sums=('22d65d3c7eeedc674b99dcba1503bcecdc268abda0f25e6e209f1c3560dc8077b13fc5a6bbb8de1b45f2b7f5d1f2dfec8aa4fe20461a1b1d6a1a65674f570e56' + '0db7f0a636bb31850b4440b3e7acc273cefc4091bd177ffaeb51434f80b142b9a96730d2a31a6ef48bf94dbd1cb21943a18e4f329a75b87718efd06a7124260b') + +prepare() { + cd "${pkgname}-${pkgver}" + + # Replace rb_data_object_alloc symbol with rb_data_object_wrap + # https://tickets.puppetlabs.com/browse/FACT-1291 + sed -i 's/rb_data_object_alloc/rb_data_object_wrap/g' \ + $( grep -rl rb_data_object_alloc lib/src/ruby ) +} + +build() { + cd "${pkgname}-${pkgver}" + + # Do not treat warnings as errors + CXXFLAGS+=' -Wno-error' + + JAVA_HOME=/usr/lib/jvm/default cmake -DCMAKE_INSTALL_PREFIX=/usr + + make +} + +package() { + cd "${pkgname}-${pkgver}" + + make install DESTDIR="${pkgdir}" + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE +} Deleted: java10.patch =================================================================== --- java10.patch 2019-03-28 20:08:07 UTC (rev 445616) +++ java10.patch 2019-03-28 20:08:17 UTC (rev 445617) @@ -1,38 +0,0 @@ -From 05050b84320e118fc7490609b77b5cdeafd83add Mon Sep 17 00:00:00 2001 -From: mlevitt <mark.s.lev...@gmail.com> -Date: Sat, 14 Apr 2018 14:51:22 -0600 -Subject: [PATCH] (FACT-1844) JDK10 drops support for javah - -Any JDK post 9 requires change of invocation from - - javah -d <dir> -to - javac -h <dir> ---- - lib/CMakeLists.txt | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index be67e0e2b..f7e8d4493 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -283,8 +283,18 @@ if (JRUBY_SUPPORT) - - # javah does not atomically write the header file, so parallel builds can - # read it before it finishes writing if not careful. -+ # JDK versions after 9 don't provide javah. Use javac in these cases -+ -+ if(Java_VERSION VERSION_LESS "10") -+ set(JAVAH_COMMAND javah) -+ set(JAVAH_ARG -classpath facter.jar -d "${CMAKE_CURRENT_LIST_DIR}/src/java" com.puppetlabs.Facter) -+ else() -+ set(JAVAH_COMMAND javac) -+ set(JAVAH_ARG -h "${CMAKE_CURRENT_LIST_DIR}/src/java" com/puppetlabs/Facter.java) -+ endif() -+ - add_custom_command(OUTPUT "${CMAKE_CURRENT_LIST_DIR}/src/java/com_puppetlabs_Facter.h" -- COMMAND javah ARGS -classpath facter.jar -d "${CMAKE_CURRENT_LIST_DIR}/src/java" com.puppetlabs.Facter -+ COMMAND ${JAVAH_COMMAND} ARGS ${JAVAH_ARG} - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib" - DEPENDS facter-jruby-jar) - # Anything that depends on facter-jruby wants both the jar AND the completely written header. Copied: facter/repos/community-x86_64/java10.patch (from rev 445616, facter/trunk/java10.patch) =================================================================== --- java10.patch (rev 0) +++ java10.patch 2019-03-28 20:08:17 UTC (rev 445617) @@ -0,0 +1,38 @@ +From 05050b84320e118fc7490609b77b5cdeafd83add Mon Sep 17 00:00:00 2001 +From: mlevitt <mark.s.lev...@gmail.com> +Date: Sat, 14 Apr 2018 14:51:22 -0600 +Subject: [PATCH] (FACT-1844) JDK10 drops support for javah + +Any JDK post 9 requires change of invocation from + + javah -d <dir> +to + javac -h <dir> +--- + lib/CMakeLists.txt | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index be67e0e2b..f7e8d4493 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -283,8 +283,18 @@ if (JRUBY_SUPPORT) + + # javah does not atomically write the header file, so parallel builds can + # read it before it finishes writing if not careful. ++ # JDK versions after 9 don't provide javah. Use javac in these cases ++ ++ if(Java_VERSION VERSION_LESS "10") ++ set(JAVAH_COMMAND javah) ++ set(JAVAH_ARG -classpath facter.jar -d "${CMAKE_CURRENT_LIST_DIR}/src/java" com.puppetlabs.Facter) ++ else() ++ set(JAVAH_COMMAND javac) ++ set(JAVAH_ARG -h "${CMAKE_CURRENT_LIST_DIR}/src/java" com/puppetlabs/Facter.java) ++ endif() ++ + add_custom_command(OUTPUT "${CMAKE_CURRENT_LIST_DIR}/src/java/com_puppetlabs_Facter.h" +- COMMAND javah ARGS -classpath facter.jar -d "${CMAKE_CURRENT_LIST_DIR}/src/java" com.puppetlabs.Facter ++ COMMAND ${JAVAH_COMMAND} ARGS ${JAVAH_ARG} + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + DEPENDS facter-jruby-jar) + # Anything that depends on facter-jruby wants both the jar AND the completely written header.