This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjfx.
commit 413ce8dc904b9dc25438302f951a5a9f9e5e68bf Author: Emmanuel Bourg <[email protected]> Date: Fri Jan 20 14:45:53 2017 +0100 Copy the ICU and sqlite libraries in modules/web/build/linux/import/lib to build JavaScriptCore --- debian/changelog | 2 ++ debian/rules | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0061f37..e428141 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ openjfx (8u121-b13-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patches - New build dependency on cmake + - Copy libicui18n.so, libicuuc.so, libicudata.so and libsqlite3.so in the + modules/web/build/linux/import/lib directory to build JavaScriptCore -- Emmanuel Bourg <[email protected]> Fri, 20 Jan 2017 11:58:13 +0100 diff --git a/debian/rules b/debian/rules index 0b1dc01..a200437 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # FIXME: looks like s390x is recognized as a 32bit arch ... # more heap on s390x needed @@ -39,6 +40,13 @@ override_dh_auto_build-arch: cp modules/web/src/main/java/com/sun/webkit/dom/JSObject.java modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/dom/ cp modules/web/src/main/java/com/sun/webkit/perf/PerfLogger.java modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/perf/ + # Copy the ICU and sqlite libraries required by JavaScriptCore + mkdir -p modules/web/build/linux/import/lib/ + cp /usr/lib/$(DEB_HOST_MULTIARCH)/libicui18n.so modules/web/build/linux/import/lib/libicui18n.a + cp /usr/lib/$(DEB_HOST_MULTIARCH)/libicuuc.so modules/web/build/linux/import/lib/libicuuc.a + cp /usr/lib/$(DEB_HOST_MULTIARCH)/libicudata.so modules/web/build/linux/import/lib/libicudata.a + cp /usr/lib/$(DEB_HOST_MULTIARCH)/libsqlite3.so modules/web/build/linux/import/lib/libsqlite3.a + $(SET_JAVA_OPTS) dh_auto_build -- sdk -x javadoc -x src override_dh_auto_build-indep: override_dh_auto_build-arch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
