Thu Nov 26 00:48:58 2009 UTC ()
Just use our CC, don't override it. Helps libtool-2.2.


(joerg)
diff -r1.8 -r1.9 pkgsrc/lang/tinyscheme/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/tinyscheme/patches/patch-aa
cvs diff -r1.8 -r1.9 pkgsrc/lang/tinyscheme/distinfo (switch to unified diff)

--- pkgsrc/lang/tinyscheme/distinfo 2009/07/07 20:35:53 1.8
+++ pkgsrc/lang/tinyscheme/distinfo 2009/11/26 00:48:58 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2009/07/07 20:35:53 agc Exp $ 1$NetBSD: distinfo,v 1.9 2009/11/26 00:48:58 joerg Exp $
2 2
3SHA1 (tinyscheme-1.35.tar.gz) = 02b740020bd68648f78207dd4a5e39bb57151ece 3SHA1 (tinyscheme-1.35.tar.gz) = 02b740020bd68648f78207dd4a5e39bb57151ece
4RMD160 (tinyscheme-1.35.tar.gz) = 4ad93b7545a1792ffc0b58a4552d8f7dc207279c 4RMD160 (tinyscheme-1.35.tar.gz) = 4ad93b7545a1792ffc0b58a4552d8f7dc207279c
5Size (tinyscheme-1.35.tar.gz) = 54363 bytes 5Size (tinyscheme-1.35.tar.gz) = 54363 bytes
6SHA1 (patch-aa) = 7aa69ae0316e59b091ff9a9ba5037266741296ae 6SHA1 (patch-aa) = b562ab28b5a41e5d7b87e1dda669771c26904132
7SHA1 (patch-ab) = a67d8db645c293863cf992df41aaf9d3f6bfe006 7SHA1 (patch-ab) = a67d8db645c293863cf992df41aaf9d3f6bfe006
cvs diff -r1.5 -r1.6 pkgsrc/lang/tinyscheme/patches/patch-aa (switch to unified diff)

