Thu Jul 21 17:07:11 2011 UTC ()
Don't enumerate evil. Pass down -L* and -l* only from LDFLAGS.


(joerg)
diff -r1.73 -r1.74 pkgsrc/x11/qt3-libs/Makefile.common
diff -r1.26 -r1.27 pkgsrc/x11/qt4-libs/Makefile.common
cvs diff -r1.73 -r1.74 pkgsrc/x11/qt3-libs/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/x11/qt3-libs/Attic/Makefile.common 2011/03/06 16:10:22 1.73
+++ pkgsrc/x11/qt3-libs/Attic/Makefile.common 2011/07/21 17:07:11 1.74
@@ -1,152 +1,152 @@ @@ -1,152 +1,152 @@
1# $NetBSD: Makefile.common,v 1.73 2011/03/06 16:10:22 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.74 2011/07/21 17:07:11 joerg Exp $
2# used by x11/qt3-docs/Makefile 2# used by x11/qt3-docs/Makefile
3# used by x11/qt3-libs/Makefile 3# used by x11/qt3-libs/Makefile
4# used by x11/qt3-tools/Makefile 4# used by x11/qt3-tools/Makefile
5 5
6DISTNAME= qt-x11-free-${QTVERSION} 6DISTNAME= qt-x11-free-${QTVERSION}
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ 8MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
9 ftp://ftp.bero.org/pub/qt/source/ \ 9 ftp://ftp.bero.org/pub/qt/source/ \
10 http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/ 10 http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13.include "../../x11/qt3/Makefile.common" 13.include "../../x11/qt3/Makefile.common"
14 14
15DISTINFO_FILE= ${.CURDIR}/../../x11/qt3-libs/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../x11/qt3-libs/distinfo
16FILESDIR= ${.CURDIR}/../../x11/qt3-libs/files 16FILESDIR= ${.CURDIR}/../../x11/qt3-libs/files
17PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches 17PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches
18 18
19HAS_CONFIGURE= yes 19HAS_CONFIGURE= yes
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_LIBTOOL= yes 22USE_LIBTOOL= yes
23 23
24QTPREFIX= ${PREFIX}/qt3 24QTPREFIX= ${PREFIX}/qt3
25 25
26CONFIGURE_ARGS+= -prefix ${QTPREFIX} 26CONFIGURE_ARGS+= -prefix ${QTPREFIX}
27CONFIGURE_ARGS+= -shared -sm -thread \ 27CONFIGURE_ARGS+= -shared -sm -thread \
28 -system-zlib -system-libpng \ 28 -system-zlib -system-libpng \
29 -system-libmng -system-libjpeg \ 29 -system-libmng -system-libjpeg \
30 ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//:S/-dylib_file//:C/.*\.dylib\:.*\.dylib//} 30 ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
31CONFIGURE_ARGS+= -qt-gif # qt3 does not write compressed GIFs 31CONFIGURE_ARGS+= -qt-gif # qt3 does not write compressed GIFs
32 32
33CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance 33CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
34 34
35LIBQT?= -lqt-mt 35LIBQT?= -lqt-mt
36 36
37MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 37MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
38MAKE_ENV+= QTDIR=${WRKSRC:Q} 38MAKE_ENV+= QTDIR=${WRKSRC:Q}
39 39
40# avoid creating a .qt directory in the users home 40# avoid creating a .qt directory in the users home
41# directory 41# directory
42SCRIPTS_ENV+= HOME="${WRKDIR}" 42SCRIPTS_ENV+= HOME="${WRKDIR}"
43 43
44.include "../../mk/compiler.mk" 44.include "../../mk/compiler.mk"
45 45
46.if !empty(CC_VERSION:Mgcc*) 46.if !empty(CC_VERSION:Mgcc*)
47CONFIGURE_ARGS+= -no-g++-exceptions 47CONFIGURE_ARGS+= -no-g++-exceptions
48.endif 48.endif
49 49
50.if ${OPSYS} == "SunOS" 50.if ${OPSYS} == "SunOS"
51. if !empty(CC_VERSION:Mgcc*) 51. if !empty(CC_VERSION:Mgcc*)
52CONFIGURE_ARGS+= -platform solaris-g++ 52CONFIGURE_ARGS+= -platform solaris-g++
53. else 53. else
54CONFIGURE_ARGS+= -platform solaris-cc 54CONFIGURE_ARGS+= -platform solaris-cc
55. endif 55. endif
56SYS_LIBS= -lresolv -lsocket -lnsl -lrt 56SYS_LIBS= -lresolv -lsocket -lnsl -lrt
57.elif ${OPSYS} == "HPUX" 57.elif ${OPSYS} == "HPUX"
58. if !empty(CC_VERSION:Mgcc*) 58. if !empty(CC_VERSION:Mgcc*)
59CONFIGURE_ARGS+= -platform hpux-g++ 59CONFIGURE_ARGS+= -platform hpux-g++
60. else 60. else
61CONFIGURE_ARGS+= -platform hpux-acc 61CONFIGURE_ARGS+= -platform hpux-acc
62. endif 62. endif
63.elif ${OPSYS} == "Interix" 63.elif ${OPSYS} == "Interix"
64CONFIGURE_ARGS+= -platform interix-g++ 64CONFIGURE_ARGS+= -platform interix-g++
65CFLAGS+= -I/usr/local/include/bind 65CFLAGS+= -I/usr/local/include/bind
66LDFLAGS+= -L/usr/local/lib/bind -lbind 66LDFLAGS+= -L/usr/local/lib/bind -lbind
67BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 67BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
68SYS_LIBS= -lbind -ldb -ldl 68SYS_LIBS= -lbind -ldb -ldl
69.elif ${OPSYS} == "DragonFly" 69.elif ${OPSYS} == "DragonFly"
70CONFIGURE_ARGS+= -platform freebsd-g++ 70CONFIGURE_ARGS+= -platform freebsd-g++
71.elif ${OPSYS} == "Darwin" 71.elif ${OPSYS} == "Darwin"
72QMAKE_RANLIB= ${RANLIB} 72QMAKE_RANLIB= ${RANLIB}
73. if exists(/usr/lib/libresolv.dylib) 73. if exists(/usr/lib/libresolv.dylib)
74LDFLAGS+= -lresolv 74LDFLAGS+= -lresolv
75. endif 75. endif
76.endif 76.endif
77 77
78CONFIGURE_ARGS+= -verbose 78CONFIGURE_ARGS+= -verbose
79 79
80QMAKE_RANLIB?= ${TRUE} 80QMAKE_RANLIB?= ${TRUE}
81 81
82.if ${X11_TYPE} != "native" 82.if ${X11_TYPE} != "native"
83.include "../../x11/libXinerama/buildlink3.mk" 83.include "../../x11/libXinerama/buildlink3.mk"
84.elif !exists(${X11BASE}/lib/libXinerama.so) && \ 84.elif !exists(${X11BASE}/lib/libXinerama.so) && \
85 !exists(${X11BASE}/lib/libXinerama.dylib) 85 !exists(${X11BASE}/lib/libXinerama.dylib)
86CONFIGURE_ARGS+= -no-xinerama 86CONFIGURE_ARGS+= -no-xinerama
87.endif 87.endif
88 88
89PKG_OPTIONS_VAR= PKG_OPTIONS.qt3 89PKG_OPTIONS_VAR= PKG_OPTIONS.qt3
90PKG_SUPPORTED_OPTIONS= cups debug 90PKG_SUPPORTED_OPTIONS= cups debug
91PKG_SUPPORTED_OPTIONS+= inet6 91PKG_SUPPORTED_OPTIONS+= inet6
92 92
93.include "../../mk/bsd.options.mk" 93.include "../../mk/bsd.options.mk"
94 94
95.if !empty(PKG_OPTIONS:Minet6) 95.if !empty(PKG_OPTIONS:Minet6)
96CONFIGURE_ARGS+= -ipv6 96CONFIGURE_ARGS+= -ipv6
97.else 97.else
98CONFIGURE_ARGS+= -no-ipv6 98CONFIGURE_ARGS+= -no-ipv6
99.endif 99.endif
100 100
101.if !empty(PKG_OPTIONS:Mcups) 101.if !empty(PKG_OPTIONS:Mcups)
102. include "../../print/cups/buildlink3.mk" 102. include "../../print/cups/buildlink3.mk"
103CONFIGURE_ARGS+= -cups 103CONFIGURE_ARGS+= -cups
104.else 104.else
105CONFIGURE_ARGS+= -no-cups 105CONFIGURE_ARGS+= -no-cups
106.endif 106.endif
107 107
108.if !empty(PKG_OPTIONS:Mdebug) 108.if !empty(PKG_OPTIONS:Mdebug)
109CC+= -ggdb 109CC+= -ggdb
110CXX+= -ggdb 110CXX+= -ggdb
111CONFIGURE_ARGS+= --debug 111CONFIGURE_ARGS+= --debug
112INSTALL_UNSTRIPPED= yes 112INSTALL_UNSTRIPPED= yes
113.endif 113.endif
114 114
115 115
116# 116#
117# Reverse the change to how templates are handled made between 3.0.4 117# Reverse the change to how templates are handled made between 3.0.4
118# and 3.0.5 for older toolchains. Removing inline for newer toolchains 118# and 3.0.5 for older toolchains. Removing inline for newer toolchains
119# produces smaller code. Removing inline for older toolchains prod- 119# produces smaller code. Removing inline for older toolchains prod-
120# uces buggy code. 120# uces buggy code.
121# 121#
122 122
123.if !empty(CC_VERSION:Mgcc-2.8*) 123.if !empty(CC_VERSION:Mgcc-2.8*)
124CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline 124CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
125.endif 125.endif
126 126
127pre-configure: 127pre-configure:
128 ${SED} \ 128 ${SED} \
129 -e 's:@LOCALBASE@:${LOCALBASE}:g' \ 129 -e 's:@LOCALBASE@:${LOCALBASE}:g' \
130 -e 's:@X11BASE@:${X11BASE}:g' \ 130 -e 's:@X11BASE@:${X11BASE}:g' \
131 -e 's:@X11PREFIX@:${X11PREFIX}:g' \ 131 -e 's:@X11PREFIX@:${X11PREFIX}:g' \
132 -e 's:@LIBTOOL@:${LIBTOOL}:g' \ 132 -e 's:@LIBTOOL@:${LIBTOOL}:g' \
133 -e 's:@CC@:${CC}:g' \ 133 -e 's:@CC@:${CC}:g' \
134 -e 's:@CXX@:${CXX}:g' \ 134 -e 's:@CXX@:${CXX}:g' \
135 -e 's:@LDFLAGS@:${LDFLAGS:S/:/\\:/g}:g' \ 135 -e 's:@LDFLAGS@:${LDFLAGS:S/:/\\:/g}:g' \
136 -e 's:@CFLAGS@:${CFLAGS}:g' \ 136 -e 's:@CFLAGS@:${CFLAGS}:g' \
137 -e 's:@CXXFLAGS@:${CXXFLAGS}:g' \ 137 -e 's:@CXXFLAGS@:${CXXFLAGS}:g' \
138 -e 's:@SYS_LIBS@:${SYS_LIBS}:g' \ 138 -e 's:@SYS_LIBS@:${SYS_LIBS}:g' \
139 -e 's:@LEX@:${LEX}:g' \ 139 -e 's:@LEX@:${LEX}:g' \
140 -e 's:@YACC@:${TOOLS_CMDLINE_YACC}:g' \ 140 -e 's:@YACC@:${TOOLS_CMDLINE_YACC}:g' \
141 -e 's:@AR@:${AR}:g' \ 141 -e 's:@AR@:${AR}:g' \
142 -e 's:@MKDIR@:${MKDIR}:g' \ 142 -e 's:@MKDIR@:${MKDIR}:g' \
143 -e 's:@LIBQT@:${LIBQT}:g' \ 143 -e 's:@LIBQT@:${LIBQT}:g' \
144 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \ 144 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \
145 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \ 145 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \
146 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ 146 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
147 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB}:g' \ 147 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB}:g' \
148 ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf 148 ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
149 for dir in ${WRKSRC}/mkspecs/*; do \ 149 for dir in ${WRKSRC}/mkspecs/*; do \
150 ${CP} ${WRKSRC}/qmake.conf $${dir}; \ 150 ${CP} ${WRKSRC}/qmake.conf $${dir}; \
151 ${RM} -f $${dir}/*.orig; \ 151 ${RM} -f $${dir}/*.orig; \
152 done 152 done
cvs diff -r1.26 -r1.27 pkgsrc/x11/qt4-libs/Makefile.common (switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2011/05/16 22:13:46 1.26
+++ pkgsrc/x11/qt4-libs/Makefile.common 2011/07/21 17:07:11 1.27
@@ -1,165 +1,164 @@ @@ -1,165 +1,164 @@
1# $NetBSD: Makefile.common,v 1.26 2011/05/16 22:13:46 cheusov Exp $ 1# $NetBSD: Makefile.common,v 1.27 2011/07/21 17:07:11 joerg Exp $
2# used by x11/qt4-docs/Makefile 2# used by x11/qt4-docs/Makefile
3# used by x11/qt4-libs/Makefile 3# used by x11/qt4-libs/Makefile
4# used by x11/qt4-mng/Makefile 4# used by x11/qt4-mng/Makefile
5# used by x11/qt4-mysql/Makefile 5# used by x11/qt4-mysql/Makefile
6# used by x11/qt4-pgsql/Makefile 6# used by x11/qt4-pgsql/Makefile
7# used by x11/qt4-qdbus/Makefile 7# used by x11/qt4-qdbus/Makefile
8# used by x11/qt4-sqlite3/Makefile 8# used by x11/qt4-sqlite3/Makefile
9# used by x11/qt4-tiff/Makefile 9# used by x11/qt4-tiff/Makefile
10 10
11DISTNAME= qt-everywhere-opensource-src-${QTVERSION} 11DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/ 13MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/
14#EXTRACT_SUFX= .tar.bz2 14#EXTRACT_SUFX= .tar.bz2
15 15
16.include "../../x11/qt4/Makefile.common" 16.include "../../x11/qt4/Makefile.common"
17 17
18DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 18DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
19FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 19FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
20PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches 20PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches
21 21
22HAS_CONFIGURE= yes 22HAS_CONFIGURE= yes
23USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
24USE_LIBTOOL= yes 24USE_LIBTOOL= yes
25USE_TOOLS+= gmake 25USE_TOOLS+= gmake
26 26
27.if empty(PKGNAME:U:Mqt4-libs-*) 27.if empty(PKGNAME:U:Mqt4-libs-*)
28BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION} 28BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION}
29.endif 29.endif
30 30
31QTPREFIX= ${PREFIX}/qt4 31QTPREFIX= ${PREFIX}/qt4
32 32
33# libphonon is available in multimedia/phonon 33# libphonon is available in multimedia/phonon
34CONFIGURE_ARGS+= -no-phonon 34CONFIGURE_ARGS+= -no-phonon
35CONFIGURE_ARGS+= -no-phonon-backend 35CONFIGURE_ARGS+= -no-phonon-backend
36CONFIGURE_ARGS+= -optimized-qmake 36CONFIGURE_ARGS+= -optimized-qmake
37CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 37CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
38CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs 38CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
39CONFIGURE_ARGS.SunOS+= -no-xrender 39CONFIGURE_ARGS.SunOS+= -no-xrender
40CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} 40CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
41CONFIGURE_ARGS+= ${LDFLAGS:M-Wl*:S/-Wl,//:S/-syslibroot,/-sdk /} 
42CONFIGURE_ARGS+= -opensource -confirm-license 41CONFIGURE_ARGS+= -opensource -confirm-license
43OPSYSVARS+= CONFIGURE_ARGS 42OPSYSVARS+= CONFIGURE_ARGS
44 43
45.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
46 45
47.if !empty(MAKE_JOBS) 46.if !empty(MAKE_JOBS)
48CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} 47CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
49.endif 48.endif
50 49
51LIBQT?= -lQtCore -lQtGui 50LIBQT?= -lQtCore -lQtGui
52 51
53MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 52MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
54MAKE_ENV+= QTDIR=${WRKSRC} 53MAKE_ENV+= QTDIR=${WRKSRC}
55PLIST_VARS+= mac unix 54PLIST_VARS+= mac unix
56.if ${OPSYS} == "Darwin" 55.if ${OPSYS} == "Darwin"
57PLIST.mac= yes 56PLIST.mac= yes
58QMAKE_CONF= qmake.conf.mac 57QMAKE_CONF= qmake.conf.mac
59QMAKE_RANLIB= ${RANLIB} 58QMAKE_RANLIB= ${RANLIB}
60.else 59.else
61PLIST.unix= yes 60PLIST.unix= yes
62QMAKE_CONF= qmake.conf 61QMAKE_CONF= qmake.conf
63QMAKE_RANLIB= ${TRUE} 62QMAKE_RANLIB= ${TRUE}
64.endif 63.endif
65 64
66# avoid creating a .qt directory in the users home directory 65# avoid creating a .qt directory in the users home directory
67SCRIPTS_ENV+= HOME=${WRKDIR} 66SCRIPTS_ENV+= HOME=${WRKDIR}
68 67
69.include "../../mk/compiler.mk" 68.include "../../mk/compiler.mk"
70 69
71.if ${OPSYS} == "SunOS" 70.if ${OPSYS} == "SunOS"
72. if !empty(CC_VERSION:Mgcc*) 71. if !empty(CC_VERSION:Mgcc*)
73. if ${ABI:U} == "64" 72. if ${ABI:U} == "64"
74CONFIGURE_ARGS+= -platform solaris-g++-64 73CONFIGURE_ARGS+= -platform solaris-g++-64
75. else 74. else
76CONFIGURE_ARGS+= -platform solaris-g++ 75CONFIGURE_ARGS+= -platform solaris-g++
77. endif 76. endif
78. else 77. else
79. if ${ABI:U} == "64" 78. if ${ABI:U} == "64"
80CONFIGURE_ARGS+= -platform solaris-cc-64 79CONFIGURE_ARGS+= -platform solaris-cc-64
81. else 80. else
82CONFIGURE_ARGS+= -platform solaris-cc 81CONFIGURE_ARGS+= -platform solaris-cc
83. endif 82. endif
84. endif 83. endif
85SYS_LIBS= -lresolv -lsocket -lnsl -lrt 84SYS_LIBS= -lresolv -lsocket -lnsl -lrt
86.elif ${OPSYS} == "Interix" 85.elif ${OPSYS} == "Interix"
87CONFIGURE_ARGS+= -platform interix-g++ 86CONFIGURE_ARGS+= -platform interix-g++
88CFLAGS+= -I/usr/local/include/bind 87CFLAGS+= -I/usr/local/include/bind
89LDFLAGS+= -L/usr/local/lib/bind -lbind 88LDFLAGS+= -L/usr/local/lib/bind -lbind
90BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 89BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
91SYS_LIBS= -lbind -ldb -ldl 90SYS_LIBS= -lbind -ldb -ldl
92.elif ${OPSYS} == "DragonFly" 91.elif ${OPSYS} == "DragonFly"
93CONFIGURE_ARGS+= -platform freebsd-g++ 92CONFIGURE_ARGS+= -platform freebsd-g++
94.elif ${OPSYS} == "Darwin" 93.elif ${OPSYS} == "Darwin"
95CONFIGURE_ARGS+= -platform macx-g++ 94CONFIGURE_ARGS+= -platform macx-g++
96CONFIGURE_ARGS+= -no-dwarf2 95CONFIGURE_ARGS+= -no-dwarf2
97CONFIGURE_ARGS+= -no-framework 96CONFIGURE_ARGS+= -no-framework
98. if exists(/usr/lib/libresolv.dylib) 97. if exists(/usr/lib/libresolv.dylib)
99LDFLAGS+= -lresolv 98LDFLAGS+= -lresolv
100. endif 99. endif
101.elif ${OPSYS} == "Linux" 100.elif ${OPSYS} == "Linux"
102LDFLAGS+= -ldl 101LDFLAGS+= -ldl
103.endif 102.endif
104 103
105.if ${OPSYS} != "Darwin" && ${X11_TYPE} != "native" 104.if ${OPSYS} != "Darwin" && ${X11_TYPE} != "native"
106.include "../../x11/libXinerama/buildlink3.mk" 105.include "../../x11/libXinerama/buildlink3.mk"
107.elif !exists(${X11BASE}/lib/libXinerama.so) && \ 106.elif !exists(${X11BASE}/lib/libXinerama.so) && \
108 !exists(${X11BASE}/lib/libXinerama.dylib) 107 !exists(${X11BASE}/lib/libXinerama.dylib)
109CONFIGURE_ARGS+= -no-xinerama 108CONFIGURE_ARGS+= -no-xinerama
110.endif 109.endif
111 110
112SUBST_CLASSES+= dnr 111SUBST_CLASSES+= dnr
113SUBST_MESSAGE.dnr= Disabling debug_and_release. 112SUBST_MESSAGE.dnr= Disabling debug_and_release.
114SUBST_STAGE.dnr= pre-configure 113SUBST_STAGE.dnr= pre-configure
115SUBST_FILES.dnr= mkspecs/features/debug_and_release.prf 114SUBST_FILES.dnr= mkspecs/features/debug_and_release.prf
116SUBST_SED.dnr= -e 's,^,\#\#\#,' 115SUBST_SED.dnr= -e 's,^,\#\#\#,'
117 116
118SUBST_CLASSES+= nib 117SUBST_CLASSES+= nib
119SUBST_MESSAGE.nib= Fixing nib loading on Mac OS X. 118SUBST_MESSAGE.nib= Fixing nib loading on Mac OS X.
120SUBST_STAGE.nib= pre-configure 119SUBST_STAGE.nib= pre-configure
121SUBST_FILES.nib= src/gui/kernel/qapplication_mac.mm 120SUBST_FILES.nib= src/gui/kernel/qapplication_mac.mm
122SUBST_VARS.nib= QTPREFIX 121SUBST_VARS.nib= QTPREFIX
123 122
124SUBST_CLASSES+= lt 123SUBST_CLASSES+= lt
125SUBST_MESSAGE.lt= Enabling libtool. 124SUBST_MESSAGE.lt= Enabling libtool.
126SUBST_STAGE.lt= pre-configure 125SUBST_STAGE.lt= pre-configure
127SUBST_FILES.lt= src/gui/gui.pro 126SUBST_FILES.lt= src/gui/gui.pro
128SUBST_SED.lt= -e 's,$$$$QMAKE_CXX -c -W,$${LIBTOOL} --mode=compile &,' 127SUBST_SED.lt= -e 's,$$$$QMAKE_CXX -c -W,$${LIBTOOL} --mode=compile &,'
129SUBST_SED.lt+= -e 's,$$$${first(QMAKE_EXT_OBJ)},.lo,' 128SUBST_SED.lt+= -e 's,$$$${first(QMAKE_EXT_OBJ)},.lo,'
130 129
131.include "options.mk" 130.include "options.mk"
132 131
133# Reverse the change to how templates are handled made between 3.0.4 132# Reverse the change to how templates are handled made between 3.0.4
134# and 3.0.5 for older toolchains. Removing inline for newer toolchains 133# and 3.0.5 for older toolchains. Removing inline for newer toolchains
135# produces smaller code. Removing inline for older toolchains prod- 134# produces smaller code. Removing inline for older toolchains prod-
136# uces buggy code. 135# uces buggy code.
137.if !empty(CC_VERSION:Mgcc-2.8*) 136.if !empty(CC_VERSION:Mgcc-2.8*)
138CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline 137CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
139.endif 138.endif
140 139
141pre-configure: 140pre-configure:
142 sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \ 141 sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \
143 -e 's:@X11BASE@:${X11BASE}:g' \ 142 -e 's:@X11BASE@:${X11BASE}:g' \
144 -e 's:@X11PREFIX@:${X11PREFIX}:g' \ 143 -e 's:@X11PREFIX@:${X11PREFIX}:g' \
145 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 144 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
146 -e 's:@CC@:${CC:Q}:g' \ 145 -e 's:@CC@:${CC:Q}:g' \
147 -e 's:@CXX@:${CXX:Q}:g' \ 146 -e 's:@CXX@:${CXX:Q}:g' \
148 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 147 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
149 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 148 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
150 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 149 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
151 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 150 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
152 -e 's:@LEX@:${LEX}:g' \ 151 -e 's:@LEX@:${LEX}:g' \
153 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 152 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
154 -e 's:@AR@:${AR:Q}:g' \ 153 -e 's:@AR@:${AR:Q}:g' \
155 -e 's:@MKDIR@:${MKDIR}:g' \ 154 -e 's:@MKDIR@:${MKDIR}:g' \
156 -e 's:@LIBQT@:${LIBQT:Q}:g' \ 155 -e 's:@LIBQT@:${LIBQT:Q}:g' \
157 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ 156 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
158 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ 157 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
159 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ 158 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
160 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ 159 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
161 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf 160 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
162 for dir in ${WRKSRC}/mkspecs/*; do \ 161 for dir in ${WRKSRC}/mkspecs/*; do \
163 cp ${WRKSRC}/qmake.conf $${dir}; \ 162 cp ${WRKSRC}/qmake.conf $${dir}; \
164 rm -f $${dir}/*.orig; \ 163 rm -f $${dir}/*.orig; \
165 done 164 done