[Midnightbsd-cvs] mports [23385] trunk/devel/qmake5/files/patch-configure: update configure

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 6 10:16:18 EDT 2018


Revision: 23385
          http://svnweb.midnightbsd.org/mports/?rev=23385
Author:   laffer1
Date:     2018-05-06 10:16:18 -0400 (Sun, 06 May 2018)
Log Message:
-----------
update configure

Modified Paths:
--------------
    trunk/devel/qmake5/files/patch-configure

Modified: trunk/devel/qmake5/files/patch-configure
===================================================================
--- trunk/devel/qmake5/files/patch-configure	2018-05-06 14:15:39 UTC (rev 23384)
+++ trunk/devel/qmake5/files/patch-configure	2018-05-06 14:16:18 UTC (rev 23385)
@@ -1,9 +1,12 @@
---- ./configure.orig	2013-10-22 01:49:15.000000000 -0700
-+++ ./configure	2013-11-04 07:40:28.945418565 -0800
-@@ -4194,11 +4194,11 @@
-         fi
-         echo "QMAKESPEC = $adjqmakespec" >> "$mkfile"
-         echo "QT_VERSION = $QT_VERSION" >> "$mkfile"
+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"
@@ -15,11 +18,11 @@
          echo "EXEEXT = $EXEEXT" >> "$mkfile"
          echo "RM_F = rm -f" >> "$mkfile"
          echo "RM_RF = rm -rf" >> "$mkfile"
-@@ -4214,6 +4214,7 @@
- 	    rm "$mkfile.tmp"
+@@ -4138,6 +4138,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then
+             fi
          fi
      done
 +    exit 0
  
-     (cd "$outpath/qmake"; "$MAKE") || exit 2
- fi # Build qmake
+     if [ "$OPT_VERBOSE" = yes ]; then
+         # Show the output of make



More information about the Midnightbsd-cvs mailing list