--- pkgsrc/lang/tinyscheme/patches/patch-aa 2009/07/07 20:35:53 1.5
+++ pkgsrc/lang/tinyscheme/patches/patch-aa 2009/11/26 00:48:58 1.6
@@ -1,179 +1,179 @@ @@ -1,179 +1,179 @@
1$NetBSD: patch-aa,v 1.5 2009/07/07 20:35:53 agc Exp $ 1$NetBSD: patch-aa,v 1.6 2009/11/26 00:48:58 joerg Exp $
2 2
3--- makefile 2003-01-07 19:01:04.000000000 +0000 3--- makefile 2003-01-07 19:01:04.000000000 +0000
4+++ makefile 2005-03-24 16:19:11.000000000 +0000 4+++ makefile 2005-03-24 16:19:11.000000000 +0000
5@@ -1,84 +1,90 @@ 5@@ -1,84 +1,90 @@
6-# Makefile for TinyScheme  6-# Makefile for TinyScheme
7-# Time-stamp: <2002-06-24 14:13:27 gildea>  7-# Time-stamp: <2002-06-24 14:13:27 gildea>
8-  8-
9-# Windows/2000  9-# Windows/2000
10-#CC = cl -nologo  10-#CC = cl -nologo
11-#DEBUG= -W3 -Z7 -MD  11-#DEBUG= -W3 -Z7 -MD
12-#DL_FLAGS=  12-#DL_FLAGS=
13-#SYS_LIBS=  13-#SYS_LIBS=
14-#Osuf=obj  14-#Osuf=obj
15-#SOsuf=dll  15-#SOsuf=dll
16-#LIBsuf=.lib  16-#LIBsuf=.lib
17-#EXE_EXT=.exe  17-#EXE_EXT=.exe
18-#LD = link -nologo  18-#LD = link -nologo
19-#LDFLAGS = -debug -map -dll -incremental:no  19-#LDFLAGS = -debug -map -dll -incremental:no
20-#LIBPREFIX =  20-#LIBPREFIX =
21-#OUT = -out:$@  21-#OUT = -out:$@
22-#RM= -del  22-#RM= -del
23-#AR= echo  23-#AR= echo
24-  24-
25-# Unix, generally  25-# Unix, generally
26-CC = gcc -fpic  26-CC = gcc -fpic
27-DEBUG=-g -Wall -Wno-char-subscripts -O  27-DEBUG=-g -Wall -Wno-char-subscripts -O
28-Osuf=o  28-Osuf=o
29-SOsuf=so  29-SOsuf=so
30-LIBsuf=a  30-LIBsuf=a
31-EXE_EXT=  31-EXE_EXT=
32-LIBPREFIX=lib  32-LIBPREFIX=lib
33-OUT = -o $@  33-OUT = -o $@
34-RM= -rm -f  34-RM= -rm -f
35-AR= ar crs  35-AR= ar crs
36-  36-
37-# Linux  37-# Linux
38-LD = gcc  38-LD = gcc
39-LDFLAGS = -shared  39-LDFLAGS = -shared
40-DEBUG=-g -Wno-char-subscripts -O  40-DEBUG=-g -Wno-char-subscripts -O
41-SYS_LIBS= -ldl  41-SYS_LIBS= -ldl
42-PLATFORM_FEATURES= -DSUN_DL=1  42-PLATFORM_FEATURES= -DSUN_DL=1
43-  43-
44-  44-
45-# Solaris  45-# Solaris
46-#SYS_LIBS= -ldl -lc  46-#SYS_LIBS= -ldl -lc
47-#Osuf=o  47-#Osuf=o
48-#SOsuf=so  48-#SOsuf=so
49-#EXE_EXT=  49-#EXE_EXT=
50-#LD = ld  50-#LD = ld
51-#LDFLAGS = -G -Bsymbolic -z text  51-#LDFLAGS = -G -Bsymbolic -z text
52-#LIBPREFIX = lib  52-#LIBPREFIX = lib
53-#OUT = -o $@  53-#OUT = -o $@
54-  54-
55-FEATURES = $(PLATFORM_FEATURES) -DUSE_DL=1 -DUSE_MATH=0 -DUSE_ASCII_NAMES=0  55-FEATURES = $(PLATFORM_FEATURES) -DUSE_DL=1 -DUSE_MATH=0 -DUSE_ASCII_NAMES=0
56-  56-
57-OBJS = scheme.$(Osuf) dynload.$(Osuf)  57-OBJS = scheme.$(Osuf) dynload.$(Osuf)
58-  58-
59-LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf)  59-LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf)
60-STATICLIBTARGET = $(LIBPREFIX)tinyscheme.$(LIBsuf)  60-STATICLIBTARGET = $(LIBPREFIX)tinyscheme.$(LIBsuf)
61-  61-
62-all: $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)  62-all: $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)
63-  63-
64-%.$(Osuf): %.c  64-%.$(Osuf): %.c
65- $(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<  65- $(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<
66-  66-
67-$(LIBTARGET): $(OBJS)  67-$(LIBTARGET): $(OBJS)
68- $(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)  68- $(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)
69-  69-
70-scheme$(EXE_EXT): $(OBJS)  70-scheme$(EXE_EXT): $(OBJS)
71- $(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)  71- $(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
72-  72-
73-$(STATICLIBTARGET): $(OBJS)  73-$(STATICLIBTARGET): $(OBJS)
74- $(AR) $@ $(OBJS)  74- $(AR) $@ $(OBJS)
75-  75-
76-$(OBJS): scheme.h scheme-private.h opdefines.h  76-$(OBJS): scheme.h scheme-private.h opdefines.h
77-dynload.$(Osuf): dynload.h  77-dynload.$(Osuf): dynload.h
78-  78-
79-clean:  79-clean:
80- $(RM) $(OBJS) $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)  80- $(RM) $(OBJS) $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)
81- $(RM) tinyscheme.ilk tinyscheme.map tinyscheme.pdb tinyscheme.exp  81- $(RM) tinyscheme.ilk tinyscheme.map tinyscheme.pdb tinyscheme.exp
82- $(RM) scheme.ilk scheme.map scheme.pdb scheme.lib scheme.exp  82- $(RM) scheme.ilk scheme.map scheme.pdb scheme.lib scheme.exp
83- $(RM) *~  83- $(RM) *~
84-  84-
85-TAGS_SRCS = scheme.h scheme.c dynload.h dynload.c  85-TAGS_SRCS = scheme.h scheme.c dynload.h dynload.c
86-  86-
87-tags: TAGS  87-tags: TAGS
88-TAGS: $(TAGS_SRCS)  88-TAGS: $(TAGS_SRCS)
89- etags $(TAGS_SRCS)  89- etags $(TAGS_SRCS)
90+# Makefile for TinyScheme  90+# Makefile for TinyScheme
91+# Time-stamp: <2002-06-24 14:13:27 gildea>  91+# Time-stamp: <2002-06-24 14:13:27 gildea>
92+  92+
93+# Windows/2000  93+# Windows/2000
94+#CC = cl -nologo  94+#CC = cl -nologo
95+#DEBUG= -W3 -Z7 -MD  95+#DEBUG= -W3 -Z7 -MD
96+#DL_FLAGS=  96+#DL_FLAGS=
97+#SYS_LIBS=  97+#SYS_LIBS=
98+#Osuf=obj  98+#Osuf=obj
99+#SOsuf=dll  99+#SOsuf=dll
100+#LIBsuf=.lib 100+#LIBsuf=.lib
101+#EXE_EXT=.exe  101+#EXE_EXT=.exe
102+#LD = link -nologo  102+#LD = link -nologo
103+#LDFLAGS = -debug -map -dll -incremental:no  103+#LDFLAGS = -debug -map -dll -incremental:no
104+#LIBPREFIX =  104+#LIBPREFIX =
105+#OUT = -out:$@  105+#OUT = -out:$@
106+#RM= -del 106+#RM= -del
107+#AR= echo 107+#AR= echo
108+ 108+
109+# Unix, generally  109+# Unix, generally
110+CC = gcc 110+#CC = gcc
111+DEBUG=-g -Wall -Wno-char-subscripts -O  111+DEBUG=-g -Wall -Wno-char-subscripts -O
112+Osuf=o  112+Osuf=o
113+SOsuf=so  113+SOsuf=so
114+LIBsuf=a 114+LIBsuf=a
115+EXE_EXT= 115+EXE_EXT=
116+LIBPREFIX=lib 116+LIBPREFIX=lib
117+OUT = -o $@  117+OUT = -o $@
118+RM= -rm -f 118+RM= -rm -f
119+AR= ar crs 119+AR= ar crs
120+SYS_LIBS= -lm 120+SYS_LIBS= -lm
121+  121+
122+# Linux  122+# Linux
123+LD = gcc  123+LD = gcc
124+LDFLAGS = -shared  124+LDFLAGS = -shared
125+DEBUG=-g -Wno-char-subscripts -O 125+DEBUG=-g -Wno-char-subscripts -O
126+#SYS_LIBS= -ldl 126+#SYS_LIBS= -ldl
127+PLATFORM_FEATURES= -DSUN_DL=1 127+PLATFORM_FEATURES= -DSUN_DL=1
128+ 128+
129+  129+
130+# Solaris  130+# Solaris
131+#SYS_LIBS= -ldl -lc  131+#SYS_LIBS= -ldl -lc
132+#Osuf=o  132+#Osuf=o
133+#SOsuf=so  133+#SOsuf=so
134+#EXE_EXT=  134+#EXE_EXT=
135+#LD = ld  135+#LD = ld
136+#LDFLAGS = -G -Bsymbolic -z text  136+#LDFLAGS = -G -Bsymbolic -z text
137+#LIBPREFIX = lib  137+#LIBPREFIX = lib
138+#OUT = -o $@  138+#OUT = -o $@
139+  139+
140+DIRS= -DTINYSCHEMEPREFIX='"${PREFIX}"' -DTINYSCHEMEDIR='"/share/tinyscheme/"' 140+DIRS= -DTINYSCHEMEPREFIX='"${PREFIX}"' -DTINYSCHEMEDIR='"/share/tinyscheme/"'
141+FEATURES = ${DIRS} $(PLATFORM_FEATURES) -DUSE_DL=1 -DUSE_MATH=0 -DUSE_ASCII_NAMES=0  141+FEATURES = ${DIRS} $(PLATFORM_FEATURES) -DUSE_DL=1 -DUSE_MATH=0 -DUSE_ASCII_NAMES=0
142+  142+
143+OBJS = scheme.$(Osuf) dynload.$(Osuf)  143+OBJS = scheme.$(Osuf) dynload.$(Osuf)
144+  144+
145+LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf)  145+LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf)
146+STATICLIBTARGET = $(LIBPREFIX)tinyscheme.$(LIBsuf) 146+STATICLIBTARGET = $(LIBPREFIX)tinyscheme.$(LIBsuf)
147+ 147+
148+all: $(STATICLIBTARGET) scheme$(EXE_EXT) 148+all: $(STATICLIBTARGET) scheme$(EXE_EXT)
149+  149+
150+.c.o: 150+.c.o:
151+ ${LIBTOOL} --mode=compile ${CC} -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<  151+ ${LIBTOOL} --mode=compile ${CC} -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<
152+ 152+
153+scheme$(EXE_EXT): $(OBJS)  153+scheme$(EXE_EXT): $(OBJS)
154+ ${LIBTOOL} --mode=link ${CC} ${DEBUG} ${OBJS} ${SYS_LIBS} ${LIBS:.a=.la} -o scheme${EXE_EXT} 154+ ${LIBTOOL} --mode=link ${CC} ${DEBUG} ${OBJS} ${SYS_LIBS} ${LIBS:.a=.la} -o scheme${EXE_EXT}
155+ 155+
156+$(STATICLIBTARGET): $(OBJS) 156+$(STATICLIBTARGET): $(OBJS)
157+ ${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:35 157+ ${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:35
158+ 158+
159+install: all 159+install: all
160+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${STATICLIBTARGET:.a=.la} ${DESTDIR}${PREFIX}/lib 160+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${STATICLIBTARGET:.a=.la} ${DESTDIR}${PREFIX}/lib
161+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} scheme${EXE_EXT} ${DESTDIR}${PREFIX}/bin/tinyscheme 161+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} scheme${EXE_EXT} ${DESTDIR}${PREFIX}/bin/tinyscheme
162+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/tinyscheme 162+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/tinyscheme
163+ ${BSD_INSTALL_DATA} init.scm ${DESTDIR}${PREFIX}/share/tinyscheme 163+ ${BSD_INSTALL_DATA} init.scm ${DESTDIR}${PREFIX}/share/tinyscheme
164+ ${BSD_INSTALL_DATA} scheme.h ${DESTDIR}${PREFIX}/include/tinyscheme.h 164+ ${BSD_INSTALL_DATA} scheme.h ${DESTDIR}${PREFIX}/include/tinyscheme.h
165+ 165+
166+$(OBJS): scheme.h scheme-private.h opdefines.h 166+$(OBJS): scheme.h scheme-private.h opdefines.h
167+dynload.$(Osuf): dynload.h  167+dynload.$(Osuf): dynload.h
168+ 168+
169+clean:  169+clean:
170+ $(RM) $(OBJS) $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT) 170+ $(RM) $(OBJS) $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)
171+ $(RM) tinyscheme.ilk tinyscheme.map tinyscheme.pdb tinyscheme.exp 171+ $(RM) tinyscheme.ilk tinyscheme.map tinyscheme.pdb tinyscheme.exp
172+ $(RM) scheme.ilk scheme.map scheme.pdb scheme.lib scheme.exp 172+ $(RM) scheme.ilk scheme.map scheme.pdb scheme.lib scheme.exp
173+ $(RM) *~ 173+ $(RM) *~
174+ 174+
175+TAGS_SRCS = scheme.h scheme.c dynload.h dynload.c 175+TAGS_SRCS = scheme.h scheme.c dynload.h dynload.c
176+ 176+
177+tags: TAGS  177+tags: TAGS
178+TAGS: $(TAGS_SRCS)  178+TAGS: $(TAGS_SRCS)
179+ etags $(TAGS_SRCS)  179+ etags $(TAGS_SRCS)