Control: tags -1 +patch +confirmed +pending
Le mardi, 10 juin 2014, 22.08:14 Jakub Wilk a écrit :
> libcups2-dev is marked as "Multi-Arch: same", but the following file
> is architecture-dependent:
>
> /usr/bin/cups-config
>
> An example diff between i386 and amd64 is attached.
Indeed, thanks. Patch attached, I'll upload that in the next version.
Cheers,
OdyX
commit 203d751a7882c0b976872ca2b84b7e78f11f8b65
Author: Didier Raboud <o...@debian.org>
Date: Wed Jun 11 13:45:28 2014 +0200
In cups-config, run krb5-config at runtime to avoid architecture differences due to the output of krb5-config; add check at build-time to avoid this happening again
Closes: #751157
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
index 443eb23..b606250 100644
--- a/debian/patches/debianize_cups-config.patch
+++ b/debian/patches/debianize_cups-config.patch
@@ -1,11 +1,13 @@
Description: Use dpkg-architecture in cups-config to make it architecture-independant
Also filter -L/usr/lib/(triplet) out of LDFLAGS.
Also strip unnecessary libs from --libs.
+ Also launch krb5-config at runtime to avoid getting usr/lib/(triplet) from krb5-config
Bug-Debian: https://bugs.debian.org/741519
Bug-Debian: https://bugs.debian.org/727058
Bug-Debian: https://bugs.debian.org/730838
+Bug-Debian: https://bugs.debian.org/751196
Author: Didier Raboud <o...@debian.org>
-Last-Update: 2014-03-28
+Last-Update: 2014-06-11
--- a/cups-config.in
+++ b/cups-config.in
@@ -22,8 +22,8 @@
@@ -19,7 +21,17 @@ Last-Update: 2014-03-28
datarootdir=@datadir@
datadir=@datadir@
sysconfdir=@sysconfdir@
-@@ -50,7 +50,7 @@
+@@ -35,7 +35,8 @@
+ # flags for C++ compiler:
+ CFLAGS=""
+ LDFLAGS="@EXPORT_LDFLAGS@"
+-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
++LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
++LIBS="$LIBGSSAPI @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+
+ # Check for local invocation...
+ selfdir=`dirname $0`
+@@ -50,7 +51,7 @@
CFLAGS="$CFLAGS -I$includedir"
fi
@@ -28,7 +40,7 @@ Last-Update: 2014-03-28
LDFLAGS="$LDFLAGS -L$libdir"
fi
fi
-@@ -105,7 +105,7 @@
+@@ -105,7 +106,7 @@
;;
--libs)
if test $static = no; then
diff --git a/debian/rules b/debian/rules
index 0a57d81..368bf6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,6 +142,8 @@ override_dh_fixperms:
override_dh_auto_test:
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
make check
+ # Check that cups-config is not architecture-specific
+ [ -r cups-config ] && grep -vq $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) cups-config
endif
ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))