diff options
| author | reed <reed> | 2005-07-01 01:10:06 +0000 |
|---|---|---|
| committer | reed <reed> | 2005-07-01 01:10:06 +0000 |
| commit | 7f15d0c9523ba2d4216e008f3b890b98db4904f7 (patch) | |
| tree | 42845e33a619f3c7197596143cd637fb0c05aef9 /x11 | |
| parent | d7ea76fc3bf0e17121d0208e69e34269ba63947c (diff) | |
| download | pkgsrc-7f15d0c9523ba2d4216e008f3b890b98db4904f7.tar.gz | |
If Darwin, then use real RANLIB.
No change for other platforms, as QMAKE_RANLIB is set to "true".
And if Darwin and /usr/lib/libresolv.dylib exists, then use -lresolv.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 10 | ||||
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 44a45c2abfc..cda0f840120 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.53 2005/06/22 21:14:45 jlam Exp $ +# $NetBSD: Makefile.common,v 1.54 2005/07/01 01:10:06 reed Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -61,8 +61,15 @@ BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind SYS_LIBS= -lbind -ldb -ldl .elif ${OPSYS} == "DragonFly" CONFIGURE_ARGS+= -platform freebsd-g++ +.elif ${OPSYS} == "Darwin" +QMAKE_RANLIB= ${RANLIB} +. if exists(/usr/lib/libresolv.dylib) +LDFLAGS+= -lresolv +. endif .endif +QMAKE_RANLIB?= ${TRUE} + .if !exists(${X11BASE}/lib/libXinerama.so) CONFIGURE_ARGS+= -no-xinerama .endif @@ -112,6 +119,7 @@ pre-configure: -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \ -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \ -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ + -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ ${CP} ${WRKSRC}/qmake.conf $${dir}; \ diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 6e65b62d19b..439b2415a93 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $ -# $Id: qmake.conf,v 1.17 2004/11/12 06:39:21 jlam Exp $ +# $NetBSD: qmake.conf,v 1.18 2005/07/01 01:10:06 reed Exp $ +# $Id: qmake.conf,v 1.18 2005/07/01 01:10:06 reed Exp $ # # qmake configuration for netbsd-g++ # @@ -84,7 +84,7 @@ QMAKE_MOC = $(QTDIR)/bin/moc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = @AR@ ru -QMAKE_RANLIB = true +QMAKE_RANLIB = @QMAKE_RANLIB@ QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f |