summaryrefslogtreecommitdiff
path: root/x11/kdelibs2
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2002-04-10 12:27:33 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2002-04-10 12:27:33 +0000
commitcf4557c286959e8ada2f5375befef59dadfe0dc8 (patch)
tree24cf4cb8183f69950e156d9407902342d031f8f3 /x11/kdelibs2
parentbdf1bc8d130bf5822a48e235441b366cd051b464 (diff)
downloadpkgsrc-cf4557c286959e8ada2f5375befef59dadfe0dc8.tar.gz
obey CXXFLAGS and don't unconditionally prepend -O2.
Diffstat (limited to 'x11/kdelibs2')
-rw-r--r--x11/kdelibs2/distinfo4
-rw-r--r--x11/kdelibs2/patches/patch-af38
2 files changed, 35 insertions, 7 deletions
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 5e7323cd9c6..0a44dc524f1 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2002/02/23 15:24:17 skrll Exp $
+$NetBSD: distinfo,v 1.16 2002/04/10 12:27:34 dmcmahill Exp $
SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c
Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 4fcb10ca2605b9641ad317cea37d504f1644e150
SHA1 (patch-ac) = 06841064266659d9773c1d8728c9affc3d9c09cd
SHA1 (patch-ad) = 52fe9cdc53496ecbde42ff4a6c46a5bb104738a0
SHA1 (patch-ae) = 55feaee4a2c1bcedbd135d8f4ed49a9fdc487247
-SHA1 (patch-af) = 0c70385a39340b6d9af67415d761e79c638e7a26
+SHA1 (patch-af) = b74d73f1cb4ab5467707f1ab05a8e545b39fe29b
SHA1 (patch-ag) = 14f1dfadc1697e4fc731ee1d3fbd4df863ed82a8
SHA1 (patch-ah) = ee323d1faea7782507aa97d7bc1e1f467793e48c
SHA1 (patch-ai) = 02a985d9032412fc98f6497ea81d524a063e3115
diff --git a/x11/kdelibs2/patches/patch-af b/x11/kdelibs2/patches/patch-af
index 31400dc9b9f..a3ee618f6fe 100644
--- a/x11/kdelibs2/patches/patch-af
+++ b/x11/kdelibs2/patches/patch-af
@@ -1,11 +1,39 @@
---- configure.orig Wed Nov 14 09:58:06 2001
-+++ configure Fri Nov 23 13:41:42 2001
-@@ -9648,7 +9648,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+$NetBSD: patch-af,v 1.5 2002/04/10 12:27:33 dmcmahill Exp $
+
+--- configure.orig Tue Nov 13 15:58:06 2001
++++ configure Tue Apr 9 23:46:42 2002
+@@ -2496,5 +2496,5 @@
+ elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+- CXXFLAGS="-g -O2"
++ CXXFLAGS="-g"
+ else
+ CXXFLAGS="-g"
+@@ -2502,5 +2502,5 @@
+ else
+ if test "$GXX" = yes; then
+- CXXFLAGS="-O2"
++ CXXFLAGS=""
+ else
+ CXXFLAGS=
+@@ -2594,5 +2594,5 @@
+ if test "$GXX" = "yes"; then
+ if test "$kde_use_debug_code" = "yes"; then
+- CXXFLAGS="-g -O2 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++ CXXFLAGS="-g -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
+
+ echo "$as_me:2598: checking whether $CXX supports -Wno-long-long" >&5
+@@ -2699,5 +2699,5 @@
+ fi
+ else
+- CXXFLAGS="-O2 $CXXFLAGS"
++ CXXFLAGS="$CXXFLAGS"
+ fi
+ fi
+@@ -9649,5 +9649,5 @@
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='rm -rf SunWS_cache; ${LIBTOOL_SHELL} --tag=CXX --mode=link ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
ac_cxxflags_safe="$CXXFLAGS"
- ac_ldflags_safe="$LDFLAGS"