Thu Dec 24 11:43:55 2020 UTC ()
(devel/tavrasm) Adapt to new bison


(mef)
diff -r1.12 -r1.13 pkgsrc/devel/tavrasm/distinfo
diff -r1.5 -r1.6 pkgsrc/devel/tavrasm/patches/patch-aa
cvs diff -r1.12 -r1.13 pkgsrc/devel/tavrasm/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/tavrasm/distinfo 2019/12/19 22:13:48 1.12
+++ pkgsrc/devel/tavrasm/distinfo 2020/12/24 11:43:55 1.13
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.12 2019/12/19 22:13:48 joerg Exp $ 1$NetBSD: distinfo,v 1.13 2020/12/24 11:43:55 mef Exp $
2 2
3SHA1 (tavrasm-1.22/tavrasm.tar.gz) = 9d19035b9fcc460a33a85338010541824633c417 3SHA1 (tavrasm-1.22/tavrasm.tar.gz) = 9d19035b9fcc460a33a85338010541824633c417
4RMD160 (tavrasm-1.22/tavrasm.tar.gz) = 1e0f4553be660ebcfa44b2a9d81b3936997492e2 4RMD160 (tavrasm-1.22/tavrasm.tar.gz) = 1e0f4553be660ebcfa44b2a9d81b3936997492e2
5SHA512 (tavrasm-1.22/tavrasm.tar.gz) = 0f33607e2ffbe8c56268b15dc62fe6c2b565bf898c68e198846f11fb30da4da3f398d07ef7ac16050dbc92ffcb04612459027a2c27cf48fc7d74392c5f6a38dc 5SHA512 (tavrasm-1.22/tavrasm.tar.gz) = 0f33607e2ffbe8c56268b15dc62fe6c2b565bf898c68e198846f11fb30da4da3f398d07ef7ac16050dbc92ffcb04612459027a2c27cf48fc7d74392c5f6a38dc
6Size (tavrasm-1.22/tavrasm.tar.gz) = 65685 bytes 6Size (tavrasm-1.22/tavrasm.tar.gz) = 65685 bytes
7SHA1 (patch-aa) = d2e8d79bd5a92beb19fff3235efd948d841905e7 7SHA1 (patch-aa) = 088284370f516322227beef2c1142e86923196a9
8SHA1 (patch-ab) = 209bbf9f2ce809d0d7460355258ab5b6d955d9a6 8SHA1 (patch-ab) = 209bbf9f2ce809d0d7460355258ab5b6d955d9a6
cvs diff -r1.5 -r1.6 pkgsrc/devel/tavrasm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/tavrasm/patches/patch-aa 2019/12/19 22:13:48 1.5
+++ pkgsrc/devel/tavrasm/patches/patch-aa 2020/12/24 11:43:55 1.6
@@ -1,18 +1,16 @@ @@ -1,18 +1,16 @@
1$NetBSD: patch-aa,v 1.5 2019/12/19 22:13:48 joerg Exp $ 
2 
3--- src/makefile.orig 2004-12-11 23:51:29.000000000 +0000 1--- src/makefile.orig 2004-12-11 23:51:29.000000000 +0000
4+++ src/makefile 2+++ src/makefile 2020-12-24 11:41:02.928792258 +0000
5@@ -24,27 +24,30 @@ VERSION = 122 3@@ -24,40 +24,44 @@
6  4
7 ### Compiler options ######################################################### 5 ### Compiler options #########################################################
8  6
9-CC = gcc 7-CC = gcc
10-CFLAGS = -O2 -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE) 8-CFLAGS = -O2 -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE)
11-CPPFLAGS = 9-CPPFLAGS =
12+CFLAGS += -DAVRLANG=LANGUAGE_$(LANGUAGE) 10+CFLAGS += -DAVRLANG=LANGUAGE_$(LANGUAGE)
13+CPPFLAGS ?= 11+CPPFLAGS ?=
14 CCFLAGS = $(CFLAGS) $(CPPFLAGS) 12 CCFLAGS = $(CFLAGS) $(CPPFLAGS)
15-LINK = -lm -lstdc++ 13-LINK = -lm -lstdc++
16+LINK = $(LDFLAGS) $(LIBS) -lm -lstdc++ 14+LINK = $(LDFLAGS) $(LIBS) -lm -lstdc++
17 OBJS = avrparse.o avrlex.o avrasm.o symbol.o semantic.o utils.o 15 OBJS = avrparse.o avrlex.o avrasm.o symbol.o semantic.o utils.o
18+LEX = lex 16+LEX = lex
@@ -28,29 +26,30 @@ $NetBSD: patch-aa,v 1.5 2019/12/19 22:13 @@ -28,29 +26,30 @@ $NetBSD: patch-aa,v 1.5 2019/12/19 22:13
28  26
29+all: $(EXENAME) 27+all: $(EXENAME)
30+ 28+
31 $(EXENAME): $(OBJS) 29 $(EXENAME): $(OBJS)
32- $(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@ 30- $(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@
33+ $(CXX) $(CCFLAGS) $(OBJS) $(LINK) -o $@ 31+ $(CXX) $(CCFLAGS) $(OBJS) $(LINK) -o $@
34  32
35 ### Parser file ############################################################# 33 ### Parser file #############################################################
36  34
37 avrparse.cc: avrparse.y avrasm.hh symbol.hh semantic.hh opcodes.hh 35 avrparse.cc: avrparse.y avrasm.hh symbol.hh semantic.hh opcodes.hh
38- bison -d -o avrparse avrparse.y 36- bison -d -o avrparse avrparse.y
39+ ${YACC} -d -o avrparse avrparse.y 37+ ${YACC} -d -o avrparse avrparse.y
40 mv avrparse avrparse.cc 38 mv avrparse avrparse.cc
41 mv avrparse.h avrparse.hh 39- mv avrparse.h avrparse.hh
 40+ cp avrparse.h avrparse.hh
42  41
43@@ -52,12 +55,13 @@ avrparse.cc: avrparse.y avrasm.hh symbol 42 ### Scanner file ############################################################
44  43
45 avrlex.cc: avrparse.cc avrlex.l symbol.hh semantic.hh avrparse.hh \ 44 avrlex.cc: avrparse.cc avrlex.l symbol.hh semantic.hh avrparse.hh \
46 opcodes.hh avrasm.hh messages.hh 45 opcodes.hh avrasm.hh messages.hh
47- flex -o$@ avrlex.l 46- flex -o$@ avrlex.l
48+ ${LEX} -o$@ avrlex.l 47+ ${LEX} -o$@ avrlex.l
49  48
50 ### Dependencies ############################################################ 49 ### Dependencies ############################################################
51  50
52-avrlex.o: avrlex.l 51-avrlex.o: avrlex.l
53-avrparse.o: avrparse.y 52-avrparse.o: avrparse.y
54+avrparse.hh: avrparse.cc 53+avrparse.hh: avrparse.cc
55+avrlex.o: avrlex.cc 54+avrlex.o: avrlex.cc
56+avrparse.o: avrparse.cc 55+avrparse.o: avrparse.cc