mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

Partly revert the previous mkspec changes by using the upstream fix instead.

Browse Source 
Talking to fluffy@ on IRC, I found out the hard way that my commit
0ba35fd5a81df57fb0f943c3dddd35d43ebc3383 has not been included in Qt
4.8.2, so things were pretty much borked when one tried to use
non-base gcc.

Instead of changing the behavior of g++-base.conf and setting
QMAKE_{CC,CXX} in "leaf" mkspecs, my upstream commit simply sets these
values after including g++-base.conf where needed (ie. in the
freebsd-g++46 mkspec, where we use gcc46 and g++46).

Bump PORTREVISION once again, sorry for the hassle.
This commit is contained in:
Raphael Kubo da Costa 2012-06-12 15:44:16 +00:00
parent cb45a28090
commit bc010169fe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=299117
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/qmake4/Makefile
View File

@ -6,8 +6,8 @@
# $FreeBSD$
PORTNAME= qmake
PORTREVISION= 2
DISTVERSION= ${QT4_VERSION}
PORTREVISION= 3
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
@ -54,7 +54,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
# FIXME: This is ugly
@${RM} ${WRKSRC}/../mkspecs/common/*.orig
@${RM} ${WRKSRC}/../mkspecs/freebsd-g++/*.orig
@${RM} ${WRKSRC}/../mkspecs/freebsd-g++46/*.orig

47
devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
View File

@ -1,13 +1,8 @@
--- ../mkspecs/freebsd-g++/qmake.conf.old 2011-09-17 01:02:43.000000000 -0300
+++ ../mkspecs/freebsd-g++/qmake.conf 2011-09-17 00:23:09.000000000 -0300
@@ -12,9 +12,13 @@
@@ -13,8 +13,8 @@
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
+QMAKE_CC = gcc
+
+QMAKE_CXX = g++
+
# Addon software goes into /usr/local on the BSDs, by default we will look there
-QMAKE_INCDIR = /usr/local/include
-QMAKE_LIBDIR = /usr/local/lib
@ -18,9 +13,14 @@
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
--- ../mkspecs/freebsd-g++46/qmake.conf.old 2011-09-17 01:03:00.000000000 -0300
+++ ../mkspecs/freebsd-g++46/qmake.conf 2011-09-17 00:23:41.000000000 -0300
@@ -37,8 +37,8 @@
@@ -12,13 +12,9 @@
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
-QMAKE_CC = gcc46
-
-QMAKE_CXX = g++46
-
# Addon software goes into /usr/local on the BSDs, by default we will look there
-QMAKE_INCDIR = /usr/local/include
-QMAKE_LIBDIR = /usr/local/lib
@ -29,21 +29,18 @@
QMAKE_INCDIR_X11 = /usr/X11R6/include
QMAKE_LIBDIR_X11 = /usr/X11R6/lib
QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
--- ../mkspecs/common/g++-base.conf.old 2012-04-27 06:45:52.000000000 +1100
+++ ../mkspecs/common/g++-base.conf 2012-06-07 22:39:16.000000000 +1100
@@ -8,15 +8,11 @@
# you can use the manual test in tests/manual/mkspecs.
#
-QMAKE_CC = gcc
-
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
-QMAKE_CXX = g++
-
QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX
@@ -55,4 +51,14 @@
include(../common/unix.conf)
include(../common/gcc-base-unix.conf)
include(../common/g++-unix.conf)
+
+# Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX
+# to gcc and g++, respectively.
+QMAKE_CC = gcc46
+QMAKE_CXX = g++46
+QMAKE_LINK_C = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
load(qt_config)