[Pkg-freeipa-devel] [Git][freeipa-team/nuxwdog][master] 3 commits: support-jdk11.diff: Fix build with current JDK. (Closes: #899123)

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / nuxwdog


Commits:
4a428f8b by Timo Aaltonen at 2018-12-05T23:16:40Z
support-jdk11.diff: Fix build with current JDK. (Closes: #899123)

- - - - -
09050779 by Timo Aaltonen at 2018-12-05T23:22:13Z
control, rules: Build with default jdk again.

- - - - -
3410b6f3 by Timo Aaltonen at 2018-12-05T23:22:25Z
releasing package nuxwdog version 1.0.5-2

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/fix-javac-path.diff
- debian/patches/series
- + debian/patches/support-jdk11.diff
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+nuxwdog (1.0.5-2) unstable; urgency=medium
+
+  * support-jdk11.diff: Fix build with current JDK. (Closes: #899123)
+  * control, rules: Build with default jdk again.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 06 Dec 2018 01:22:15 +0200
+
 nuxwdog (1.0.5-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Build-Depends:
  ant,
  chrpath,
  debhelper (>= 11),
- openjdk-8-jdk,
+ default-jdk,
  javahelper,
  libkeyutils-dev,
  libnspr4-dev,


=====================================
debian/patches/fix-javac-path.diff
=====================================
@@ -7,7 +7,7 @@ index 86f06a2..5fab113 100644
  ],
  [case $host in
    *-*-linux*)
--    javac_exe=`/usr/sbin/alternatives --display javac | grep link | cut -c27-`
+-    javac_exe=`/usr/sbin/alternatives --display javac | grep link | head -n 1 | cut -c27-`
 +    javac_exe=`readlink -e /usr/bin/javac`
      jni_path=`dirname $javac_exe`/../include
      jni_inc="-I$jni_path -I$jni_path/linux"


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+support-jdk11.diff
 fix-javac-path.diff
 fix-nspr-include-path.diff


=====================================
debian/patches/support-jdk11.diff
=====================================
@@ -0,0 +1,34 @@
+diff --git a/build.xml b/build.xml
+index ebf18a2..a3b088e 100644
+--- a/build.xml
++++ b/build.xml
+@@ -82,13 +82,12 @@
+             description="--> generate jni header files">
+         <echo message="${begin.build.jni.headers.log.message}"/>
+         <mkdir dir="${build.dir}/include"/>
+-        <exec executable="javah" failonerror="true">
++        <exec executable="javac" failonerror="true">
+             <arg value="-classpath"/>
+             <arg value="${build.classes}:${jss.jar}:${ldapjdk.jar}"/>
+-            <arg value="-jni"/>
+-            <arg value="-d"/>
++            <arg value="-h"/>
+             <arg value="${build.dir}/include"/>
+-            <arg value="com.redhat.${product.prefix}${product}.WatchdogClient"/>
++            <arg value="${src.dir}/com/redhat/${product.prefix}${product}/WatchdogClient.java"/>
+         </exec>
+         <echo message="${end.build.jni.headers.log.message}"/>
+     </target>
+diff --git a/m4/nuxwdog.m4 b/m4/nuxwdog.m4
+index 86f06a2..bc8076b 100644
+--- a/m4/nuxwdog.m4
++++ b/m4/nuxwdog.m4
+@@ -81,7 +81,7 @@ AC_ARG_WITH(jni-inc, [  --with-jni-inc=PATH        NUXWDOG jni.h header path],
+ ],
+ [case $host in
+   *-*-linux*)
+-    javac_exe=`/usr/sbin/alternatives --display javac | grep link | cut -c27-`
++    javac_exe=`/usr/sbin/alternatives --display javac | grep link | head -n 1 | cut -c27-`
+     jni_path=`dirname $javac_exe`/../include
+     jni_inc="-I$jni_path -I$jni_path/linux"
+     if test -f "$jni_path"/jni.h


=====================================
debian/rules
=====================================
@@ -24,8 +24,6 @@ ifeq ($(DEB_HOST_ARCH_BITS), 64)
 	confflags += --enable-64bit
 endif
 
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH)
-
 # main packaging script based on dh7 syntax
 %:
 	dh $@  --no-parallel --with javahelper
@@ -35,7 +33,7 @@ override_dh_auto_configure:
 
 override_dh_auto_clean:
 	if [ -f "Makefile" ]; then make -j1 distclean; fi
-	JAVA_HOME=/usr/lib/jvm/default-java dh_auto_clean -- ${ant_flags}
+	dh_auto_clean -- ${ant_flags}
 	rm -f lib/perl/Nuxwdogclient/Makefile.real.old
 	if [ -d "stash" ]; then mv stash/*.inc lib/perl/Nuxwdogclient; rmdir stash; fi
 



View it on GitLab: https://salsa.debian.org/freeipa-team/nuxwdog/compare/9c2437e475f520bf3302f68c48de6db9c5037190...3410b6f3354466ab8b0e38d577390a7ba24e847e

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/nuxwdog/compare/9c2437e475f520bf3302f68c48de6db9c5037190...3410b6f3354466ab8b0e38d577390a7ba24e847e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20181205/e2088cf8/attachment-0001.html>