Bug#845452: Bug#845171: wine-development: FTBFS: ld aborts or segfaults

2016-11-23 Thread Jens Reyer 
On 23.11.2016 18:06, Matthias Klose wrote:
> ta, and the fix will be in the next binutils upload too.

Great, given your recent binutils upload rate I expect that to happen
soon. So I'll probably stay lazy and avoid changing wine-development.

Bug#845452: Bug#845171: wine-development: FTBFS: ld aborts or segfaults

2016-11-23 Thread Matthias Klose 
On 23.11.2016 18:03, Jens Reyer wrote:
> Control: reassign 845171 winbind/2.27.51.20161118-2
> Control: affects 845171 wine-development
> Control: tags 845171 - help moreinfo
> Control: tags 845452 = patch
> 
> 
> [ Referencing the other related bug here. ]
> 
> Matthias Klose wrote in https://bugs.debian.org/844847#35
>> This looks like another regression with handling $ORIGIN in the
>> linker (-rpath=\$ORIGIN/<...>).  The work around for the packages
>> is to remove that option, you don't need to relocate the binaries
>> when shipped as a debian package.
> 
> Thanks a lot! I can confirm that wine-development builds again with
> attached patch, which removes the rpath $ORIGIN in configure.ac.
> 
> I'll test that a bit more and then commit for wine-development.
> 
> 
> Matthias Klose wrote in https://bugs.debian.org/844847#35
>> Cloning the bugs for the original packages ...
> 
> #845171 was still assigned to wine-development. Fixing metadata to what
> I think you wanted.

ta, and the fix will be in the next binutils upload too.

Bug#845452: Bug#845171: wine-development: FTBFS: ld aborts or segfaults

2016-11-23 Thread Jens Reyer 
Control: reassign 845171 winbind/2.27.51.20161118-2
Control: affects 845171 wine-development
Control: tags 845171 - help moreinfo
Control: tags 845452 = patch


[ Referencing the other related bug here. ]

Matthias Klose wrote in https://bugs.debian.org/844847#35
> This looks like another regression with handling $ORIGIN in the
> linker (-rpath=\$ORIGIN/<...>).  The work around for the packages
> is to remove that option, you don't need to relocate the binaries
> when shipped as a debian package.

Thanks a lot! I can confirm that wine-development builds again with
attached patch, which removes the rpath $ORIGIN in configure.ac.

I'll test that a bit more and then commit for wine-development.


Matthias Klose wrote in https://bugs.debian.org/844847#35
> Cloning the bugs for the original packages ...

#845171 was still assigned to wine-development. Fixing metadata to what
I think you wanted.

Greets!
jre


--- a/configure.ac
+++ b/configure.ac
@@ -887,12 +887,12 @@ case $host_os in
   WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
   [LDEXECFLAGS="-Wl,--export-dynamic"])
 
-  WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-  [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-   LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"],
-  [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
-   [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
-LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])])
+  WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,./lib],
+  [LDRPATH_INSTALL="-Wl,--rpath,\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
+   LDRPATH_LOCAL="-Wl,--rpath,\$(top_builddir)/libs/wine"],
+  [WINE_TRY_CFLAGS([-fPIC -Wl,-R,./lib],
+   [LDRPATH_INSTALL="-Wl,-R,\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
+LDRPATH_LOCAL="-Wl,-R,\$(top_builddir)/libs/wine"])])
 
   WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
   [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])