summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc>2002-11-29 09:37:34 +0000
committeragc <agc>2002-11-29 09:37:34 +0000
commit3d737e7c82899a694d36b41dbdae3718fe1a13cd (patch)
tree5d7c0057824e5708098f583d638be741f9f3915b
parentf137ab8aa9020bb9abe40e7aa183b7e83e60321f (diff)
downloadpkgsrc-3d737e7c82899a694d36b41dbdae3718fe1a13cd.tar.gz
Pull up the change from rev 1.13 to 1.14 of pkgsrc/x11/kdelibs3/Makefile
to the netbsd-1-6 pkgsrc branch. Requested by Dan Mcmahill. The change is to lower the optimization on sparc to allow this to build.
-rw-r--r--x11/kdelibs3/Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 663cbbc40d9..ef7b00ef832 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/15 08:22:09 skrll Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2002/11/29 09:37:34 agc Exp $
DISTNAME= kdelibs-3.0.2
PKGREVISION= 1
@@ -111,15 +111,20 @@ post-install:
.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
-# XXX On NetBSD, the egcs for:
+# XXX On NetBSD, the egcs and gcc-2.95.3 for:
# XXX
-# XXX alpha
+# XXX alpha and sparc
# XXX
# XXX has an optimization bug when compiling with -O2 that is tickled by
+# XXX ${WRKSRC}/kio/kio/global.cpp.
# XXX ${WRKSRC}/kdeprint/management/kmiconview.cpp.
+# XXX and others
#
.if ${OPSYS} == "NetBSD"
-. if (${MACHINE_ARCH} == "alpha")
-CFLAGS+= -O
+. if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc")
+CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*/-O/g}
+CFLAGS:= ${CFLAGS:C/-O[0-9]*/-O/g}
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
. endif
.endif