[arch-commits] Commit in facter/repos (3 files)

[Evangelos Foutras]

    Date: Tuesday, September 18, 2018 @ 13:03:39
  Author: foutrelis
Revision: 383042

archrelease: copy trunk to community-staging-x86_64

Added:
  facter/repos/community-staging-x86_64/
  facter/repos/community-staging-x86_64/PKGBUILD
    (from rev 383041, facter/trunk/PKGBUILD)
  facter/repos/community-staging-x86_64/java10.patch
    (from rev 383041, facter/trunk/java10.patch)

--------------+
 PKGBUILD     |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 java10.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

Copied: facter/repos/community-staging-x86_64/PKGBUILD (from rev 383041, facter/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2018-09-18 13:03:39 UTC (rev 383042)
@@ -0,0 +1,52 @@
+# 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.cartiaux at 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.11.3
+pkgrel=2
+pkgdesc="Collect and display system facts"
+arch=('x86_64')
+url="http://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=('6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef'
+            '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 )
+  patch -p1 < ${srcdir}/java10.patch
+}
+
+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-staging-x86_64/java10.patch (from rev 383041, facter/trunk/java10.patch)
===================================================================
--- community-staging-x86_64/java10.patch	                        (rev 0)
+++ community-staging-x86_64/java10.patch	2018-09-18 13:03:39 UTC (rev 383042)
@@ -0,0 +1,38 @@
+From 05050b84320e118fc7490609b77b5cdeafd83add Mon Sep 17 00:00:00 2001
+From: mlevitt <mark.s.levitt at 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.