Patchwork curl: eliminate forced setting of -g0 when compiling

login
register
mail settings
Submitter Joe Slater
Date Nov. 15, 2012, 7:17 p.m.
Message ID <1353007070-29984-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/39133/
State Accepted
Commit d48d44e25cc0dcc955e9d4e93d8164f7cbc9f9c0
Headers show

Comments

Joe Slater - Nov. 15, 2012, 7:17 p.m.
Do not invoke CURL_SET_COMPILER_DEBUG_OPTS in configure.ac.
This will allow debug options set in our CFLAGS to be
used.

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 meta/recipes-support/curl/curl/configure_ac.patch |   11 +++++++++++
 meta/recipes-support/curl/curl_7.26.0.bb          |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-support/curl/curl/configure_ac.patch
Saul Wold - Dec. 11, 2012, 12:04 a.m.
On 11/15/2012 11:17 AM, Joe Slater wrote:
> Do not invoke CURL_SET_COMPILER_DEBUG_OPTS in configure.ac.
> This will allow debug options set in our CFLAGS to be
> used.
>
> Signed-off-by: Joe Slater <jslater@windriver.com>
> ---
>   meta/recipes-support/curl/curl/configure_ac.patch |   11 +++++++++++
>   meta/recipes-support/curl/curl_7.26.0.bb          |    7 ++++++-
>   2 files changed, 17 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-support/curl/curl/configure_ac.patch
>
> 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 0000000..98d8387
> --- /dev/null
> +++ b/meta/recipes-support/curl/curl/configure_ac.patch

This patch slipped in without me catching it needed a header.

Please add Upstream-Status and Signed-off-by

http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

Thanks
	Sau!

> @@ -0,0 +1,11 @@
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -281,7 +281,7 @@ dnl ************************************
> +
> + CURL_CHECK_COMPILER
> + CURL_SET_COMPILER_BASIC_OPTS
> +-CURL_SET_COMPILER_DEBUG_OPTS
> ++dnl CURL_SET_COMPILER_DEBUG_OPTS
> + CURL_SET_COMPILER_OPTIMIZE_OPTS
> + CURL_SET_COMPILER_WARNING_OPTS
> +
> diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
> index 9a0e7ce..fef247c 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
>   DEPENDS = "zlib gnutls"
>   DEPENDS_class-native = "zlib-native openssl-native"
>   DEPENDS_class-nativesdk = "nativesdk-zlib"
> -PR = "r1"
> +PR = "r2"
>
>   SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
>              file://pkgconfig_fix.patch"
>
> +# curl likes to set -g0 in CFLAGS, so we stop it
> +# from mucking around with debug options
> +#
> +SRC_URI += " file://configure_ac.patch"
> +
>   SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3"
>   SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a"
>
>

Patch

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 0000000..98d8387
--- /dev/null
+++ b/meta/recipes-support/curl/curl/configure_ac.patch
@@ -0,0 +1,11 @@ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -281,7 +281,7 @@ dnl ************************************
+ 
+ CURL_CHECK_COMPILER
+ CURL_SET_COMPILER_BASIC_OPTS
+-CURL_SET_COMPILER_DEBUG_OPTS
++dnl CURL_SET_COMPILER_DEBUG_OPTS
+ CURL_SET_COMPILER_OPTIMIZE_OPTS
+ CURL_SET_COMPILER_WARNING_OPTS
+ 
diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
index 9a0e7ce..fef247c 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
 DEPENDS = "zlib gnutls"
 DEPENDS_class-native = "zlib-native openssl-native"
 DEPENDS_class-nativesdk = "nativesdk-zlib"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://pkgconfig_fix.patch"
 
+# curl likes to set -g0 in CFLAGS, so we stop it
+# from mucking around with debug options
+#
+SRC_URI += " file://configure_ac.patch"
+
 SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3"
 SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a"