diff options
Diffstat (limited to 'devel/qmake5/files')
| -rw-r--r-- | devel/qmake5/files/patch-configure | 28 | ||||
| -rw-r--r-- | devel/qmake5/files/patch-mkspecs__features__qt_functions.prf | 16 |
2 files changed, 0 insertions, 44 deletions
diff --git a/devel/qmake5/files/patch-configure b/devel/qmake5/files/patch-configure deleted file mode 100644 index 575912c5dad4..000000000000 --- a/devel/qmake5/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ -Make sure only qmake is built, as the rest of Qt is built -in other ports. - ---- configure.orig 2016-08-24 08:18:37 UTC -+++ configure -@@ -4115,11 +4115,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then - echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" - echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" - echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" -- echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile" -- echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" -+ echo "EXTRA_CFLAGS = $EXTRA_CFLAGS $CFLAGS" >> "$mkfile" -+ echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS $CXXFLAGS" >> "$mkfile" - echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile" - echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile" -- echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile" -+ echo "LFLAGS = $EXTRA_LFLAGS $LDFLAGS" >> "$mkfile" - echo "EXEEXT = $EXEEXT" >> "$mkfile" - echo "RM_F = rm -f" >> "$mkfile" - echo "RM_RF = rm -rf" >> "$mkfile" -@@ -4138,6 +4138,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then - fi - fi - done -+ exit 0 - - if [ "$OPT_VERBOSE" = yes ]; then - # Show the output of make diff --git a/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf b/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf deleted file mode 100644 index 7a1529de8699..000000000000 --- a/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf +++ /dev/null @@ -1,16 +0,0 @@ -To setup a tool, qtPrepareTool() doesn't fallback anymore (compared to Qt4) to -the build directory (/get paths), but relies instead on QT_TOOL.* variables set -before in the configure stage, which our split configuration doesn't generate. -With this patch, it's back to the previous behavior (which, by the way, has no -effect on anything but Qt builds). ---- ./mkspecs/features/qt_functions.prf.orig 2013-10-22 01:49:28.000000000 -0700 -+++ ./mkspecs/features/qt_functions.prf 2013-11-04 07:50:44.835414343 -0800 -@@ -193,7 +193,7 @@ - defineTest(qtPrepareTool) { - cmd = $$eval(QT_TOOL.$${2}.binary) - isEmpty(cmd) { -- cmd = $$[QT_HOST_BINS]/$$2 -+ cmd = $$[QT_HOST_BINS/get]/$$2 - exists($${cmd}.pl) { - cmd = perl -w $$system_path($${cmd}.pl) - } else: contains(QMAKE_HOST.os, Windows) { |