Bug#805941: libpcre2-dev: arch-dependent file in "Multi-Arch: same" package

2015-11-24 Thread Matthew Vernon

On 24/11/15 12:40, Jakub Wilk wrote:


The hard way is to make the script identical across all architectures.
Then the package could remain "Multi-Arch: same".

So let's look what the architecture-dependent bits are:





So it looks like the hard way is not that hard after all. :-)


Thanks for that, very helpful. I've just uploaded a new package that 
fixes this bug in the manner you suggested.


Regards,

Matthew



Bug#805941: libpcre2-dev: arch-dependent file in "Multi-Arch: same" package

2015-11-24 Thread Jakub Wilk

Package: libpcre2-dev
Version: 10.20-1
Severity: important
User: multiarch-de...@lists.alioth.debian.org
Usertags: multiarch

libpcre2-dev is marked as "Multi-Arch: same", but the following file is 
architecture-dependent:


/usr/bin/pcre2-config

An example diff between i386 and amd64 is attached.

--
Jakub Wilk
diff -ur libpcre2-dev_10.20-1_i386/usr/bin/pcre2-config 
libpcre2-dev_10.20-1_amd64/usr/bin/pcre2-config
--- libpcre2-dev_10.20-1_i386/usr/bin/pcre2-config  2015-11-23 
12:47:34.0 +0100
+++ libpcre2-dev_10.20-1_amd64/usr/bin/pcre2-config 2015-11-23 
17:35:06.0 +0100
@@ -30,16 +30,16 @@
 libR=
 case `uname -s` in
   *SunOS*)
-  libR=" -R${prefix}/lib/i386-linux-gnu"
+  libR=" -R${prefix}/lib/x86_64-linux-gnu"
   ;;
   *BSD*)
-  libR=" -Wl,-R${prefix}/lib/i386-linux-gnu"
+  libR=" -Wl,-R${prefix}/lib/x86_64-linux-gnu"
   ;;
 esac
 
 libS=
-if test ${prefix}/lib/i386-linux-gnu != /usr/lib ; then
-  libS=-L${prefix}/lib/i386-linux-gnu
+if test ${prefix}/lib/x86_64-linux-gnu != /usr/lib ; then
+  libS=-L${prefix}/lib/x86_64-linux-gnu
 fi
 
 while test $# -gt 0; do


Bug#805941: libpcre2-dev: arch-dependent file in "Multi-Arch: same" package

2015-11-24 Thread Matthew Vernon
Hi,

On 24/11/15 11:17, Jakub Wilk wrote:

> libpcre2-dev is marked as "Multi-Arch: same", but the following file is
> architecture-dependent:
> 
> /usr/bin/pcre2-config

Thanks for the bug report. I think this means libpcre2-dev should be
marked as Multi-Arch: no?

Regards,

Matthew



Bug#805941: libpcre2-dev: arch-dependent file in "Multi-Arch: same" package

2015-11-24 Thread Jakub Wilk

* Matthew Vernon , 2015-11-24, 12:15:
libpcre2-dev is marked as "Multi-Arch: same", but the following file 
is architecture-dependent:


/usr/bin/pcre2-config


Thanks for the bug report. I think this means libpcre2-dev should be 
marked as Multi-Arch: no?


That's the lazy^Weasy way, yes.

The hard way is to make the script identical across all architectures. 
Then the package could remain "Multi-Arch: same".


So let's look what the architecture-dependent bits are:


case `uname -s` in
 *SunOS*)
 libR=" -R${prefix}/lib/i386-linux-gnu"
 ;;
 *BSD*)
 libR=" -Wl,-R${prefix}/lib/i386-linux-gnu"
 ;;
esac


This is no-op on Linux, and adds harmful rpath on kFreeBSD.
This part can (and should!) be removed.


if test ${prefix}/lib/i386-linux-gnu != /usr/lib ; then
 libS=-L${prefix}/lib/i386-linux-gnu
fi


/usr/lib/i386-linux-gnu is already within linker's search path.
So this part can be safely removed, too.

So it looks like the hard way is not that hard after all. :-)

--
Jakub Wilk