summaryrefslogtreecommitdiff
path: root/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
blob: 3eac44c0dc6c87e54d924d0a089a6221e63d1e90 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
https://bugs.gentoo.org/622806
https://sourceforge.net/p/wrapper/patches/25/
--- a/src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
+++ b/src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--- a/src/c/Makefile-linux-armhf-32.make.old	2014-07-21 10:48:31.000000000 +0200
+++ b/src/c/Makefile-linux-armhf-32.make	2014-07-21 10:51:05.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--- a/src/c/Makefile-linux-ia-64.make.old	2014-07-21 10:48:31.000000000 +0200
+++ b/src/c/Makefile-linux-ia-64.make	2014-07-21 10:51:37.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--- a/src/c/Makefile-linux-ppc-32.make.old	2014-07-21 10:48:31.000000000 +0200
+++ b/src/c/Makefile-linux-ppc-32.make	2014-07-21 10:52:05.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--- a/src/c/Makefile-linux-ppc-64.make.old	2014-07-21 10:48:31.000000000 +0200
+++ b/src/c/Makefile-linux-ppc-64.make	2014-07-21 10:52:45.000000000 +0200
@@ -33,14 +33,14 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--- a/src/c/Makefile-linux-x86-32.make.old	2014-07-21 10:48:31.000000000 +0200
+++ b/src/c/Makefile-linux-x86-32.make	2014-07-21 10:53:39.000000000 +0200
@@ -36,17 +36,17 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 
 testsuite: $(testsuite_SOURCE)
-	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
--- a/src/c/Makefile-linux-x86-64.make.old	2014-07-21 10:48:31.000000000 +0200
+++ b/src/c/Makefile-linux-x86-64.make	2014-07-21 10:54:16.000000000 +0200
@@ -36,17 +36,17 @@
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
 
 testsuite: $(testsuite_SOURCE)
-	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c 
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 	tr ' ' '\012' < .deps/$(*F).pp \
 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \