Remove some uses of oe_filter_out
cover Remove some uses of oe_filter_out
Replace a couple of uses of oe_filter_out() with removes override syntax, which is much clearer and better matches modern style and convention.
Furthermore this allows us to drop two uses of immediate expansion.
The following changes since commit a42229df424552955c0ac62da1063461f97f5938:
openssh: CVE-2016-1907 (2016-01-17 11:32:21 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib joshuagl/filter
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/filter
Joshua Lock (2):
gcc-runtime: switch to removal override syntax to modify CXXFLAGS
uclibc: remove a use of immediate expansion and oe_filter_out ()
meta/recipes-core/uclibc/uclibc.inc | 2 +- meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.5.0
PATCH 1/2 gcc-runtime: switch to removal override syntax to modify CXXFLAGS
The use of immediate expansion can cause issues when trying to override variables, further the removal override syntax is clearer than oe_filter_out () — switch to using removal override syntax instead.
--- meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -1
@@ -1,6 +1,6 @@ require gcc-configure-common.inc -CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" +CXXFLAGS_remove = "-fvisibility-inlines-hidden" EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${includedir}/c++/${BINV} \
Signature · 1 line
2.5.0
Re: [PATCH 1/2] gcc-runtime: switch to removal override syntax to modify CXXFLAGS
Quoted 7 lines · Joshua Lock
The use of immediate expansion can cause issues when trying to override variables, further the removal override syntax is clearer than
oe_filter_out() — switch to using removal override syntax instead.
LGTM
Quoted 26 lines
Signed-off-by Joshua Lock <[email protected]>---
meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-devtools/gcc/gcc-runtime.inc +0
-0@@ -1,6 +1,6 @@require gcc-configure-common.inc
meta/recipes-devtools/gcc/gcc-runtime.inc +1
-1-CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" +CXXFLAGS_remove = "-fvisibility-inlines-hidden"EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${includedir}/c++/${BINV} \--
2.5.0--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 2/2 uclibc: remove a use of immediate expansion and oe_filter_out ()
In reply to Joshua LockThe remove overrides syntax is much clearer here, and more closely matches the preferred style for modern metadata.
--- meta/recipes-core/uclibc/uclibc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/uclibc/uclibc.inc +1 -1
@@ -62,7 +62,7 @@ export V="2" # -O<n> -fno-omit-frame-pointer ends up with GCC ICE on thumb as reported # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860 # -CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}" +CFLAGS_remove_arm = "-fno-omit-frame-pointer" UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" configmangle = '/^KERNEL_HEADERS/d; \
Signature · 1 line
2.5.0
Re: [PATCH 2/2] uclibc: remove a use of immediate expansion and oe_filter_out ()
Quoted 16 lines · Joshua Lock
The remove overrides syntax is much clearer here, and more closely matches the preferred style for modern metadata.
Signed-off-by Joshua Lock <[email protected]>---
meta/recipes-core/uclibc/uclibc.inc | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-core/uclibc/uclibc.inc +0
-0
meta/recipes-core/uclibc/uclibc.inc export V="2" · line 65
Quoted 5 lines
meta/recipes-core/uclibc/uclibc.inc +1
-1@@ -62,7 +62,7 @@ export V="2" # -O<n> -fno-omit-frame-pointer ends up with GCC ICE on thumb as reported # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860 # -CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}" +CFLAGS_remove_arm = "-fno-omit-frame-pointer”
LGTM
Quoted 11 lines
UCLIBC_EXTRA_CFLAGS:= "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}"configmangle = '/^KERNEL_HEADERS/d; \
--
2.5.0--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core