summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2009-04-06 11:44:40 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2009-04-06 11:44:40 +0000
commit95cd55f0b71a8620bcd70dfb2fa8c053a4f1a39f (patch)
tree9cf74bf5ac04054da990f78abc891b8185c03835
parentaf0a5237360814352bc7eb6f92e1d4b9b002a7c9 (diff)
cups: use LDFLAGS for shared libs (fixes QA error)
-rw-r--r--recipes/cups/cups.inc4
-rw-r--r--recipes/cups/cups_1.2.12.bb2
-rw-r--r--recipes/cups/cups_1.3.8.bb2
3 files changed, 3 insertions, 5 deletions
diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc
index bbf2377ced..59075fb042 100644
--- a/recipes/cups/cups.inc
+++ b/recipes/cups/cups.inc
@@ -8,8 +8,6 @@ SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
inherit autotools binconfig
-LDFLAGS += " -L${STAGING_LIBDIR} "
-
EXTRA_OECONF = " \
--enable-gnutls \
--enable-dbus \
@@ -26,7 +24,7 @@ EXTRA_OECONF = " \
do_configure() {
gnu-configize
libtoolize --force
- oe_runconf
+ DSOFLAGS="${LDFLAGS}" oe_runconf
}
do_compile () {
diff --git a/recipes/cups/cups_1.2.12.bb b/recipes/cups/cups_1.2.12.bb
index bbe3c5d84f..4f7d0d49b6 100644
--- a/recipes/cups/cups_1.2.12.bb
+++ b/recipes/cups/cups_1.2.12.bb
@@ -1,2 +1,2 @@
require cups.inc
-PR = "r1"
+PR = "r2"
diff --git a/recipes/cups/cups_1.3.8.bb b/recipes/cups/cups_1.3.8.bb
index e9fd9850e9..79cbc32715 100644
--- a/recipes/cups/cups_1.3.8.bb
+++ b/recipes/cups/cups_1.3.8.bb
@@ -1,7 +1,7 @@
require cups.inc
SRC_URI += "file://use_echo_only_in_init.patch;patch=1"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"