summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-06-06 13:03:58 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-06-06 13:06:27 (GMT)
commitedd2716c4369801770c10fad5565ab0d3e117c3f (patch)
tree4e9989355aa031d8ead3ff579ab70d03794bcccb
parent27930b0c219300ce5f32ac676245306481e776cf (diff)
downloadbuildroot-edd2716c4369801770c10fad5565ab0d3e117c3f.tar.gz
buildroot-edd2716c4369801770c10fad5565ab0d3e117c3f.tar.bz2
cups: fix libdir handling
Cups uses /usr/lib64 if the HOST has it, no matter if it is cross compiling for a 32bit arch, breaking the build for stuff looking in /usr/lib. Fixes http://autobuild.buildroot.net/results/4ed4f5b43d05a40ab15f141442f15da56c87be3b Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/cups/cups.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index f06502a..6d906ec 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -13,7 +13,8 @@ CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
CUPS_CONF_OPT = --without-perl \
--without-java \
--disable-gnutls \
- --disable-gssapi
+ --disable-gssapi \
+ --libdir=/usr/$(if $(BR2_ARCH_IS_64),lib64,lib)
CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
$(if $(BR2_PACKAGE_LIBPNG),libpng) \