Tue Dec 16 13:46:59 2008 UTC ()
Pass -arch ${MACHINE_ARCH} to configure so it doesn't rely on uname -m


(jmcneill)
diff -r1.11 -r1.12 pkgsrc/x11/qt4-libs/Makefile.common
cvs diff -r1.11 -r1.12 pkgsrc/x11/qt4-libs/Makefile.common (switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2008/10/26 14:02:33 1.11
+++ pkgsrc/x11/qt4-libs/Makefile.common 2008/12/16 13:46:59 1.12
@@ -1,125 +1,126 @@ @@ -1,125 +1,126 @@
1# $NetBSD: Makefile.common,v 1.11 2008/10/26 14:02:33 adam Exp $ 1# $NetBSD: Makefile.common,v 1.12 2008/12/16 13:46:59 jmcneill Exp $
2# used by x11/qt4-libs/Makefile 2# used by x11/qt4-libs/Makefile
3 3
4DISTNAME= qt-x11-opensource-src-${QTVERSION} 4DISTNAME= qt-x11-opensource-src-${QTVERSION}
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ 6MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
7 ftp://ftp.bero.org/pub/qt/source/ 7 ftp://ftp.bero.org/pub/qt/source/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10.include "../../x11/qt4/Makefile.common" 10.include "../../x11/qt4/Makefile.common"
11 11
12DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 12DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
13FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 13FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
14PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches 14PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches
15 15
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake 19USE_TOOLS+= gmake
20 20
21QTPREFIX= ${PREFIX}/qt4 21QTPREFIX= ${PREFIX}/qt4
22 22
23CONFIGURE_ARGS+= -prefix "${QTPREFIX}" -shared -sm 23CONFIGURE_ARGS+= -prefix "${QTPREFIX}" -shared -sm
24CONFIGURE_ARGS+= -release 24CONFIGURE_ARGS+= -release
25CONFIGURE_ARGS+= -system-libjpeg 25CONFIGURE_ARGS+= -system-libjpeg
26CONFIGURE_ARGS+= -system-libmng 26CONFIGURE_ARGS+= -system-libmng
27CONFIGURE_ARGS+= -system-libpng 27CONFIGURE_ARGS+= -system-libpng
28CONFIGURE_ARGS+= -system-zlib 28CONFIGURE_ARGS+= -system-zlib
29CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs 29CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
30CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//} 30CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
 31CONFIGURE_ARGS+= -arch ${MACHINE_ARCH}
31# current WebKit fails for missing pthread_getattr_np() in 32# current WebKit fails for missing pthread_getattr_np() in
32# src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp 33# src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
33#CONFIGURE_ARGS+= -no-webkit 34#CONFIGURE_ARGS+= -no-webkit
34CONFIGURE_ARGS.SunOS+= -no-xrender 35CONFIGURE_ARGS.SunOS+= -no-xrender
35OPSYSVARS+= CONFIGURE_ARGS 36OPSYSVARS+= CONFIGURE_ARGS
36CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance 37CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
37 38
38LIBQT?= -lQtCore -lQtGui 39LIBQT?= -lQtCore -lQtGui
39 40
40MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 41MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
41MAKE_ENV+= QTDIR=${WRKSRC} 42MAKE_ENV+= QTDIR=${WRKSRC}
42 43
43# avoid creating a .qt directory in the users home directory 44# avoid creating a .qt directory in the users home directory
44SCRIPTS_ENV+= HOME=${WRKDIR} 45SCRIPTS_ENV+= HOME=${WRKDIR}
45 46
46.include "../../mk/compiler.mk" 47.include "../../mk/compiler.mk"
47 48
48.if !empty(CC_VERSION:Mgcc*) 49.if !empty(CC_VERSION:Mgcc*)
49CONFIGURE_ARGS+= -no-g++-exceptions 50CONFIGURE_ARGS+= -no-g++-exceptions
50.endif 51.endif
51 52
52.if ${OPSYS} == "SunOS" 53.if ${OPSYS} == "SunOS"
53. if !empty(CC_VERSION:Mgcc*) 54. if !empty(CC_VERSION:Mgcc*)
54. if ${ABI:U} == "64" 55. if ${ABI:U} == "64"
55CONFIGURE_ARGS+= -platform solaris-g++-64 56CONFIGURE_ARGS+= -platform solaris-g++-64
56. else 57. else
57CONFIGURE_ARGS+= -platform solaris-g++ 58CONFIGURE_ARGS+= -platform solaris-g++
58. endif 59. endif
59. else 60. else
60. if ${ABI:U} == "64" 61. if ${ABI:U} == "64"
61CONFIGURE_ARGS+= -platform solaris-cc-64 62CONFIGURE_ARGS+= -platform solaris-cc-64
62. else 63. else
63CONFIGURE_ARGS+= -platform solaris-cc 64CONFIGURE_ARGS+= -platform solaris-cc
64. endif 65. endif
65. endif 66. endif
66SYS_LIBS= -lresolv -lsocket -lnsl -lrt 67SYS_LIBS= -lresolv -lsocket -lnsl -lrt
67.elif ${OPSYS} == "Interix" 68.elif ${OPSYS} == "Interix"
68CONFIGURE_ARGS+= -platform interix-g++ 69CONFIGURE_ARGS+= -platform interix-g++
69CFLAGS+= -I/usr/local/include/bind 70CFLAGS+= -I/usr/local/include/bind
70LDFLAGS+= -L/usr/local/lib/bind -lbind 71LDFLAGS+= -L/usr/local/lib/bind -lbind
71BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 72BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
72SYS_LIBS= -lbind -ldb -ldl 73SYS_LIBS= -lbind -ldb -ldl
73.elif ${OPSYS} == "DragonFly" 74.elif ${OPSYS} == "DragonFly"
74CONFIGURE_ARGS+= -platform freebsd-g++ 75CONFIGURE_ARGS+= -platform freebsd-g++
75.elif ${OPSYS} == "Darwin" 76.elif ${OPSYS} == "Darwin"
76QMAKE_RANLIB= ${RANLIB} 77QMAKE_RANLIB= ${RANLIB}
77. if exists(/usr/lib/libresolv.dylib) 78. if exists(/usr/lib/libresolv.dylib)
78LDFLAGS+= -lresolv 79LDFLAGS+= -lresolv
79. endif 80. endif
80.endif 81.endif
81 82
82QMAKE_RANLIB?= ${TRUE} 83QMAKE_RANLIB?= ${TRUE}
83 84
84.if ${X11_TYPE} != "native" 85.if ${X11_TYPE} != "native"
85.include "../../x11/libXinerama/buildlink3.mk" 86.include "../../x11/libXinerama/buildlink3.mk"
86.elif !exists(${X11BASE}/lib/libXinerama.so) && \ 87.elif !exists(${X11BASE}/lib/libXinerama.so) && \
87 !exists(${X11BASE}/lib/libXinerama.dylib) 88 !exists(${X11BASE}/lib/libXinerama.dylib)
88CONFIGURE_ARGS+= -no-xinerama 89CONFIGURE_ARGS+= -no-xinerama
89.endif 90.endif
90 91
91.include "options.mk" 92.include "options.mk"
92 93
93# Reverse the change to how templates are handled made between 3.0.4 94# Reverse the change to how templates are handled made between 3.0.4
94# and 3.0.5 for older toolchains. Removing inline for newer toolchains 95# and 3.0.5 for older toolchains. Removing inline for newer toolchains
95# produces smaller code. Removing inline for older toolchains prod- 96# produces smaller code. Removing inline for older toolchains prod-
96# uces buggy code. 97# uces buggy code.
97.if !empty(CC_VERSION:Mgcc-2.8*) 98.if !empty(CC_VERSION:Mgcc-2.8*)
98CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline 99CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
99.endif 100.endif
100 101
101pre-configure: 102pre-configure:
102 sed -e 's:@LOCALBASE@:${LOCALBASE:Q}:g' \ 103 sed -e 's:@LOCALBASE@:${LOCALBASE:Q}:g' \
103 -e 's:@X11BASE@:${X11BASE:Q}:g' \ 104 -e 's:@X11BASE@:${X11BASE:Q}:g' \
104 -e 's:@X11PREFIX@:${X11PREFIX:Q}:g' \ 105 -e 's:@X11PREFIX@:${X11PREFIX:Q}:g' \
105 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 106 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
106 -e 's:@CC@:${CC:Q}:g' \ 107 -e 's:@CC@:${CC:Q}:g' \
107 -e 's:@CXX@:${CXX:Q}:g' \ 108 -e 's:@CXX@:${CXX:Q}:g' \
108 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 109 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
109 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 110 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
110 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 111 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
111 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 112 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
112 -e 's:@LEX@:${LEX:Q}:g' \ 113 -e 's:@LEX@:${LEX:Q}:g' \
113 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 114 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
114 -e 's:@AR@:${AR:Q}:g' \ 115 -e 's:@AR@:${AR:Q}:g' \
115 -e 's:@MKDIR@:${MKDIR:Q}:g' \ 116 -e 's:@MKDIR@:${MKDIR:Q}:g' \
116 -e 's:@LIBQT@:${LIBQT:Q}:g' \ 117 -e 's:@LIBQT@:${LIBQT:Q}:g' \
117 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ 118 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
118 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ 119 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
119 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG:Q}:g' \ 120 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG:Q}:g' \
120 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ 121 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
121 ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf 122 ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
122 for dir in ${WRKSRC}/mkspecs/*; do \ 123 for dir in ${WRKSRC}/mkspecs/*; do \
123 cp ${WRKSRC}/qmake.conf $${dir}; \ 124 cp ${WRKSRC}/qmake.conf $${dir}; \
124 rm -f $${dir}/*.orig; \ 125 rm -f $${dir}/*.orig; \
125 done 126 done