diff options
| author | sketch <sketch@pkgsrc.org> | 2003-12-02 17:59:45 +0000 |
|---|---|---|
| committer | sketch <sketch@pkgsrc.org> | 2003-12-02 17:59:45 +0000 |
| commit | bbaaa92f4ebe49d08582800700e2a92b9cd3c10f (patch) | |
| tree | 999967f8a6129a9423e632aceaa9a8a8dd852d71 /devel/tpasm | |
| parent | 6ef7ea4153fcccc67796d1093af52280b5f78f27 (diff) | |
| download | pkgsrc-bbaaa92f4ebe49d08582800700e2a92b9cd3c10f.tar.gz | |
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 (limited to 'devel/tpasm')
| -rw-r--r-- | devel/tpasm/distinfo | 3 | ||||
| -rw-r--r-- | devel/tpasm/patches/patch-aa | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/devel/tpasm/distinfo b/devel/tpasm/distinfo index 03fe8039478..2f6ae484963 100644 --- a/devel/tpasm/distinfo +++ b/devel/tpasm/distinfo @@ -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 --git a/devel/tpasm/patches/patch-aa b/devel/tpasm/patches/patch-aa new file mode 100644 index 00000000000..178ed1906d0 --- /dev/null +++ b/devel/tpasm/patches/patch-aa @@ -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 $< + |