diff options
| author | minskim <minskim@pkgsrc.org> | 2006-07-17 15:30:16 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-07-17 15:30:16 +0000 |
| commit | f53379e5a4e8384bc2f69021e1a40c5427773bba (patch) | |
| tree | 026a84a1db18a0d9857e21c13df7adc8d1d696f1 /x11/qt4-libs/files | |
| parent | 7e1979ab8c1360870d9ce944528e5931911fbe8f (diff) | |
| download | pkgsrc-f53379e5a4e8384bc2f69021e1a40c5427773bba.tar.gz | |
Use the libtool mode of qmake, instead of patching the non-libtool mode
to use libtool. This fixes PR 33951.
Bump PKGREVISION for qt4-libs and qt4-tools.
Diffstat (limited to 'x11/qt4-libs/files')
| -rw-r--r-- | x11/qt4-libs/files/qmake.conf | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/x11/qt4-libs/files/qmake.conf b/x11/qt4-libs/files/qmake.conf index 86c30413e0a..518f033acd9 100644 --- a/x11/qt4-libs/files/qmake.conf +++ b/x11/qt4-libs/files/qmake.conf @@ -1,12 +1,12 @@ -# $NetBSD: qmake.conf,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $ -# $Id: qmake.conf,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $ +# $NetBSD: qmake.conf,v 1.2 2006/07/17 15:30:16 minskim Exp $ +# $Id: qmake.conf,v 1.2 2006/07/17 15:30:16 minskim Exp $ # -# qmake configuration for netbsd-g++ +# qmake configuration for pkgsrc # MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QT += core gui QMAKE_CC = @CC@ @@ -44,16 +44,9 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = @X11PREFIX@/include QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib -QMAKE_LINK = @LIBTOOL@ --mode=link @CXX@ -QMAKE_LINK_SHLIB_CMD = \ - @LIBTOOL@ --mode=link @CXX@ $(LFLAGS) -o $(if $(TARGET0), \ - $(patsubst %.so,%.la,$(DESTDIR)$(TARGET0)), \ - $(patsubst %.so,%.la,$(DESTDIR)$(TARGET))) \ - $(if $(TARGET0), \ - -version-info $(subst $(TARGET0).,,$(TARGET1)):$(subst $(TARGET1).,,$(TARGET2)), \ - -module -avoid-version) \ - $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) \ - -rpath $(QTPREFIX)/$(if $(TARGET0),lib,$(subst ../,,$(DESTDIR))) +QMAKE_LINK = @CXX@ +QMAKE_LINK_SHLIB = @CXX@ +QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) QMAKE_LFLAGS = $(LDFLAGS) -L$(QTDIR)/lib QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -63,11 +56,6 @@ QMAKE_LFLAGS_SONAME = QMAKE_LFLAGS_THREAD = QMAKE_RPATH = @COMPILER_RPATH_FLAG@ -QMAKE_RUN_CC = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CC_IMP = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $@ $< -QMAKE_RUN_CXX = @LIBTOOL@ --mode=compile @CXX@ -c $(CXXFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CXX_IMP = @LIBTOOL@ --mode=compile @CXX@ -c $(CXXFLAGS) $(INCPATH) -o $@ $< - QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@ |