[pkg-wine-party] [wine] 02/02: Create the sonames2elf binary without -nostdlib.

Jens Reyer jreyer-guest at moszumanska.debian.org
Thu Feb 2 19:14:19 UTC 2017


This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit 51f48d3e6c04cef760610d14ba5f368e7f2baf7a
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Feb 2 15:04:11 2017 +0100

    Create the sonames2elf binary without -nostdlib.
    
    Cf. #853793 (dpkg: ABI mismatch detector is too strict on armel/
    armhf)
    
    This way the ABI should match on armel/armhf, fixing the new
    ftbfs. The elf binary is *only* used by dpkg-shlibdeps to compute
    the dependencies on dlopen'ed libraries.
---
 debian/changelog           | 5 +++--
 debian/scripts/sonames2elf | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 539bbbc..4389f68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-wine-development (2.0-3) UNRELEASED; urgency=medium
+wine-development (2.0-3) unstable; urgency=medium
 
   * Enable oss on kfreebsd, explicitly disable it on other archs.
+  * Create the sonames2elf binary without -nostdlib (cf. #853793).
 
- -- Jens Reyer <jre.winesim at gmail.com>  Thu, 02 Feb 2017 18:13:12 +0100
+ -- Jens Reyer <jre.winesim at gmail.com>  Thu, 02 Feb 2017 18:14:48 +0100
 
 wine-development (2.0-2) unstable; urgency=medium
 
diff --git a/debian/scripts/sonames2elf b/debian/scripts/sonames2elf
index cdf6c54..6c51a6d 100755
--- a/debian/scripts/sonames2elf
+++ b/debian/scripts/sonames2elf
@@ -30,6 +30,6 @@ fi
 tmpdir=$(mktemp -d -t sonames2elf.XXXXXX)
 cd "$tmpdir"
 printf 'INPUT(%s)\n' "$@" > libeverything.so
-gcc -shared -nostdlib -Wl,--no-as-needed -L. -leverything -o elf
+gcc -shared -Wl,--no-as-needed -L. -leverything -o elf
 cat elf
 rm -rf "$tmpdir"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git



More information about the pkg-wine-party mailing list