diff options
| author | markd <markd@pkgsrc.org> | 2002-10-01 13:25:35 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2002-10-01 13:25:35 +0000 |
| commit | e30115be7457c00e6a5615b3e55419d619e759bc (patch) | |
| tree | a812bf0451c9e0ade2d633d165c6fa112f0ac034 | |
| parent | 67917d731d582f2da64f1f4dcfa722d51e9251d0 (diff) | |
| download | pkgsrc-e30115be7457c00e6a5615b3e55419d619e759bc.tar.gz | |
Remove dependency on egcs for Solaris.
Add capability to specify additional system libraries in the qmake.conf
and use it in the Solaris case to add -lresolv -lsocket -lnsl
| -rw-r--r-- | x11/qt3-libs/Makefile.common | 6 | ||||
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common index 5b94ba0396f..7bab3cdf156 100644 --- a/x11/qt3-libs/Makefile.common +++ b/x11/qt3-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2002/09/20 09:15:26 skrll Exp $ +# $NetBSD: Makefile.common,v 1.9 2002/10/01 13:25:35 markd Exp $ # DISTNAME= qt-x11-free-${QTVERSION} CATEGORIES= x11 @@ -36,9 +36,8 @@ SCRIPTS_ENV+= HOME="${WRKDIR}" .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs -CXX= ${LOCALBASE}/egcs/bin/g++ CONFIGURE_ARGS+= -platform solaris-g++ +SYS_LIBS= -lresolv -lsocket -lnsl .endif # @@ -69,6 +68,7 @@ post-patch: -e 's:@LDFLAGS@:${LDFLAGS}:g' \ -e 's:@CFLAGS@:${CFLAGS}:g' \ -e 's:@CXXFLAGS@:${CXXFLAGS}:g' \ + -e 's:@SYS_LIBS@:${SYS_LIBS}:g' \ -e 's:@LEX@:${LEX}:g' \ -e 's:@YACC@:${YACC}:g' \ -e 's:@LIBTOOL@:${PKGLIBTOOL}:g' \ diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index edbd31989f1..c62f5626d93 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ -# $NetBSD: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ -# $Id: qmake.conf,v 1.4 2002/08/25 18:40:46 jlam Exp $ +# $NetBSD: qmake.conf,v 1.5 2002/10/01 13:25:36 markd Exp $ +# $Id: qmake.conf,v 1.5 2002/10/01 13:25:36 markd Exp $ # # qmake configuration for netbsd-g++ # @@ -69,7 +69,7 @@ QMAKE_RUN_CXX_IMP = @LIBTOOL@ --mode=compile @CXX@ -c $(CXXFLAGS) $(INCPATH) -o QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -QMAKE_LIBS_X11 = -lXext -lX11 -lm +QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@ QMAKE_LIBS_X11SM = -lICE -lSM QMAKE_LIBS_QT = $(LIBQT) QMAKE_LIBS_QT_THREAD = $(LIBQT) |