From 1c63aa6e4135642902484468913fb9e575b39b1a Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Sat, 12 Feb 2011 19:56:38 +0000 Subject: [PATCH] make QMAKE_LIBS modifiable from within OpenWrt Makefiles invoking qmake SVN-Revision: 25489 --- Xorg/lib/qt4/files/qmake.mk | 1 + Xorg/lib/qt4/files/qws-qmake.conf | 1 + Xorg/lib/qt4/files/x11-qmake.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/Xorg/lib/qt4/files/qmake.mk b/Xorg/lib/qt4/files/qmake.mk index 8413f584a..96ec2a7e8 100644 --- a/Xorg/lib/qt4/files/qmake.mk +++ b/Xorg/lib/qt4/files/qmake.mk @@ -22,6 +22,7 @@ define Build/Configure/Qmake TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ TARGET_INCDIRS="$(TARGET_INCDIRS)" \ TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ + TARGET_LIBS="$(TARGET_LIBS)" \ STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ STAGING_DIR="$(STAGING_DIR)" \ qmake \ diff --git a/Xorg/lib/qt4/files/qws-qmake.conf b/Xorg/lib/qt4/files/qws-qmake.conf index cec834c2b..5e317dcd7 100644 --- a/Xorg/lib/qt4/files/qws-qmake.conf +++ b/Xorg/lib/qt4/files/qws-qmake.conf @@ -21,6 +21,7 @@ QMAKE_CFLAGS = $$(TARGET_CFLAGS) QMAKE_CXXFLAGS = $$(TARGET_CFLAGS) QMAKE_LINK = $$(TARGET_CXX) QMAKE_LINK_C = $$(TARGET_CC) +QMAKE_LIBS = $$(TARGET_LIBS) QMAKE_LFLAGS = $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options #unset vars which would intefere with vars/flags passed over by OpenWrt diff --git a/Xorg/lib/qt4/files/x11-qmake.conf b/Xorg/lib/qt4/files/x11-qmake.conf index 48c754199..b5a49c5f8 100644 --- a/Xorg/lib/qt4/files/x11-qmake.conf +++ b/Xorg/lib/qt4/files/x11-qmake.conf @@ -26,6 +26,7 @@ QMAKE_CFLAGS = $$(TARGET_CFLAGS) QMAKE_CXXFLAGS = $$(TARGET_CFLAGS) QMAKE_LINK = $$(TARGET_CXX) QMAKE_LINK_C = $$(TARGET_CC) +QMAKE_LIBS = $$(TARGET_LIBS) QMAKE_LFLAGS = $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options #unset vars which would intefere with vars/flags passed over by OpenWrt -- 2.30.2