This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository libjogl2-java.
commit fe90fc7e5c60ac8055abf167be49f19a7236b82c Author: Gilles Filippini <[email protected]> Date: Tue Oct 13 23:47:35 2015 +0200 Don't use env.TARGET_PLATFORM_ROOT for aarch64 just like the others arches. --- debian/changelog | 2 ++ debian/patches/arm-build.diff | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fa2aa20..872c5d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ libjogl2-java (2.3.2+dfsg-2) UNRELEASED; urgency=medium * Team upload. * debian/rule: don't try to build the binary doc package on slow arches where we don't run javadoc. + * Fix patch arm-build.diff: don't use env.TARGET_PLATFORM_ROOT, like + the others arches (fix FTBFS on arm64). -- Gilles Filippini <[email protected]> Tue, 13 Oct 2015 23:39:22 +0200 diff --git a/debian/patches/arm-build.diff b/debian/patches/arm-build.diff index 2ed49cc..64464d8 100644 --- a/debian/patches/arm-build.diff +++ b/debian/patches/arm-build.diff @@ -99,7 +99,7 @@ Index: libjogl2-java/make/build-nativewindow.xml <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage --> <compilerarg value="-idirafter" /> <compilerarg value="/usr/include" /> -@@ -403,10 +416,10 @@ +@@ -403,16 +416,16 @@ <syslibset libs="Xrender"/> </linker> @@ -114,6 +114,15 @@ Index: libjogl2-java/make/build-nativewindow.xml </linker> <linker id="linker.cfg.linux.aarch64.nativewindow.x11" extends="linker.cfg.linux.aarch64"> +- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" /> +- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" /> +- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" /> ++ <syslibset libs="X11" /> ++ <syslibset libs="Xxf86vm" /> ++ <syslibset libs="Xrender" /> + </linker> + + <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris"> @@ -497,10 +510,10 @@ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" /> </target> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
