Skip to contentSkip to conversation

package/kf5-kcoreaddons: make passing CXXFLAGS to cmake clearer

PATCH New Giulio Benetti 2 participants 2 messages Oct 1, 2019 – Oct 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/kf5-kcoreaddons: make passing CXXFLAGS to cmake clearer

Better to keep final assignment to *_CONF_OPTS after all assignements to KF5_KCOREADDONS_CXXFLAGS have been done. So move _CONF_OPTS assignment after -latomic assignment.

---
 package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +2 -1
index ea6aac4ec6..164bad1225 100644
@@ -14,10 +14,11 @@ KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools
 KF5_KCOREADDONS_INSTALL_STAGING = YES
 
 KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS)
-KF5_KCOREADDONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCOREADDONS_CXXFLAGS)"
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 KF5_KCOREADDONS_CXXFLAGS += -latomic
 endif
 
+KF5_KCOREADDONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCOREADDONS_CXXFLAGS)"
+
 $(eval $(cmake-package))
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/kf5-kcoreaddons: make passing CXXFLAGS to cmake clearer

Quoted 8 lines · On Tue, 1 Oct 2019 11:08:32 +0200 Giulio Benetti…

Better to keep final assignment to *_CONF_OPTS after all assignements to KF5_KCOREADDONS_CXXFLAGS have been done. So move _CONF_OPTS assignment after -latomic assignment.

---
 package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com