summaryrefslogtreecommitdiff
path: root/x11/qt2-libs
diff options
context:
space:
mode:
authorskrll <skrll@pkgsrc.org>2000-11-03 08:40:24 +0000
committerskrll <skrll@pkgsrc.org>2000-11-03 08:40:24 +0000
commitc32eb5c6b445b3e2d5c96d0fc0c35bed3d75f16e (patch)
tree7a7ea0dd1195632c51c988d2b6ffd4857f38aa18 /x11/qt2-libs
parent57404f9fd1a14e88f04b6d0e2606d0ecd2b441c6 (diff)
downloadpkgsrc-c32eb5c6b445b3e2d5c96d0fc0c35bed3d75f16e.tar.gz
Use c++/cc instead of g++/gcc. Do this so that multi-language libtool
doesn't get confused.
Diffstat (limited to 'x11/qt2-libs')
-rw-r--r--x11/qt2-libs/files/patch-sum4
-rw-r--r--x11/qt2-libs/patches/patch-ab15
2 files changed, 11 insertions, 8 deletions
diff --git a/x11/qt2-libs/files/patch-sum b/x11/qt2-libs/files/patch-sum
index dae285769e3..081ae087d26 100644
--- a/x11/qt2-libs/files/patch-sum
+++ b/x11/qt2-libs/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+$NetBSD: patch-sum,v 1.2 2000/11/03 08:40:24 skrll Exp $
MD5 (patch-aa) = 8065c4af83fe8ce8713510f6e32a7811
-MD5 (patch-ab) = 69a415930cfd5fc90d471a66f1a22fc3
+MD5 (patch-ab) = 07572df0bf296c725b733884fbc5fcac
MD5 (patch-ac) = 677291030a425e5792bd242338c9ddc1
MD5 (patch-ad) = 6bb4068dfa73008cefd6a860391caaf9
MD5 (patch-ae) = 2c72e9e3658293f9476d4a0415f12899
diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab
index 8d4d329497c..ad9931a3e29 100644
--- a/x11/qt2-libs/patches/patch-ab
+++ b/x11/qt2-libs/patches/patch-ab
@@ -1,12 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/10/19 07:41:15 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2000/11/03 08:40:24 skrll Exp $
--- configs/netbsd-g++-static.orig Wed Oct 4 10:55:23 2000
+++ configs/netbsd-g++-static
-@@ -2,19 +2,20 @@
+@@ -1,20 +1,21 @@
+ # Compiling
INTERFACE_DECL_PATH = .
- SYSCONF_CXX = g++
- SYSCONF_CC = gcc
-+SYSCONF_CXX_LIB = ${LIBTOOL} --mode=compile g++
+-SYSCONF_CXX = g++
+-SYSCONF_CC = gcc
++SYSCONF_CXX = c++
++SYSCONF_CC = cc
++SYSCONF_CXX_LIB = ${LIBTOOL} --mode=compile c++
# Compiling with support libraries
SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
@@ -39,7 +42,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/10/19 07:41:15 skrll Exp $
# Linking applications
-SYSCONF_LINK = g++
-+SYSCONF_LINK = $(LIBTOOL) --mode=link g++
++SYSCONF_LINK = $(LIBTOOL) --mode=link c++
SYSCONF_LFLAGS =
SYSCONF_LIBS =