Patchwork chkconfig: pass CFLAGS to Makefile

login
register
mail settings
Submitter Joe Slater
Date Oct. 9, 2012, 8:53 p.m.
Message ID <1349815996-3767-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/38035/
State New
Headers show

Comments

Joe Slater - Oct. 9, 2012, 8:53 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 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Mark Hatle - Oct. 9, 2012, 9:05 p.m.
On 10/9/12 3:53 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 |    5 ++++-
>   1 files changed, 4 insertions(+), 1 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..a9cf268 100644
> --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> +++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> @@ -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
>

This can potentially impact what was built, so you need to update the PR.

Otherwise looks find.

--Mark

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..a9cf268 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -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