diff options
| author | dmcmahill <dmcmahill> | 2000-10-06 15:23:46 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2000-10-06 15:23:46 +0000 |
| commit | 4785f103f902bb295d17db77208b35dec990eb75 (patch) | |
| tree | ea12dc7f0cbf31be3cee94250b40dc3a552c548d | |
| parent | 9d8f1aa13c3f97fd3e9574d880af780306b3298c (diff) | |
| download | pkgsrc-4785f103f902bb295d17db77208b35dec990eb75.tar.gz | |
Don't use -O2 on a particular problem file on mipsel. Makes this work on
pmax.
| -rw-r--r-- | graphics/xpdf/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xpdf/files/patch-sum | 3 | ||||
| -rw-r--r-- | graphics/xpdf/patches/patch-aa | 22 |
3 files changed, 28 insertions, 1 deletions
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index cdba56b4c54..1201dc3c6bb 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/08/23 23:14:28 tron Exp $ +# $NetBSD: Makefile,v 1.18 2000/10/06 15:23:46 dmcmahill Exp $ # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp # @@ -23,6 +23,8 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-japanese --enable-chinese CONFIGURE_ARGS+=--with-freetype-includes=${LOCALBASE}/include +CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS} +MAKE_ENV+= SED=${SED} ECHO=${ECHO} post-install: ${SED} 's|@@LOCALBASE@@|${LOCALBASE}|' \ diff --git a/graphics/xpdf/files/patch-sum b/graphics/xpdf/files/patch-sum new file mode 100644 index 00000000000..4f54f91cd9e --- /dev/null +++ b/graphics/xpdf/files/patch-sum @@ -0,0 +1,3 @@ +$NetBSD: patch-sum,v 1.5 2000/10/06 15:23:47 dmcmahill Exp $ + +MD5 (patch-aa) = 3a86e0b6e272e8698ba8a5f0c6bacb5a diff --git a/graphics/xpdf/patches/patch-aa b/graphics/xpdf/patches/patch-aa new file mode 100644 index 00000000000..b32034e5309 --- /dev/null +++ b/graphics/xpdf/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.3 2000/10/06 15:23:47 dmcmahill Exp $ + +Avoid a toolchain bug on mipsel noted in NetBSD-1.4.2/pmax + +--- xpdf/Makefile.in.orig Tue Aug 15 01:01:52 2000 ++++ xpdf/Makefile.in Fri Oct 6 10:27:43 2000 +@@ -19,4 +19,7 @@ + CXXFLAGS = @CXXFLAGS@ @DEFS@ @OPTIONS@ -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @freetype_CFLAGS@ + ++CXXFLAGS_NOOPT!= ${ECHO} ${CXXFLAGS} | ${SED} 's/-O[0-9]*//g' ++ ++ + LDFLAGS = @LDFLAGS@ + +@@ -258,4 +261,7 @@ + config.h Params.h TextOutputDev.h OutputDev.h XOutputDev.h T1Font.h \ + SFont.h TTFont.h XOutputFontInfo.h ++.if (${MACHINE_ARCH} == "mipsel") ++ ${CXX} ${CXXFLAGS_NOOPT} -c XOutputDev.cc ++.endif + XRef.o: ./XRef.cc ../goo/gmem.h Object.h ../goo/gtypes.h \ + ../goo/GString.h Array.h Dict.h Stream.h Lexer.h Parser.h Decrypt.h \ |