[pkgsrc/trunk]: pkgsrc/devel/tpasm Ensure the same compiler is used to both c...

[sketch <sketch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbfa4fe94dc9
branches:  trunk
changeset: 463907:cbfa4fe94dc9
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Tue Dec 02 17:59:45 2003 +0000

description:
Ensure the same compiler is used to both compile and link the program,
fixing the GCC 3 breakage exhibited in pkg/23424.  This also fixes the
build using Sun CC on Solaris.

diffstat:

 devel/tpasm/distinfo         |   3 ++-
 devel/tpasm/patches/patch-aa |  29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r 8ba9250ca37a -r cbfa4fe94dc9 devel/tpasm/distinfo
--- a/devel/tpasm/distinfo      Tue Dec 02 17:35:57 2003 +0000
+++ b/devel/tpasm/distinfo      Tue Dec 02 17:59:45 2003 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:48 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/12/02 17:59:45 sketch Exp $
 
 SHA1 (tpasm1.0r.tgz) = 16b88a548681de2dd8409630a079bdefa84957c4
 Size (tpasm1.0r.tgz) = 137634 bytes
+SHA1 (patch-aa) = 9898d05cab53475622e8350617d2fea1b77e56c4
diff -r 8ba9250ca37a -r cbfa4fe94dc9 devel/tpasm/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/tpasm/patches/patch-aa      Tue Dec 02 17:59:45 2003 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.3 2003/12/02 17:59:45 sketch Exp $
+
+--- Makefile.orig      2003-12-02 17:09:48.000000000 +0000
++++ Makefile   2003-12-02 17:12:02.000000000 +0000
+@@ -16,7 +16,7 @@
+ INCLUDES=-I.
+ 
+ OPTIONS=-O2 -Wall -x c++
+-CFLAGS=$(INCLUDES) $(OPTIONS)
++CFLAGS += $(INCLUDES)
+ 
+ OBJECTS = \
+       globals.o \
+@@ -65,7 +65,7 @@
+ all : tpasm
+ 
+ tpasm : $(OBJECTS)
+-      $(CC) -O $(OBJECTS) -o tpasm
++      $(CXX) $(CFLAGS) $(OBJECTS) -o tpasm
+ 
+ clean :
+       rm -f *.o
+@@ -79,5 +79,5 @@
+ # suffix rules (this makes sure that the ".o" files
+ # end up in their respective directories on all systems)
+ .c.o:
+-      ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
++      ${CXX} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
+