diff options
author | jtb <jtb> | 2003-07-14 07:12:12 +0000 |
---|---|---|
committer | jtb <jtb> | 2003-07-14 07:12:12 +0000 |
commit | c10e68d352dc7947dc74efea94edc62666111b8c (patch) | |
tree | c41916b5d3852ad7a70c2db123622f5ce1977023 /graphics | |
parent | 2a6a9a1b82d9e36a4dba643db8fd28e620ab4c9c (diff) | |
download | pkgsrc-c10e68d352dc7947dc74efea94edc62666111b8c.tar.gz |
Use CPPFLAGS for preprocessor defs. Allows setting of CXXFLAGS
on the commandline. grap has problems being compiled
with optimization on some machines.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/grap/distinfo | 3 | ||||
-rw-r--r-- | graphics/grap/patches/patch-aa | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/graphics/grap/distinfo b/graphics/grap/distinfo index 18ca35886a6..61e2502b6d7 100644 --- a/graphics/grap/distinfo +++ b/graphics/grap/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.5 2003/07/03 23:10:03 jtb Exp $ +$NetBSD: distinfo,v 1.6 2003/07/14 07:12:12 jtb Exp $ SHA1 (grap-1.30.tar.gz) = d8083d75cc4ca7bbfcca1a0958e1da10e54f1c88 Size (grap-1.30.tar.gz) = 167462 bytes +SHA1 (patch-aa) = a1663c1f761c21983b38f74a150fcc2c28ebc177 diff --git a/graphics/grap/patches/patch-aa b/graphics/grap/patches/patch-aa new file mode 100644 index 00000000000..6221be23201 --- /dev/null +++ b/graphics/grap/patches/patch-aa @@ -0,0 +1,40 @@ +$NetBSD: patch-aa,v 1.3 2003/07/14 07:12:14 jtb Exp $ + +--- Makefile.in.orig 2003-07-14 07:47:06.000000000 +0100 ++++ Makefile.in 2003-07-14 07:48:40.000000000 +0100 +@@ -31,7 +31,8 @@ + SOURCES=grap.cc grap_lex.cc *.cc + DISTDIR=@PACKAGE_TARNAME@-@PACKAGE_VERSION@ + +-CXXFLAGS +=@GXXFLAGS@ @DEFS@ ++CXXFLAGS = @CXXFLAGS@ ++CPPFLAGS +=@DEFS@ + + # To suppress optimization of certain files under g++ where + # optimization is costly at compilation time and of minimial use at +@@ -48,7 +49,7 @@ + include Makefile.common + + grap: ${OBJS} +- ${CXX} ${CXXFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap ++ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap + + .l.cc: + ${LEX} -o$@ $< +@@ -67,7 +68,7 @@ + # that file under g++ by default. If --optimize-grap_tokenizer is + # given to configure, no attempt to suppress optimization is made. + grap_tokenizer.o: grap_tokenizer.cc +- ${CXX} ${CXXFLAGS} ${SUPPRESS_OPT} -c grap_tokenizer.cc ++ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${SUPPRESS_OPT} -c grap_tokenizer.cc + + # flex defines an unused static function. This rule supresses that + # warning under g++. +@@ -89,7 +90,6 @@ + # The || true lines allow make to continue on systems where install -d + # fails on existing directories. + install: @INSTALL_DEPS@ +- strip grap || true + ${INSTALL} -d ${BINDIR} || true + ${INSTALL} -d ${MANDIR} || true + ${INSTALL} -d ${DEFINESDIR} || true |