* [Buildroot] [PATCH] pkg-cmake: change sed expression delimiter
@ 2015-09-21 18:57 gustavo.zacarias at free-electrons.com
2015-09-21 19:30 ` Samuel Martin
2015-09-22 14:29 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: gustavo.zacarias at free-electrons.com @ 2015-09-21 18:57 UTC (permalink / raw)
To: buildroot
From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
Switch from : to # since CFLAGS can include :'s spilled in from
BR2_TARGET_OPTIMIZATION, for example:
BR2_TARGET_OPTIMIZATION="-Wl,-rpath,/lib:/usr/lib" would cause the sed
expression to fail thus breaking the build.
Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
---
package/pkg-cmake.mk | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 574eccc..6bc13d4 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -241,12 +241,12 @@ endif
$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
@mkdir -p $(@D)
sed \
- -e 's:@@STAGING_SUBDIR@@:$(call qstrip,$(STAGING_SUBDIR)):' \
- -e 's:@@TARGET_CFLAGS@@:$(call qstrip,$(TARGET_CFLAGS)):' \
- -e 's:@@TARGET_CXXFLAGS@@:$(call qstrip,$(TARGET_CXXFLAGS)):' \
- -e 's:@@TARGET_LDFLAGS@@:$(call qstrip,$(TARGET_LDFLAGS)):' \
- -e 's:@@TARGET_CC_NOCCACHE@@:$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CC_NOCCACHE))):' \
- -e 's:@@TARGET_CXX_NOCCACHE@@:$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX_NOCCACHE))):' \
- -e 's:@@CMAKE_SYSTEM_PROCESSOR@@:$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR)):' \
+ -e 's#@@STAGING_SUBDIR@@#$(call qstrip,$(STAGING_SUBDIR))#' \
+ -e 's#@@TARGET_CFLAGS@@#$(call qstrip,$(TARGET_CFLAGS))#' \
+ -e 's#@@TARGET_CXXFLAGS@@#$(call qstrip,$(TARGET_CXXFLAGS))#' \
+ -e 's#@@TARGET_LDFLAGS@@#$(call qstrip,$(TARGET_LDFLAGS))#' \
+ -e 's#@@TARGET_CC_NOCCACHE@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CC_NOCCACHE)))#' \
+ -e 's#@@TARGET_CXX_NOCCACHE@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX_NOCCACHE)))#' \
+ -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \
$(TOPDIR)/support/misc/toolchainfile.cmake.in \
> $@
--
2.4.9
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] pkg-cmake: change sed expression delimiter
2015-09-21 18:57 [Buildroot] [PATCH] pkg-cmake: change sed expression delimiter gustavo.zacarias at free-electrons.com
@ 2015-09-21 19:30 ` Samuel Martin
2015-09-22 14:29 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Samuel Martin @ 2015-09-21 19:30 UTC (permalink / raw)
To: buildroot
On Mon, Sep 21, 2015 at 8:57 PM, <gustavo.zacarias@free-electrons.com> wrote:
> From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
>
> Switch from : to # since CFLAGS can include :'s spilled in from
> BR2_TARGET_OPTIMIZATION, for example:
>
> BR2_TARGET_OPTIMIZATION="-Wl,-rpath,/lib:/usr/lib" would cause the sed
> expression to fail thus breaking the build.
>
> Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Regards,
--
Samuel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] pkg-cmake: change sed expression delimiter
2015-09-21 18:57 [Buildroot] [PATCH] pkg-cmake: change sed expression delimiter gustavo.zacarias at free-electrons.com
2015-09-21 19:30 ` Samuel Martin
@ 2015-09-22 14:29 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2015-09-22 14:29 UTC (permalink / raw)
To: buildroot
Dear gustavo.zacarias at free-electrons.com,
On Mon, 21 Sep 2015 15:57:36 -0300, gustavo.zacarias at free-electrons.com
wrote:
> From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
>
> Switch from : to # since CFLAGS can include :'s spilled in from
> BR2_TARGET_OPTIMIZATION, for example:
>
> BR2_TARGET_OPTIMIZATION="-Wl,-rpath,/lib:/usr/lib" would cause the sed
> expression to fail thus breaking the build.
>
> Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
> ---
> package/pkg-cmake.mk | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-22 14:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 18:57 [Buildroot] [PATCH] pkg-cmake: change sed expression delimiter gustavo.zacarias at free-electrons.com
2015-09-21 19:30 ` Samuel Martin
2015-09-22 14:29 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox