diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
| commit | af591191d2b91375c67ab57df64d383e66055294 (patch) | |
| tree | ddbacf3026d39d6b23e622ac51745a4f7db32d44 /x11/qt3-libs | |
| parent | 675d464c92282081571087f8ad824d1cae9d8414 (diff) | |
| download | pkgsrc-af591191d2b91375c67ab57df64d383e66055294.tar.gz | |
Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added
automatically by pthread.buildlink3.mk. Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).
Diffstat (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 1b4baed5373..c31470969a6 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2004/10/30 13:28:40 grant Exp $ +# $NetBSD: Makefile.common,v 1.41 2004/11/12 06:39:21 jlam Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -104,6 +104,7 @@ post-patch: -e 's:@MKDIR@:${MKDIR}:g' \ -e 's:@LIBQT@:${LIBQT}:g' \ -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \ + -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \ -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 31372cb532b..6e65b62d19b 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $ -# $Id: qmake.conf,v 1.16 2004/10/19 13:27:48 markd Exp $ +# $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 $ # # qmake configuration for netbsd-g++ # @@ -75,7 +75,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@ QMAKE_LIBS_X11SM = -lICE -lSM QMAKE_LIBS_QT = @LIBQT@ QMAKE_LIBS_QT_THREAD = @LIBQT@ -QMAKE_LIBS_THREAD = @PTHREAD_LDFLAGS@ +QMAKE_LIBS_THREAD = @PTHREAD_LDFLAGS@ @PTHREAD_LIBS@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu |