[Git][java-team/jffi][master] 8 commits: d/rules: fix FTBFS with binary-arch target
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Mon Oct 31 01:56:44 GMT 2022
Jérôme Charaoui pushed to branch master at Debian Java Maintainers / jffi
Commits:
1bf3654b by Jérôme Charaoui at 2022-10-30T21:28:48-04:00
d/rules: fix FTBFS with binary-arch target
- - - - -
ed0d2540 by Jérôme Charaoui at 2022-10-30T21:31:58-04:00
d/rules: small tweaks
Gbp-Dch: ignore
- - - - -
11e55e40 by Jérôme Charaoui at 2022-10-30T21:38:11-04:00
d/rules: optimize build targets
This avoids compiling the java code when building the native library for
libjffi-jni.
- - - - -
aa4c0d03 by Jérôme Charaoui at 2022-10-30T21:40:26-04:00
d/control: bump dh-compat to 13
- - - - -
a9a90e50 by Jérôme Charaoui at 2022-10-30T21:41:27-04:00
d/control: flag junit4 as test-only build dependency
- - - - -
edc989d9 by Jérôme Charaoui at 2022-10-30T21:49:12-04:00
d/control: add Build-Depends-Indep
- - - - -
66b0a4d9 by Jérôme Charaoui at 2022-10-30T21:49:51-04:00
d/control: run wrap-and-sort -bastk
- - - - -
424525dd by Jérôme Charaoui at 2022-10-30T21:53:58-04:00
Update changelog for 1.3.9+ds-2 release
- - - - -
6 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/0009-optimize-build-targets.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+jffi (1.3.9+ds-2) unstable; urgency=medium
+
+ * Team upload.
+ * d/rules:
+ + fix FTBFS with binary-arch target
+ + optimize build targets
+ * d/control:
+ + bump dh-compat to 13
+ + flag junit4 as test-only build dependency
+ + add Build-Depends-Indep
+ + run wrap-and-sort -bastk
+
+ -- Jérôme Charaoui <jerome at riseup.net> Sun, 30 Oct 2022 21:52:36 -0400
+
jffi (1.3.9+ds-1) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -2,23 +2,26 @@ Source: jffi
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Jakub Adam <jakub.adam at ktknet.cz>, Tim Potter <tpot at hp.com>
+Uploaders:
+ Jakub Adam <jakub.adam at ktknet.cz>,
+ Tim Potter <tpot at hp.com>,
Build-Depends:
ant,
ant-optional,
- bnd (>= 2.1.0),
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
javahelper,
- junit4,
+ junit4 <!nocheck>,
libffi-dev,
libltdl-dev,
+ maven-debian-helper,
+ pkg-config,
+Build-Depends-Indep:
+ bnd (>= 2.1.0),
libmaven-antrun-plugin-java,
libmaven-assembly-plugin-java,
libmaven-bundle-plugin-java,
- maven-debian-helper,
maven-repo-helper,
- pkg-config
Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/jffi.git
Vcs-Browser: https://salsa.debian.org/java-team/jffi
@@ -27,7 +30,9 @@ Homepage: https://github.com/jnr/jffi
Package: libjffi-java
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, libjffi-jni (>= ${source:Version})
+Depends:
+ libjffi-jni (>= ${source:Version}),
+ ${misc:Depends},
Description: Java Foreign Function Interface
JFFI is a wrapper for libffi, the foreign function interface library. A foreign
function interface is the popular name for the interface that allows code
@@ -37,8 +42,11 @@ Description: Java Foreign Function Interface
Package: libjffi-jni
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libjffi-java
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ libjffi-java,
Description: Java Foreign Function Interface (JNI library)
JFFI is a wrapper for libffi, the foreign function interface library. A foreign
function interface is the popular name for the interface that allows code
=====================================
debian/patches/0009-optimize-build-targets.patch
=====================================
@@ -0,0 +1,64 @@
+From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
+Date: Sun, 30 Oct 2022 21:34:04 -0400
+Subject: optimize build targets
+
+This patch makes some key internal build targets available to the
+command line for use in d/rules.
+
+ * do-jar: compile and assemble arch:all jar
+ * build-native-library: compiles libjffi native library
+
+Forwarded: not-needed
+---
+ build.xml | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index b871c75..7c8faaf 100644
+--- a/build.xml
++++ b/build.xml
+@@ -18,7 +18,7 @@
+ <delete dir="${dist.dir}"/>
+ </target>
+
+- <target name="jar" depends="-init,-pre-jar,-do-jar,-post-jar"/>
++ <target name="jar" depends="-init,-pre-jar,do-jar,-post-jar"/>
+
+ <target name="build-native" depends="-init, -build-platform-jar"/>
+
+@@ -146,7 +146,7 @@
+ <target name="-pre-jar"/>
+ <target name="-post-init" depends="-init-vars"/>
+ <target name="-pre-compile" depends="-init"/>
+- <target name="-post-compile" depends="-build-native-library"/>
++ <target name="-post-compile" depends="build-native-library"/>
+ <target name="-pre-compile-test" depends="-init"/>
+ <target name="-post-compile-test" depends="-build-native-testlib"/>
+ <target name="-post-jar" depends="-assemble-final-jar"/>
+@@ -161,7 +161,7 @@
+ <target name="compile" depends="-init,-pre-compile,-do-compile,-post-compile">
+ </target>
+
+- <target name="-do-jar" depends="-init,compile">
++ <target name="do-jar" depends="-init,compile">
+ <mkdir dir="${dist.dir}"/>
+ <jar destfile="${dist.jar}" basedir="${build.classes.dir}" compress="true"/>
+ </target>
+@@ -345,7 +345,7 @@
+ -->
+ </target>
+
+- <target name="-build-native-library" depends="-init-vars, -generate-native-headers, -generate-version">
++ <target name="build-native-library" depends="-init-vars, -generate-native-headers, -generate-version">
+ <mkdir dir="${build.native.dir}"/>
+
+ <exec executable="cygpath" outputproperty="jni.GNUmakefile" osfamily="Windows">
+@@ -404,7 +404,7 @@
+ </exec>
+ </target>
+
+- <target name="-build-platform-jar" depends="-init-vars, -build-native-library">
++ <target name="-build-platform-jar" depends="-init-vars, build-native-library">
+ <echo message="platform=${platform}"/>
+ <zip destfile="${dist.dir}/jffi-${platform}.jar" level="9">
+ <zipfileset prefix="jni/${platform}" dir="${build.native.dir}">
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ test_fork_true.patch
remove-unnecessary-target-for-native-build.patch
nonlinux-platforms.patch
0008-fix-native-library-artifact-not-linked-to-ffi.patch
+0009-optimize-build-targets.patch
=====================================
debian/rules
=====================================
@@ -10,14 +10,17 @@ export CCACHE_DIR=$(CURDIR)/ccache
%:
dh $@ --buildsystem=maven --with javahelper
-override_dh_auto_build:
+override_dh_auto_build-arch:
+ ant -Duse.system.libffi=1 build-native-library
+
+override_dh_auto_build-indep:
# maven builds a jar that is missing Version.class
# so use the one from the ant build
- ant -Duse.system.libffi=1 jar
+ ant -Duse.system.libffi=1 do-jar
mkdir target
mv dist/jffi.jar target/jffi-$(DEB_VERSION_UPSTREAM:+ds=).jar
-override_dh_install-arch:
+override_dh_auto_install-arch:
# install -jni library in multi-arch path
dh_install build/jni/*.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
@@ -30,12 +33,12 @@ JAR=debian/libjffi-java/usr/share/java/jffi.jar
override_jh_manifest-indep:
jh_manifest -plibjffi-java
# generate OSGi metadata
- cat debian/jffi.bnd | sed s/\%VERSION\%/$(DEB_VERSION_UPSTREAM:+ds=)/ > debian/jffi.versioned.bnd
+ cat debian/jffi.bnd | sed -e 's/%VERSION%/$(DEB_VERSION_UPSTREAM:+ds=)/' > debian/jffi.versioned.bnd
-test -f $(JAR) && \
bnd wrap --properties debian/jffi.versioned.bnd --output $(JAR).tmp $(JAR)
mv $(JAR).tmp $(JAR)
- rm debian/jffi.versioned.bnd
override_dh_clean:
ant clean
dh_clean
+ rm -f debian/jffi.versioned.bnd
View it on GitLab: https://salsa.debian.org/java-team/jffi/-/compare/d6e958a65879d0a1946d3de8f30af246e40c2f47...424525dda4401ce80f8f8f32f0f6722fe0adf184
--
View it on GitLab: https://salsa.debian.org/java-team/jffi/-/compare/d6e958a65879d0a1946d3de8f30af246e40c2f47...424525dda4401ce80f8f8f32f0f6722fe0adf184
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-java-commits/attachments/20221031/48fe782d/attachment.htm>
More information about the pkg-java-commits
mailing list