diff options
Diffstat (limited to 'x11/qt1/patches/patch-aa')
| -rw-r--r-- | x11/qt1/patches/patch-aa | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/x11/qt1/patches/patch-aa b/x11/qt1/patches/patch-aa index c68fd823967..df135320340 100644 --- a/x11/qt1/patches/patch-aa +++ b/x11/qt1/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2000/03/28 00:09:20 dmcmahill Exp $ --- configs/netbsd-g++-static.orig Fri Feb 26 12:02:07 1999 -+++ configs/netbsd-g++-static Wed Mar 22 13:46:00 2000 ++++ configs/netbsd-g++-static Sun Mar 26 09:44:53 2000 @@ -1,4 +1,5 @@ # Compiling SYSCONF_CXX = g++ @@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $ -SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib -SYSCONF_LIBS_QT = -lqt +SYSCONF_LFLAGS_QT = -+SYSCONF_LIBS_QT = $(QTDIR)/src/libqt1.la ++SYSCONF_LIBS_QT = $(QTDIR)/src/libqt.la SYSCONF_LIBS_QT_OPENGL = -lqgl # OpenGL @@ -25,37 +26,23 @@ @@ -29,8 +29,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $ -SYSCONF_LFLAGS_SHOBJ = -Bshareable - # Meta-object compiler --SYSCONF_MOC = $(QTDIR)/bin/moc -- + SYSCONF_MOC = $(QTDIR)/bin/moc + -# Linking shared libraries -# - Build the $(TARGET) library, eg. lib$(TARGET).so.0.0 -# - Place target in $(DESTDIR) - which has a trailing / @@ -39,8 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/03/23 21:27:40 dmcmahill Exp $ -SYSCONF_LINK_SHLIB = ld -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) -SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS) -+SYSCONF_MOC = $(QTDIR)/bin/moc1 - +- -# Linking static libraries +# Linking libtool libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a |