From 6a55afa7b8f0cb095e276f5d041eac17c6260c40 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 1 Oct 2019 11:08:32 +0200 Subject: [PATCH] package/kf5/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. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk index ea6aac4ec6..164bad1225 100644 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk @@ -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)) -- 2.30.2