diff options
| author | Didier Raboud <odyx@debian.org> | 2016-08-09 18:11:49 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2019-08-17 15:30:51 +0200 |
| commit | 7a2def69b1ef279ea750c661b0f95a24b3f1574f (patch) | |
| tree | d3ef10abff56f95f472c6734b7e5a09eab6fcb6d | |
| parent | 2e3633bed229ae17798c9456625591012469ef5d (diff) | |
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/751157
Last-Update: 2014-06-11
Patch-Name: debianize_cups-config.patch
| -rwxr-xr-x | cups-config.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cups-config.in b/cups-config.in index f0951d0e1..f37f4dfd3 100755 --- a/cups-config.in +++ b/cups-config.in @@ -20,8 +20,8 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ bindir=@bindir@ includedir=@includedir@ -libdir=@libdir@ -imagelibdir=@libdir@ +libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) +imagelibdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) datarootdir=@datadir@ datadir=@datadir@ sysconfdir=@sysconfdir@ @@ -33,7 +33,8 @@ INSTALLSTATIC=@INSTALLSTATIC@ # 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` @@ -48,7 +49,7 @@ else CFLAGS="$CFLAGS -I$includedir" fi - if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then + if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH); then LDFLAGS="$LDFLAGS -L$libdir" fi fi @@ -103,7 +104,7 @@ while test $# -gt 0; do ;; --libs) if test $static = no; then - libs="@EXTLINKCUPS@ $LIBS"; + libs="@EXTLINKCUPS@"; if test $image = yes; then libs="@EXTLINKCUPSIMAGE@ $libs" fi |