Fix libiconv InstallDev section and install headers and libraries to a standard location
[openwrt/svn-archive/archive.git] / ipv6 / dhcp6 / patches / 01-remove_debug.patch
1 diff -urN orig/dhcp6-1.0/client/Makefile dhcp6-1.0/client/Makefile
2 --- orig/dhcp6-1.0/client/Makefile 2025-06-28 23:21:40.000000000 +0200
3 +++ dhcp6-1.0/client/Makefile 2005-12-13 13:43:11.000000000 +0100
4 @@ -1,42 +1,40 @@
5 -
6 -CC = gcc
7 STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h states.h timer_val.h constants.h macros.h status_codes.h
8 OBJECT_FILES = client.o solicit.o clilib.o parse.o request.o decline.o renew.o rebind.o release.o
9 HEADER_FILES = solicit.h clilib.h parse.h request.h decline.h renew.h rebind.h release.h
10 -
11 +IFLAGS = -I$(STAGING_DIR)/usr/include
12
13 dhcpv6_client : dhcpv6_client.c cli
14 - $(CC) -g3 dhcpv6_client.c -o dhcpv6_client
15 + $(CC) $(IFLAGS) dhcpv6_client.c -o dhcpv6_client
16
17 cli : $(OBJECT_FILES)
18 - $(CC) -g3 $(OBJECT_FILES) -o cli -lncurses
19 + $(CC) $(IFLAGS) $(OBJECT_FILES) -o cli -L$(STAGING_DIR)/usr/lib -lncurses
20
21 client.o : client.c $(STD_HEADERS) $(HEADER_FILES)
22 - $(CC) -g3 -c client.c -o client.o
23 + $(CC) $(IFLAGS) -c client.c -o client.o
24
25 release.o : release.c release.h clilib.h
26 - $(CC) -g3 -c release.c -o release.o
27 + $(CC) $(IFLAGS) -c release.c -o release.o
28
29 rebind.o : rebind.c rebind.h clilib.h
30 - $(CC) -g3 -c rebind.c -o rebind.o
31 + $(CC) $(IFLAGS) -c rebind.c -o rebind.o
32
33 renew.o : renew.c renew.h clilib.h
34 - $(CC) -g3 -c renew.c -o renew.o
35 + $(CC) $(IFLAGS) -c renew.c -o renew.o
36
37 request.o : request.c request.h clilib.h
38 - $(CC) -g3 -c request.c -o request.o
39 + $(CC) $(IFLAGS) -c request.c -o request.o
40
41 decline.o : decline.c decline.h clilib.h parse.h solicit.h
42 - $(CC) -g3 -c decline.c -o decline.o
43 + $(CC) $(IFLAGS) -c decline.c -o decline.o
44
45 solicit.o : solicit.c solicit.h clilib.h parse.h
46 - $(CC) -g3 -c solicit.c -o solicit.o
47 + $(CC) $(IFLAGS) -c solicit.c -o solicit.o
48
49 clilib.o : clilib.c clilib.h parse.h
50 - $(CC) -g3 -c clilib.c -o clilib.o
51 + $(CC) $(IFLAGS) -c clilib.c -o clilib.o
52
53 parse.o : parse.c parse.h clilib.h
54 - $(CC) -g3 -c parse.c -o parse.o
55 + $(CC) $(IFLAGS) -c parse.c -o parse.o
56
57 clean :
58 rm -f *.o cli dhcpv6_client
59 diff -urN orig/dhcp6-1.0/client/clilib.c dhcp6-1.0/client/clilib.c
60 --- orig/dhcp6-1.0/client/clilib.c 2025-06-28 23:21:40.000000000 +0200
61 +++ dhcp6-1.0/client/clilib.c 2005-12-13 13:42:43.000000000 +0100
62 @@ -554,7 +554,7 @@
63
64 void generate_trans_id (u_int32_t *trans_id)
65 {
66 - extern u_int32_t g_trans_id;
67 + extern int g_trans_id;
68 time_t t;
69 srand (time (&t));
70 *trans_id = 0;
71 @@ -890,9 +890,7 @@
72 break;
73
74 default :
75 -#if DEBUG == 3
76 printf ("Unrecognized DUID type\n");
77 -#endif
78 }
79
80 next_opt = (struct OPTIONS *) malloc (sizeof (struct OPTIONS));
81 diff -urN orig/dhcp6-1.0/server/Makefile dhcp6-1.0/server/Makefile
82 --- orig/dhcp6-1.0/server/Makefile 2002-06-28 14:50:04.000000000 +0200
83 +++ dhcp6-1.0/server/Makefile 2005-12-13 11:35:53.000000000 +0100
84 @@ -1,27 +1,26 @@
85 -CC = gcc
86 STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h macros.h status_codes.h constants.h
87 OBJECT_FILES = server.o lib.o advertise.o parse.o leases.o reply.o
88
89 serv: $(OBJECT_FILES)
90 - $(CC) -g3 $(OBJECT_FILES) -o serv
91 + $(CC) $(OBJECT_FILES) -o serv
92
93 lib.o: lib.c lib.h $(STD_HEADERS)
94 - $(CC) -g3 -c lib.c -o lib.o
95 + $(CC) -c lib.c -o lib.o
96
97 parse.o: parse.c parse.h $(STD_HEADERS)
98 - $(CC) -g3 -c parse.c -o parse.o
99 + $(CC) -c parse.c -o parse.o
100
101 leases.o: leases.c leases.h $(STD_HEADERS)
102 - $(CC) -g3 -c leases.c -o leases.o
103 + $(CC) -c leases.c -o leases.o
104
105 advertise.o: advertise.c advertise.h $(STD_HEADERS)
106 - $(CC) -g3 -c advertise.c -o advertise.o
107 + $(CC) -c advertise.c -o advertise.o
108
109 reply.o: reply.c reply.h $(STD_HEADERS)
110 - $(CC) -g3 -c reply.c -o reply.o
111 + $(CC) -c reply.c -o reply.o
112
113 server.o: server.c lib.h advertise.h reply.h leases.h parse.h $(STD_HEADERS)
114 - $(CC) -g3 -c server.c -o server.o
115 + $(CC) -c server.c -o server.o
116
117 clean:
118 rm -f *.o serv