summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2012-11-15 11:17:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-24 15:12:35 +0000
commitd48d44e25cc0dcc955e9d4e93d8164f7cbc9f9c0 (patch)
treebb77b5c1783fc58f071c973eb845d2bd344a2407 /meta
parent5c1c26a25052063473f44ca21cd1cf94683674f6 (diff)
downloadpoky-d48d44e25cc0dcc955e9d4e93d8164f7cbc9f9c0.tar.gz
curl: eliminate forced setting of -g0 when compiling
Do not invoke CURL_SET_COMPILER_DEBUG_OPTS in configure.ac. This will allow debug options set in our CFLAGS to be used. (From OE-Core rev: ba151faad47e6874b295ebd9699ce154bc4ff741) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/curl/curl/configure_ac.patch11
-rw-r--r--meta/recipes-support/curl/curl_7.26.0.bb7
2 files changed, 17 insertions, 1 deletions
diff --git a/meta/recipes-support/curl/curl/configure_ac.patch b/meta/recipes-support/curl/curl/configure_ac.patch
new file mode 100644
index 0000000000..98d83871f1
--- /dev/null
+++ b/meta/recipes-support/curl/curl/configure_ac.patch
@@ -0,0 +1,11 @@
1--- a/configure.ac
2+++ b/configure.ac
3@@ -281,7 +281,7 @@ dnl ************************************
4
5 CURL_CHECK_COMPILER
6 CURL_SET_COMPILER_BASIC_OPTS
7-CURL_SET_COMPILER_DEBUG_OPTS
8+dnl CURL_SET_COMPILER_DEBUG_OPTS
9 CURL_SET_COMPILER_OPTIMIZE_OPTS
10 CURL_SET_COMPILER_WARNING_OPTS
11
diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
index 9a0e7ce27e..fef247c5d1 100644
--- a/meta/recipes-support/curl/curl_7.26.0.bb
+++ b/meta/recipes-support/curl/curl_7.26.0.bb
@@ -8,11 +8,16 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
8DEPENDS = "zlib gnutls" 8DEPENDS = "zlib gnutls"
9DEPENDS_class-native = "zlib-native openssl-native" 9DEPENDS_class-native = "zlib-native openssl-native"
10DEPENDS_class-nativesdk = "nativesdk-zlib" 10DEPENDS_class-nativesdk = "nativesdk-zlib"
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
14 file://pkgconfig_fix.patch" 14 file://pkgconfig_fix.patch"
15 15
16# curl likes to set -g0 in CFLAGS, so we stop it
17# from mucking around with debug options
18#
19SRC_URI += " file://configure_ac.patch"
20
16SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3" 21SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3"
17SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a" 22SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a"
18 23