aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-support/c-ares
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2016-07-18 09:02:47 +0100
committerJoe MacDonald <joe_macdonald@mentor.com>2016-08-05 09:06:49 -0400
commit6204c135e9d69bdf179320b8e292df4ee7afb0aa (patch)
tree1fed73813e0a115f6fc063954c0dfb194b5c32ab /meta-networking/recipes-support/c-ares
parent53794a7c57c338e8474a9c90d804723e3a3cb0d4 (diff)
downloadmeta-openembedded-6204c135e9d69bdf179320b8e292df4ee7afb0aa.tar.gz
c-ares: use our compilation flags
If not requested otherwise as ./configure option, c-ares will strip any -g from CFLAGS / CPPFLAGS and add -g0 instead, disabling all debug info. Similarly, it will try to enable optimisation (but bail out since in that case it honors an existing -O in CFLAGS / CPPFLAGS) Since we want to control code generation, patch out the code mangling -g (and -O for consistency). Alternatively, if we were to pass --enable-debug to ./configure, c-ares would at the same time assume that we don't want optimisation anymore. Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/c-ares')
-rw-r--r--meta-networking/recipes-support/c-ares/c-ares/0001-configure.ac-don-t-override-passed-cflags.patch26
-rw-r--r--meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb4
2 files changed, 29 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/c-ares/c-ares/0001-configure.ac-don-t-override-passed-cflags.patch b/meta-networking/recipes-support/c-ares/c-ares/0001-configure.ac-don-t-override-passed-cflags.patch
new file mode 100644
index 0000000000..10fad4e941
--- /dev/null
+++ b/meta-networking/recipes-support/c-ares/c-ares/0001-configure.ac-don-t-override-passed-cflags.patch
@@ -0,0 +1,26 @@
+From 2a7236d2a7bb9c3d3c3f44ebf59404bf7134fcb3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
+Date: Tue, 12 Apr 2016 11:37:28 +0100
+Subject: [PATCH] configure.ac: don't override passed cflags
+
+We are controlling debug and optimiser flags from OE
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5c02450..3cf9fcd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -147,8 +147,6 @@ dnl **********************************************************************
+
+ CARES_CHECK_COMPILER
+ CARES_SET_COMPILER_BASIC_OPTS
+-CARES_SET_COMPILER_DEBUG_OPTS
+-CARES_SET_COMPILER_OPTIMIZE_OPTS
+ CARES_SET_COMPILER_WARNING_OPTS
+
+ if test "$compiler_id" = "INTEL_UNIX_C"; then
+--
+2.8.0.rc3
+
diff --git a/meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb b/meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb
index 2f72ab495c..c98be7d99a 100644
--- a/meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb
+++ b/meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb
@@ -6,7 +6,9 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://ares_init.c;beginline=1;endline=3;md5=53f5ecf4c22c37cf1ddd1ef8f8eccce0"
-SRC_URI = "http://c-ares.haxx.se/download/${BP}.tar.gz"
+SRC_URI = "http://c-ares.haxx.se/download/${BP}.tar.gz \
+ file://0001-configure.ac-don-t-override-passed-cflags.patch \
+"
SRC_URI[md5sum] = "d5c6d522cfc54bb6f215a0b7912d46be"
SRC_URI[sha256sum] = "b3612e6617d9682928a1d50c1040de4db6519f977f0b25d40cf1b632900b3efd"