1 |
robbat2 08/09/29 04:13:49 |
2 |
|
3 |
Added: OpenSRF-0.9-buildfix.patch |
4 |
Log: |
5 |
Initial commit. Ebuild by Robin H Johnson <robbat2@g.o>. Dependancy for Evergreen ILS. Still needs more pkg_config instructions. |
6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-libs/OpenSRF/files/OpenSRF-0.9-buildfix.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-0.9-buildfix.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-0.9-buildfix.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: OpenSRF-0.9-buildfix.patch |
15 |
=================================================================== |
16 |
Clean up the build system: |
17 |
- Do NOT use anything outside the directory like an absolute /tmp |
18 |
- Use $(MAKE) to get parallel support |
19 |
- $(DESTDIR) fun |
20 |
- Disable the apache module install, do it from the ebuild |
21 |
|
22 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
23 |
|
24 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/Makefile OpenSRF-0.9/Makefile |
25 |
--- OpenSRF-0.9.orig/Makefile 2007-06-21 13:45:35.000000000 -0700 |
26 |
+++ OpenSRF-0.9/Makefile 2008-09-28 21:01:49.000000000 -0700 |
27 |
@@ -1,15 +1,18 @@ |
28 |
all: |
29 |
@echo -e "\n * Run 'make verbose' to see full make output\n" |
30 |
- source install.conf && make -s -C src all |
31 |
+ source install.conf && $(MAKE) -s -C src all |
32 |
|
33 |
verbose: |
34 |
- source install.conf && make -C src all |
35 |
+ source install.conf && $(MAKE) -C src all |
36 |
|
37 |
jserver: |
38 |
- source install.conf && make -s -C src jserver |
39 |
+ source install.conf && $(MAKE) -s -C src jserver |
40 |
|
41 |
install: |
42 |
- source install.conf && make -s -C src install |
43 |
+ source install.conf && $(MAKE) -s -C src install |
44 |
+ |
45 |
+install-verbose: |
46 |
+ source install.conf && $(MAKE) -C src install |
47 |
|
48 |
jserver-install: |
49 |
source install.conf && make -s -C src jserver-install |
50 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/Makefile OpenSRF-0.9/src/Makefile |
51 |
--- OpenSRF-0.9.orig/src/Makefile 2007-07-02 07:24:04.000000000 -0700 |
52 |
+++ OpenSRF-0.9/src/Makefile 2008-09-28 21:00:08.000000000 -0700 |
53 |
@@ -1,15 +1,17 @@ |
54 |
# TOP level 'src' makefile for OpenSRF |
55 |
|
56 |
|
57 |
-export TMPDIR = $(TMP)/opensrf |
58 |
export OPENSRF = opensrf |
59 |
export BINDIR = $(PREFIX)/bin |
60 |
export LIBDIR = $(PREFIX)/lib |
61 |
export PERLDIR = $(LIBDIR)/perl5 |
62 |
export INCLUDEDIR = $(PREFIX)/include |
63 |
|
64 |
+export BUILDDIR = ../../build |
65 |
+export BUILDDIR_SHALLOW = ../build |
66 |
export LDLIBS += |
67 |
-export LDFLAGS += -Wl,-rpath=$(LIBDIR) -L $(TMPDIR) -L . |
68 |
+export LDFLAGS += -Wl,-rpath=$(LIBDIR) -L $(BUILDDIR) -L . |
69 |
+export CFLAGS += -D_LARGEFILE64_SOURCE |
70 |
export CFLAGS += -pipe -g -Wall -O2 -fPIC -I ../../include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \ |
71 |
-I$(LIBXML2_HEADERS)/libxml -I$(APR_HEADERS) |
72 |
|
73 |
@@ -35,31 +37,31 @@ |
74 |
# -------------------------------------------------------------------------------- |
75 |
|
76 |
prep: |
77 |
- mkdir -p $(TMPDIR) |
78 |
+ mkdir -p $(BUILDDIR_SHALLOW) |
79 |
|
80 |
objson/libobjson.so: prep |
81 |
@echo $@ |
82 |
- make -C objson |
83 |
+ $(MAKE) -C objson |
84 |
|
85 |
opensrf: objson/libobjson.so |
86 |
- make -C libopensrf |
87 |
- make -C c-apps |
88 |
+ $(MAKE) -C libopensrf |
89 |
+ $(MAKE) -C c-apps |
90 |
|
91 |
router: opensrf |
92 |
@echo $@ |
93 |
- make -C router |
94 |
+ $(MAKE) -C router |
95 |
|
96 |
srfsh: opensrf |
97 |
@echo $@ |
98 |
- make -C srfsh |
99 |
+ $(MAKE) -C srfsh |
100 |
|
101 |
gateway: opensrf |
102 |
@echo $@ |
103 |
- make -C gateway |
104 |
+ $(MAKE) -C gateway |
105 |
|
106 |
jserver: opensrf |
107 |
@echo $@ |
108 |
- make -C jserver |
109 |
+ $(MAKE) -C jserver |
110 |
|
111 |
|
112 |
# -------------------------------------------------------------------------------- |
113 |
@@ -69,60 +71,60 @@ |
114 |
# make sure the install directories exist |
115 |
install-prep: |
116 |
@echo $@ |
117 |
- mkdir -p $(LIBDIR) |
118 |
- mkdir -p $(BINDIR) |
119 |
- mkdir -p $(PERLDIR) |
120 |
- mkdir -p $(INCLUDEDIR) |
121 |
- mkdir -p $(ETCDIR) |
122 |
+ mkdir -p $(DESTDIR)$(LIBDIR) |
123 |
+ mkdir -p $(DESTDIR)$(BINDIR) |
124 |
+ mkdir -p $(DESTDIR)$(PERLDIR) |
125 |
+ mkdir -p $(DESTDIR)$(INCLUDEDIR) |
126 |
+ mkdir -p $(DESTDIR)$(ETCDIR) |
127 |
|
128 |
objson-install: install-prep |
129 |
@echo $@ |
130 |
- make -C objson install |
131 |
+ $(MAKE) -C objson install |
132 |
|
133 |
# installs libopensrf.so, opensrf-c, headers, example configs, and osrf_ctl.sh |
134 |
opensrf-install: objson-install |
135 |
@echo $@ |
136 |
- cp $(TMPDIR)/libopensrf.so $(LIBDIR)/libopensrf.so |
137 |
- cp -r ../include/opensrf $(INCLUDEDIR) |
138 |
- cp libopensrf/opensrf $(BINDIR)/opensrf-c |
139 |
- make -C c-apps install |
140 |
- cp ../bin/osrf_ctl.sh $(BINDIR) |
141 |
- cp ../examples/opensrf.xml.example $(ETCDIR) |
142 |
- cp ../examples/opensrf_core.xml.example $(ETCDIR) |
143 |
- cp ../examples/srfsh.xml.example $(ETCDIR) |
144 |
+ cp $(BUILDDIR_SHALLOW)/libopensrf.so $(DESTDIR)$(LIBDIR)/libopensrf.so |
145 |
+ cp -r ../include/opensrf $(DESTDIR)$(INCLUDEDIR) |
146 |
+ cp libopensrf/opensrf $(DESTDIR)$(BINDIR)/opensrf-c |
147 |
+ $(MAKE) -C c-apps install |
148 |
+ cp ../bin/osrf_ctl.sh $(DESTDIR)$(BINDIR) |
149 |
+ cp ../examples/opensrf.xml.example $(DESTDIR)$(ETCDIR) |
150 |
+ cp ../examples/opensrf_core.xml.example $(DESTDIR)$(ETCDIR) |
151 |
+ cp ../examples/srfsh.xml.example $(DESTDIR)$(ETCDIR) |
152 |
|
153 |
gateway-install: install-prep opensrf-install |
154 |
@echo $@ |
155 |
- make -C gateway install |
156 |
+ $(MAKE) -C gateway install |
157 |
|
158 |
router-install: install-prep opensrf-install |
159 |
@echo $@ |
160 |
- make -C router install |
161 |
+ $(MAKE) -C router install |
162 |
|
163 |
srfsh-install: install-prep opensrf-install |
164 |
@echo $@ |
165 |
- make -C srfsh install |
166 |
+ $(MAKE) -C srfsh install |
167 |
|
168 |
jserver-install: install-prep |
169 |
@echo $@ |
170 |
- make -C jserver install |
171 |
+ $(MAKE) -C jserver install |
172 |
|
173 |
perl-install: install-prep |
174 |
@echo $@ |
175 |
- cp -r perlmods/* $(PERLDIR)/ |
176 |
+ cp -r perlmods/* $(DESTDIR)$(PERLDIR)/ |
177 |
|
178 |
|
179 |
# -------------------------------------------------------------------------------- |
180 |
# CLEAN |
181 |
# -------------------------------------------------------------------------------- |
182 |
clean: |
183 |
- make -C libopensrf clean |
184 |
- make -C router clean |
185 |
- make -C gateway clean |
186 |
- make -C jserver clean |
187 |
- make -C objson clean |
188 |
- make -C srfsh clean |
189 |
- make -C c-apps clean |
190 |
- /bin/rm -rf $(TMPDIR) *.o |
191 |
+ $(MAKE) -C libopensrf clean |
192 |
+ $(MAKE) -C router clean |
193 |
+ $(MAKE) -C gateway clean |
194 |
+ $(MAKE) -C jserver clean |
195 |
+ $(MAKE) -C objson clean |
196 |
+ $(MAKE) -C srfsh clean |
197 |
+ $(MAKE) -C c-apps clean |
198 |
+ /bin/rm -rf $(BUILDDIR_SHALLOW) *.o |
199 |
|
200 |
|
201 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/c-apps/Makefile OpenSRF-0.9/src/c-apps/Makefile |
202 |
--- OpenSRF-0.9.orig/src/c-apps/Makefile 2005-09-12 06:33:26.000000000 -0700 |
203 |
+++ OpenSRF-0.9/src/c-apps/Makefile 2008-09-28 21:00:08.000000000 -0700 |
204 |
@@ -8,18 +8,18 @@ |
205 |
osrf_version.o: osrf_version.c |
206 |
|
207 |
osrf_math.so: osrf_math.o |
208 |
- $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_math.o -o $(TMPDIR)/osrf_math.so |
209 |
+ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_math.o -o osrf_math.so |
210 |
|
211 |
osrf_dbmath.so: osrf_dbmath.o |
212 |
- $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_dbmath.o -o $(TMPDIR)/osrf_dbmath.so |
213 |
+ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_dbmath.o -o osrf_dbmath.so |
214 |
|
215 |
osrf_version.so: osrf_version.o |
216 |
- $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_version.o -o $(TMPDIR)/osrf_version.so |
217 |
+ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_version.o -o osrf_version.so |
218 |
|
219 |
install: |
220 |
- cp $(TMPDIR)/osrf_math.so $(LIBDIR)/ |
221 |
- cp $(TMPDIR)/osrf_dbmath.so $(LIBDIR)/ |
222 |
- cp $(TMPDIR)/osrf_version.so $(LIBDIR)/ |
223 |
+ cp osrf_math.so $(DESTDIR)$(LIBDIR) |
224 |
+ cp osrf_dbmath.so $(DESTDIR)$(LIBDIR) |
225 |
+ cp osrf_version.so $(DESTDIR)$(LIBDIR) |
226 |
|
227 |
clean: |
228 |
rm -f *.o *.so |
229 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/gateway/Makefile OpenSRF-0.9/src/gateway/Makefile |
230 |
--- OpenSRF-0.9.orig/src/gateway/Makefile 2006-04-14 08:17:22.000000000 -0700 |
231 |
+++ OpenSRF-0.9/src/gateway/Makefile 2008-09-28 21:03:01.000000000 -0700 |
232 |
@@ -2,14 +2,12 @@ |
233 |
CFLAGS += -DASSUME_STATELESS |
234 |
LDLIBS += -lobjson -lopensrf |
235 |
|
236 |
-all: osrf_json_gateway.so copy |
237 |
+all: osrf_json_gateway.so |
238 |
|
239 |
+#robbat2 - DISABLED, we will do this inside the ebuild |
240 |
install: |
241 |
- $(APXS2) -i -a -n osrf_json_gateway osrf_json_gateway.so |
242 |
- cp apachetools.h $(INCLUDEDIR)/opensrf/ |
243 |
- |
244 |
-copy: |
245 |
- cp apachetools.h $(TMPDIR) |
246 |
+ cp apachetools.h $(DESTDIR)$(INCLUDEDIR)/opensrf/ |
247 |
+# $(APXS2) -i -a -n osrf_json_gateway osrf_json_gateway.so |
248 |
|
249 |
apachetools.o: apachetools.h apachetools.c |
250 |
$(CC) -c $(CFLAGS) apachetools.c -o $@ |
251 |
@@ -17,9 +15,8 @@ |
252 |
osrf_json_gateway.o: osrf_json_gateway.c |
253 |
$(CC) -c $(CFLAGS) osrf_json_gateway.c -o $@ |
254 |
|
255 |
-osrf_json_gateway.so: copy apachetools.o osrf_json_gateway.o |
256 |
+osrf_json_gateway.so: apachetools.o osrf_json_gateway.o |
257 |
$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared -W1 apachetools.o osrf_json_gateway.o -o osrf_json_gateway.so |
258 |
|
259 |
- |
260 |
clean: |
261 |
/bin/rm -f *.o *.so |
262 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/jserver/Makefile OpenSRF-0.9/src/jserver/Makefile |
263 |
--- OpenSRF-0.9.orig/src/jserver/Makefile 2005-10-10 13:22:30.000000000 -0700 |
264 |
+++ OpenSRF-0.9/src/jserver/Makefile 2008-09-28 21:00:08.000000000 -0700 |
265 |
@@ -10,7 +10,7 @@ |
266 |
osrf_chat_main.o: osrf_chat_main.c |
267 |
|
268 |
install: |
269 |
- cp chopchop $(BINDIR) |
270 |
+ cp chopchop $(DESTDIR)$(BINDIR) |
271 |
|
272 |
clean: |
273 |
/bin/rm -f *.o chopchop |
274 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/libopensrf/Makefile OpenSRF-0.9/src/libopensrf/Makefile |
275 |
--- OpenSRF-0.9.orig/src/libopensrf/Makefile 2007-06-21 09:22:02.000000000 -0700 |
276 |
+++ OpenSRF-0.9/src/libopensrf/Makefile 2008-09-28 21:00:08.000000000 -0700 |
277 |
@@ -39,10 +39,9 @@ |
278 |
@echo $@ |
279 |
$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lopensrf opensrf.o -o $@ |
280 |
|
281 |
- |
282 |
# Build the OpenSRF library |
283 |
libopensrf.so: $(TARGETS) |
284 |
- $(CC) -shared -W1 $(LDFLAGS) $(LDLIBS) $(TARGETS) -o $(TMPDIR)/libopensrf.so |
285 |
+ $(CC) -shared -W1 $(LDFLAGS) $(LDLIBS) $(TARGETS) -o $(BUILDDIR)/libopensrf.so |
286 |
|
287 |
|
288 |
opensrf.o: opensrf.c |
289 |
@@ -70,4 +69,3 @@ |
290 |
|
291 |
clean: |
292 |
/bin/rm -f *.o libopensrf.so opensrf |
293 |
- |
294 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/objson/Makefile OpenSRF-0.9/src/objson/Makefile |
295 |
--- OpenSRF-0.9.orig/src/objson/Makefile 2007-06-21 09:19:20.000000000 -0700 |
296 |
+++ OpenSRF-0.9/src/objson/Makefile 2008-09-28 21:00:08.000000000 -0700 |
297 |
@@ -27,7 +27,7 @@ |
298 |
# -------------------------------------------------------------------- |
299 |
|
300 |
OBJS = utils.o json2xml.o object.o json_parser.o xml2json.o |
301 |
-CFLAGS += -DSTRICT_JSON_WRITE -DOSRF_DISABLE_MD5 |
302 |
+CFLAGS += -DSTRICT_JSON_WRITE -DOSRF_DISABLE_MD5 -I../../include |
303 |
TARGETS = object.o json_parser.o json2xml.o xml2json.o ../libopensrf/utils.o ../libopensrf/md5.o |
304 |
JSON_INC = ../../include/objson |
305 |
|
306 |
@@ -42,11 +42,11 @@ |
307 |
../libopensrf/md5.o: ../libopensrf/md5.c ../../include/opensrf/md5.h |
308 |
|
309 |
install: |
310 |
- cp -r ../../include/objson $(INCLUDEDIR) |
311 |
- cp $(TMPDIR)/libobjson.so $(LIBDIR)/libobjson.so |
312 |
+ cp -r ../../include/objson $(DESTDIR)$(INCLUDEDIR) |
313 |
+ cp $(BUILDDIR)/libobjson.so $(DESTDIR)$(LIBDIR)/libobjson.so |
314 |
|
315 |
libobjson.so: $(TARGETS) |
316 |
- $(CC) -shared -W1 $(TARGETS) -o $(TMPDIR)/libobjson.so |
317 |
+ $(CC) -shared -W1 $(TARGETS) -o $(BUILDDIR)/libobjson.so |
318 |
|
319 |
clean: |
320 |
/bin/rm -f *.o *.so |
321 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/router/Makefile OpenSRF-0.9/src/router/Makefile |
322 |
--- OpenSRF-0.9.orig/src/router/Makefile 2005-10-03 15:19:41.000000000 -0700 |
323 |
+++ OpenSRF-0.9/src/router/Makefile 2008-09-28 21:00:08.000000000 -0700 |
324 |
@@ -7,7 +7,7 @@ |
325 |
#osrf_router |
326 |
|
327 |
install: |
328 |
- cp opensrf_router $(BINDIR) |
329 |
+ cp opensrf_router $(DESTDIR)$(BINDIR) |
330 |
|
331 |
#opensrf_router: router.o |
332 |
# $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) router.o -o $@ |
333 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/srfsh/Makefile OpenSRF-0.9/src/srfsh/Makefile |
334 |
--- OpenSRF-0.9.orig/src/srfsh/Makefile 2005-09-01 09:15:27.000000000 -0700 |
335 |
+++ OpenSRF-0.9/src/srfsh/Makefile 2008-09-28 21:00:08.000000000 -0700 |
336 |
@@ -9,7 +9,7 @@ |
337 |
srfsh.o: srfsh.c srfsh.h |
338 |
|
339 |
install: |
340 |
- cp srfsh $(BINDIR) |
341 |
+ cp srfsh $(DESTDIR)$(BINDIR) |
342 |
|
343 |
clean: |
344 |
/bin/rm -f *.o srfsh |