[arch-commits] Commit in facter/repos/community-x86_64 (3 files)
Christian Rebischke
shibumi at archlinux.org
Tue Jul 10 16:59:09 UTC 2018
Date: Tuesday, July 10, 2018 @ 16:59:08
Author: shibumi
Revision: 356275
archrelease: copy trunk to community-x86_64
Added:
facter/repos/community-x86_64/PKGBUILD
(from rev 356274, facter/trunk/PKGBUILD)
facter/repos/community-x86_64/java10.patch
(from rev 356274, facter/trunk/java10.patch)
Deleted:
facter/repos/community-x86_64/PKGBUILD
--------------+
PKGBUILD | 102 +++++++++++++++++++++++++++++----------------------------
java10.patch | 38 +++++++++++++++++++++
2 files changed, 91 insertions(+), 49 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-10 16:59:03 UTC (rev 356274)
+++ PKGBUILD 2018-07-10 16:59:08 UTC (rev 356275)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: 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.0
-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=9' 'leatherman' 'cpp-hocon')
-optdepends=('java-environment: jruby support')
-replaces=('cfacter')
-source=(http://downloads.puppetlabs.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('b5fc27b001d4504d62fa6513ce4c93ac')
-
-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 356274, facter/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-07-10 16:59:08 UTC (rev 356275)
@@ -0,0 +1,53 @@
+# $Id$
+# 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.2
+pkgrel=1
+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=('aaeee7449813590ac8bc8d3b1b2a654e75bcdaabbb19f91f8b282f747e0f8af05ef71bc872b99c226f0db4d06b67549551f62c365853f5829c6b26c931c0b582'
+ '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-x86_64/java10.patch (from rev 356274, facter/trunk/java10.patch)
===================================================================
--- java10.patch (rev 0)
+++ java10.patch 2018-07-10 16:59:08 UTC (rev 356275)
@@ -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.
More information about the arch-commits
mailing list