openkylin
/
cups
mirror of https://gitee.com/openkylin/cups.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Patch-Name: debianize_cups-config.patch

Gbp-Pq: Name 0032-Use-dpkg-architecture-in-cups-config-to-make-it-arch.patch
This commit is contained in:
Didier Raboud 2016-08-09 18:11:49 +02:00 committed by openKylinBot
parent 32fdd51844
commit baff351789
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cups-config.in
View File

@ -17,7 +17,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
includedir=@includedir@ includedir=@includedir@
libdir=@libdir@ libdir=${prefix}/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
datarootdir=@datadir@ datarootdir=@datadir@
datadir=@datadir@ datadir=@datadir@
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
@ -29,7 +29,8 @@ INSTALLSTATIC=@INSTALLSTATIC@
# flags for compiler and linker... # flags for compiler and linker...
CFLAGS="" CFLAGS=""
LDFLAGS="@EXPORT_LDFLAGS@" LDFLAGS="@EXPORT_LDFLAGS@"
LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@" LIBGSSAPI=`[ ! -x /usr/bin/krb5-config ] || /usr/bin/krb5-config --libs`
LIBS="$LIBGSSAPI @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
# Check for local invocation... # Check for local invocation...
selfdir=`dirname $0` selfdir=`dirname $0`
@ -43,7 +44,7 @@ else
CFLAGS="$CFLAGS -I$includedir" CFLAGS="$CFLAGS -I$includedir"
fi 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" LDFLAGS="$LDFLAGS -L$libdir"
fi fi
fi fi