summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2014-02-04 15:10:03 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-02-04 15:12:00 +0100
commit24badfe11024ef52ba950ac13ad239c9064e867e (patch)
tree4613a3cf92c7e6b0376a4415899a7b9cff46d97d
parentde13e31a165268e030018bb6d168637303a65802 (diff)
downloadbuildroot-24badfe11024ef52ba950ac13ad239c9064e867e.tar.gz
buildroot-24badfe11024ef52ba950ac13ad239c9064e867e.zip
qt5: Rename BUILDROOT_COMPILER_C{,XX}FLAGS to BR_COMPILER_C{,XX}FLAGS
No functional change, but internal variables should be name BR_foo, not BUILDROOT_foo (I think ..). Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/qt5/qt5base/qt5base-0002-mkspecs-files.patch4
-rw-r--r--package/qt5/qt5base/qt5base.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
index 3fddeac41a..06436b4a42 100644
--- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
+++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch
@@ -18,8 +18,8 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
+include(../common/linux_device_pre.conf)
+
+#modifications to gcc-base.conf
-+QMAKE_CFLAGS += $${BUILDROOT_COMPILER_CFLAGS}
-+QMAKE_CXXFLAGS += $${BUILDROOT_COMPILER_CXXFLAGS}
++QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS}
++QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS}
+QMAKE_CXXFLAGS_RELEASE += -O3
+
+QMAKE_LIBS += -lrt -lpthread -ldl
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index fcfad4e1c8..618251eb52 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -169,8 +169,8 @@ define QT5BASE_CONFIGURE_CMDS
-nomake tests \
-device buildroot \
-device-option CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
- -device-option BUILDROOT_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \
- -device-option BUILDROOT_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \
+ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \
+ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \
-device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \
-no-c++11 \
$(QT5BASE_CONFIGURE_OPTS) \
OpenPOWER on IntegriCloud