Control: tags 749957 + patch On Sat, 31 May 2014 at 02:13:50 +0100, Michael Tautschnig wrote: > Removing binutils is obviously not an option.
Here is my attempt at a fix. Unfortunately, I ran into another bit of bit-rotted build infrastructure (requiring the 'apt' tool from openjdk <= 6), for which I've just filed another RC bug. Sorry I couldn't get this to a point where it was uploadable. It might not be necessary to use -fuse-ld=bfd at all - I didn't try without it (so far I just cargo-culted the assumption that gold(1) is still somehow unsuitable for this package). (By the way, lwjgl/2.7.1+dfsg-3 seems to be missing from pkg-java git: please push that commit?) S
>From 5dd362fc05a49af50471c97bf8694f4fe4b02b2a Mon Sep 17 00:00:00 2001 From: Simon McVittie <s...@debian.org> Date: Fri, 12 Sep 2014 09:57:20 +0100 Subject: [PATCH] Remove Build-Conflicts on binutils-gold (Closes: #749957) --- debian/changelog | 9 +++++++++ debian/control | 2 -- debian/patches/p/allarchs.diff | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13bc5fd..7aeb7c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lwjgl (2.7.1+dfsg-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove Build-Conflicts on binutils-gold, alter + debian/patches/p/allarchs.diff to pass -fuse-ld=bfd to the compiler + when linking instead (Closes: #749957) + + -- Simon McVittie <s...@debian.org> Fri, 12 Sep 2014 09:48:06 +0100 + lwjgl (2.7.1+dfsg-3) unstable; urgency=low * add java bin dir to the PATH environment (closes: #664180) diff --git a/debian/control b/debian/control index b5113df..c3b6455 100644 --- a/debian/control +++ b/debian/control @@ -18,8 +18,6 @@ Build-Depends: libxt-dev, Build-Depends-Indep: default-jdk-doc, -Build-Conflicts: - binutils-gold, Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-java/lwjgl.git Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git diff --git a/debian/patches/p/allarchs.diff b/debian/patches/p/allarchs.diff index f7af820..5f1a19e 100644 --- a/debian/patches/p/allarchs.diff +++ b/debian/patches/p/allarchs.diff @@ -4,6 +4,7 @@ Subject: [PATCH] p/allarchs This patch to build on all archs. Signed-off-by: Gabriele Giacone <1o5g4...@gmail.com> +[edited to pass -fuse-ld=bfd to the compiler when linking -smcv] --- platform_build/linux_ant/build.xml | 36 ++++++++++++++++++++++++++++++++++-- @@ -32,7 +33,7 @@ Index: lwjgl-2.7.1+dfsg/platform_build/linux_ant/build.xml <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/> <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/> -+ <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/> ++ <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -fuse-ld=bfd -o ${libname32} ${libs} ${xf86vm_lib}"/> <condition property="build.32bit.only"> <not> -- 2.1.0