| @@ -1,19 +1,19 @@ | | | @@ -1,19 +1,19 @@ |
1 | $NetBSD: patch-src_Makefile,v 1.2 2020/12/18 19:58:31 nia Exp $ | | 1 | $NetBSD: patch-src_Makefile,v 1.3 2021/04/09 14:18:12 nia Exp $ |
2 | | | 2 | |
3 | - Don't override CC/CFLAGS/LDFLAGS. | | 3 | - Don't override CC/CFLAGS/LDFLAGS. |
4 | - Use libtool to build shared libraries. | | 4 | - Use libtool to build shared libraries. |
5 | | | 5 | |
6 | --- src/Makefile.orig 2020-11-10 18:39:37.000000000 +0000 | | 6 | --- src/Makefile.orig 2021-02-09 18:47:17.000000000 +0000 |
7 | +++ src/Makefile | | 7 | +++ src/Makefile |
8 | @@ -6,9 +6,8 @@ | | 8 | @@ -6,9 +6,8 @@ |
9 | # Your platform. See PLATS for possible values. | | 9 | # Your platform. See PLATS for possible values. |
10 | PLAT= guess | | 10 | PLAT= guess |
11 | | | 11 | |
12 | -CC= gcc -std=gnu99 | | 12 | -CC= gcc -std=gnu99 |
13 | -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) | | 13 | -CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) |
14 | -LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) | | 14 | -LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) |
15 | +CFLAGS+= -std=gnu99 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) | | 15 | +CFLAGS+= -std=gnu99 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) |
16 | +LDFLAGS+= $(SYSLDFLAGS) $(MYLDFLAGS) | | 16 | +LDFLAGS+= $(SYSLDFLAGS) $(MYLDFLAGS) |
17 | LIBS= -lm $(SYSLIBS) $(MYLIBS) | | 17 | LIBS= -lm $(SYSLIBS) $(MYLIBS) |
18 | | | 18 | |
19 | AR= ar rcu | | 19 | AR= ar rcu |
| @@ -51,28 +51,28 @@ $NetBSD: patch-src_Makefile,v 1.2 2020/1 | | | @@ -51,28 +51,28 @@ $NetBSD: patch-src_Makefile,v 1.2 2020/1 |
51 | - $(AR) $@ $(BASE_O) | | 51 | - $(AR) $@ $(BASE_O) |
52 | - $(RANLIB) $@ | | 52 | - $(RANLIB) $@ |
53 | + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(BASE_O) -rpath $(PREFIX)/lib -version-info 5:4 $(LIBS) | | 53 | + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(BASE_O) -rpath $(PREFIX)/lib -version-info 5:4 $(LIBS) |
54 | | | 54 | |
55 | $(LUA_T): $(LUA_O) $(LUA_A) | | 55 | $(LUA_T): $(LUA_O) $(LUA_A) |
56 | - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) | | 56 | - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) |
57 | + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) | | 57 | + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) |
58 | | | 58 | |
59 | $(LUAC_T): $(LUAC_O) $(LUA_A) | | 59 | $(LUAC_T): $(LUAC_O) $(LUA_A) |
60 | - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) | | 60 | - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) |
61 | + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) | | 61 | + $(LIBTOOL) --quiet --tag=CC --mode=link $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) |
62 | | | 62 | |
63 | test: | | 63 | test: |
64 | ./lua -v | | 64 | ./$(LUA_T) -v |
65 | @@ -141,16 +144,6 @@ SunOS solaris: | | 65 | @@ -143,16 +146,6 @@ SunOS solaris: |
66 | # Targets that do not create files (not all makes understand .PHONY). | | 66 | # Targets that do not create files (not all makes understand .PHONY). |
67 | .PHONY: all $(PLATS) help test clean default o a depend echo | | 67 | .PHONY: all $(PLATS) help test clean default o a depend echo |
68 | | | 68 | |
69 | -# Compiler modules may use special flags. | | 69 | -# Compiler modules may use special flags. |
70 | -llex.o: | | 70 | -llex.o: |
71 | - $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c | | 71 | - $(CC) $(CFLAGS) $(CMCFLAGS) -c llex.c |
72 | - | | 72 | - |
73 | -lparser.o: | | 73 | -lparser.o: |
74 | - $(CC) $(CFLAGS) $(CMCFLAGS) -c lparser.c | | 74 | - $(CC) $(CFLAGS) $(CMCFLAGS) -c lparser.c |
75 | - | | 75 | - |
76 | -lcode.o: | | 76 | -lcode.o: |
77 | - $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c | | 77 | - $(CC) $(CFLAGS) $(CMCFLAGS) -c lcode.c |
78 | - | | 78 | - |