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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -18,26 +18,27 @@ USE_LANGUAGES= c c++ @@ -18,26 +18,27 @@ USE_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