Patchwork [v2] chkconfig: pass CFLAGS to Makefile

login
register
mail settings
Submitter Joe Slater
Date Oct. 10, 2012, 10:16 p.m.
Message ID <1349907403-11447-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/38067/
State New
Headers show

Comments

Joe Slater - Oct. 10, 2012, 10:16 p.m.
The environment CFLAGS is not used by the chkconfig
Makefile, so debug and optimization options are ignored.
So, we use RPM_OPT_FLAGS to pass CFLAGS into Makefile.

Upstream-Status:  Inappropriate [configuration]

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 .../recipes-extended/chkconfig/chkconfig_1.3.58.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Saul Wold - Oct. 18, 2012, 8:12 p.m.
On 10/10/2012 03:16 PM, Joe Slater wrote:
> The environment CFLAGS is not used by the chkconfig
> Makefile, so debug and optimization options are ignored.
> So, we use RPM_OPT_FLAGS to pass CFLAGS into Makefile.
>
> Upstream-Status:  Inappropriate [configuration]
>
> Signed-off-by: Joe Slater <jslater@windriver.com>
> ---
>   .../recipes-extended/chkconfig/chkconfig_1.3.58.bb |    7 +++++--
>   1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> index 17987a6..a27a4ba 100644
> --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> +++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
>
>   DEPENDS = "libnewt popt"
>
> -PR = "r1"
> +PR = "r2"
>
>   SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
>
> @@ -21,7 +21,10 @@ SRC_URI[sha256sum] = "18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f182712
>
>   inherit autotools gettext
>
> -EXTRA_OEMAKE += 'MANDIR="${mandir}" BINDIR="${base_sbindir}" SBINDIR="${sbindir}"'
> +# Makefile uses RPM_OPT_fLAGS to construct CFLAGS
> +#
> +EXTRA_OEMAKE += 'RPM_OPT_FLAGS="${CFLAGS}" MANDIR="${mandir}" \
> +                 BINDIR="${base_sbindir}" SBINDIR="${sbindir}"'
>
>   do_install_append() {
>       mkdir -p ${D}/etc/chkconfig.d
>
Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index 17987a6..a27a4ba 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -12,7 +12,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
 DEPENDS = "libnewt popt"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
 
@@ -21,7 +21,10 @@  SRC_URI[sha256sum] = "18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f182712
 
 inherit autotools gettext
 
-EXTRA_OEMAKE += 'MANDIR="${mandir}" BINDIR="${base_sbindir}" SBINDIR="${sbindir}"'
+# Makefile uses RPM_OPT_fLAGS to construct CFLAGS
+#
+EXTRA_OEMAKE += 'RPM_OPT_FLAGS="${CFLAGS}" MANDIR="${mandir}" \
+                 BINDIR="${base_sbindir}" SBINDIR="${sbindir}"'
 
 do_install_append() {
     mkdir -p ${D}/etc/chkconfig.d