Control: tags -1 + patch
On Wed, Jul 24, 2019 at 05:02:30PM +0800, Chen-Yu Tsai wrote:
> libpng-dev takes care of (or works around) this by disabling the
> --libdir feature of libpng-config, and removing the @libdir@ template.
>
> Maybe the same could be done for libnss3-dev (and libnspr4-dev)?
I concur.
I checked that nss-config is the only file that breaks M-A:same (by
comparing all instances for all architectures). I also checked that the
--libdir support is the only reason for it to break M-A:same. Removing
the support is sufficient. There is no need for issuing
-L/usr/lib/<triplet> as that is on the default search path.
You can easily see on codesearch that nothing uses the --libdir option:
https://codesearch.debian.net/search?q=%28nss-config%7CNSS_CONFIG%29.*--libdir&literal=0
I'm attaching a removal patch. Please consider applying it. Applying it
also closes #963136.
Would you mind a NMU?
Helmut
--- nss-3.55/debian/nss-config.in
+++ nss-3.55/debian/nss-config.in
@@ -14,7 +14,6 @@
[--prefix[=DIR]]
[--exec-prefix[=DIR]]
[--includedir[=DIR]]
- [--libdir[=DIR]]
[--version]
[--libs]
[--cflags]
@@ -61,12 +60,6 @@
--includedir)
echo_includedir=yes
;;
- --libdir=*)
- libdir=$optarg
- ;;
- --libdir)
- echo_libdir=yes
- ;;
--version)
echo ${major_version}.${minor_version}.${patch_version}
;;
@@ -102,9 +95,6 @@
if test -z "$includedir"; then
includedir=${prefix}/include/nss
fi
-if test -z "$libdir"; then
- libdir=${exec_prefix}/lib/@DEB_HOST_MULTIARCH@
-fi
if test "$echo_prefix" = "yes"; then
echo $prefix
@@ -118,16 +108,12 @@
echo $includedir
fi
-if test "$echo_libdir" = "yes"; then
- echo $libdir
-fi
-
if test "$echo_cflags" = "yes"; then
echo -I$includedir
fi
if test "$echo_libs" = "yes"; then
- libdirs="-L$libdir"
+ libdirs=""
if test -n "$lib_ssl"; then
libdirs="$libdirs -lssl${major_version}"
fi
