summaryrefslogtreecommitdiff
path: root/x11/qt3-libs/patches
diff options
context:
space:
mode:
authorgavan <gavan@pkgsrc.org>2004-10-28 10:28:49 +0000
committergavan <gavan@pkgsrc.org>2004-10-28 10:28:49 +0000
commit69ea790b80f5b75cc0d7b427982bf5d94188a09c (patch)
treeed38e99cdd446f7911e8fb74ea2e2de07831b94d /x11/qt3-libs/patches
parent07315a261cd0eb30a2b9adf9f38e940fa2c20f81 (diff)
downloadpkgsrc-69ea790b80f5b75cc0d7b427982bf5d94188a09c.tar.gz
Pay attention to LDFLAGS when building qmake. This allows qmake to link
correctly against pkgsrc gcc.
Diffstat (limited to 'x11/qt3-libs/patches')
-rw-r--r--x11/qt3-libs/patches/patch-af12
1 files changed, 9 insertions, 3 deletions
diff --git a/x11/qt3-libs/patches/patch-af b/x11/qt3-libs/patches/patch-af
index 7d272314665..03cf90db122 100644
--- a/x11/qt3-libs/patches/patch-af
+++ b/x11/qt3-libs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2004/04/30 11:29:00 adam Exp $
+$NetBSD: patch-af,v 1.4 2004/10/28 10:28:49 gavan Exp $
---- qmake/Makefile.unix.orig 2004-04-30 10:53:49.000000000 +0000
+--- qmake/Makefile.unix.orig 2004-06-02 23:24:30.000000000 +0100
+++ qmake/Makefile.unix
-@@ -32,7 +32,7 @@ DEPEND_SRC=project.cpp property.cpp meta
+@@ -32,12 +32,12 @@ DEPEND_SRC=project.cpp property.cpp meta
@SOURCE_PATH@/src/tools/qsettings.cpp @SOURCE_PATH@/src/tools/qurl.cpp \
@SOURCE_PATH@/src/tools/qsettings_mac.cpp @SOURCE_PATH@/src/tools/qlocale.cpp
@@ -11,3 +11,9 @@ $NetBSD: patch-af,v 1.3 2004/04/30 11:29:00 adam Exp $
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
+ -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
+-LFLAGS=@QMAKE_LFLAGS@
++LFLAGS=@QMAKE_LFLAGS@ $(LDFLAGS)
+
+ qmake: $(OBJS) $(QOBJS)
+ $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)