| 1 |
robbat2 09/11/10 08:39:27 |
| 2 |
|
| 3 |
Added: OpenSRF-1.0.7-buildfix.patch |
| 4 |
Log: |
| 5 |
More work on Evergreen, a new spin of the OpenSRF package. |
| 6 |
(Portage version: 2.2_rc49/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-libs/OpenSRF/files/OpenSRF-1.0.7-buildfix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-1.0.7-buildfix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-1.0.7-buildfix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: OpenSRF-1.0.7-buildfix.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nuar OpenSRF-1.0.7.orig/bin/osrf_ctl.sh OpenSRF-1.0.7/bin/osrf_ctl.sh |
| 17 |
--- OpenSRF-1.0.7.orig/bin/osrf_ctl.sh 2009-06-11 13:12:13.000000000 +0000 |
| 18 |
+++ OpenSRF-1.0.7/bin/osrf_ctl.sh 2009-11-10 08:20:37.233637281 +0000 |
| 19 |
@@ -87,8 +87,9 @@ |
| 20 |
esac; |
| 21 |
done |
| 22 |
|
| 23 |
-OSRF_CONFIG=`which osrf_config` |
| 24 |
-[ -z "$OSRF_CONFIG" ] && OSRF_CONFIG=`find $BASEDIR -name osrf_config` |
| 25 |
+#OSRF_CONFIG=`which osrf_config` |
| 26 |
+#[ -z "$OSRF_CONFIG" ] && OSRF_CONFIG=`find $BASEDIR -name osrf_config` |
| 27 |
+OSRF_CONFIG=/usr/bin/osrf_config |
| 28 |
|
| 29 |
[ -z "$OPT_CONFIG" ] && OPT_CONFIG=`$OSRF_CONFIG --sysconfdir`/opensrf_core.xml; |
| 30 |
if [ ! -r "$OPT_CONFIG" ]; then |
| 31 |
diff -Nuar OpenSRF-1.0.7.orig/Makefile.am OpenSRF-1.0.7/Makefile.am |
| 32 |
--- OpenSRF-1.0.7.orig/Makefile.am 2008-10-27 05:10:21.000000000 +0000 |
| 33 |
+++ OpenSRF-1.0.7/Makefile.am 2009-11-10 08:19:16.190311593 +0000 |
| 34 |
@@ -115,14 +115,14 @@ |
| 35 |
SUBDIRS = src |
| 36 |
|
| 37 |
jserver: |
| 38 |
- make -s -C src jserver |
| 39 |
+ $(MAKE) -s -C src jserver |
| 40 |
|
| 41 |
jserver-install: |
| 42 |
- make -s -C src jserver-install |
| 43 |
+ $(MAKE) -s -C src jserver-install |
| 44 |
|
| 45 |
javascript-install: |
| 46 |
- make -s -C src javascript-install |
| 47 |
+ $(MAKE) -s -C src javascript-install |
| 48 |
|
| 49 |
install-data-hook: |
| 50 |
- cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h |
| 51 |
+ cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h |
| 52 |
|
| 53 |
diff -Nuar OpenSRF-1.0.7.orig/src/gateway/Makefile.am OpenSRF-1.0.7/src/gateway/Makefile.am |
| 54 |
--- OpenSRF-1.0.7.orig/src/gateway/Makefile.am 2008-08-18 19:14:00.000000000 +0000 |
| 55 |
+++ OpenSRF-1.0.7/src/gateway/Makefile.am 2009-11-10 08:19:15.250311793 +0000 |
| 56 |
@@ -16,16 +16,25 @@ |
| 57 |
|
| 58 |
AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) |
| 59 |
AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf |
| 60 |
+APACHE_DEPS = apachetools.c apachetools.h |
| 61 |
+LIBS=libopensrf.so |
| 62 |
+TARGETS = osrf_json_gateway.la osrf_http_translator.la |
| 63 |
|
| 64 |
-install-exec-local: |
| 65 |
- if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \ |
| 66 |
- then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \ |
| 67 |
- >> `apxs2 -q SYSCONFDIR`/httpd.conf; \ |
| 68 |
- fi |
| 69 |
- $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so |
| 70 |
- $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so |
| 71 |
- $(APXS2) -i -a @srcdir@/osrf_json_gateway.la |
| 72 |
- $(APXS2) -i -a @srcdir@/osrf_http_translator.la |
| 73 |
+all: $(TARGETS) |
| 74 |
+ |
| 75 |
+osrf_json_gateway.la: osrf_json_gateway.c $(APACHE_DEPS) |
| 76 |
+ $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS) |
| 77 |
+ |
| 78 |
+osrf_http_translator.la: osrf_http_translator.c $(APACHE_DEPS) |
| 79 |
+ $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS) |
| 80 |
+ |
| 81 |
+#install-exec-local: $(TARGETS) |
| 82 |
+# if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \ |
| 83 |
+# then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \ |
| 84 |
+# >> `apxs2 -q SYSCONFDIR`/httpd.conf; \ |
| 85 |
+# fi |
| 86 |
+# $(APXS2) -i -a osrf_json_gateway.la |
| 87 |
+# $(APXS2) -i -a osrf_http_translator.la |
| 88 |
|
| 89 |
clean-local: |
| 90 |
rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo |
| 91 |
diff -Nuar OpenSRF-1.0.7.orig/src/java/Makefile.am OpenSRF-1.0.7/src/java/Makefile.am |
| 92 |
--- OpenSRF-1.0.7.orig/src/java/Makefile.am 2008-07-17 18:15:09.000000000 +0000 |
| 93 |
+++ OpenSRF-1.0.7/src/java/Makefile.am 2009-11-10 08:19:15.250311793 +0000 |
| 94 |
@@ -48,8 +48,8 @@ |
| 95 |
rm files; |
| 96 |
|
| 97 |
install-data-local: |
| 98 |
- mkdir -p $(LIBDIR)/java |
| 99 |
- cp opensrf.jar $(LIBDIR)/java |
| 100 |
+ mkdir -p $(DESTDIR)$(LIBDIR)/java |
| 101 |
+ cp opensrf.jar $(DESTDIR)$(LIBDIR)/java |
| 102 |
|
| 103 |
dep_clean: |
| 104 |
rm -rf deps |
| 105 |
diff -Nuar OpenSRF-1.0.7.orig/src/libopensrf/Makefile.am OpenSRF-1.0.7/src/libopensrf/Makefile.am |
| 106 |
--- OpenSRF-1.0.7.orig/src/libopensrf/Makefile.am 2008-08-07 16:54:56.000000000 +0000 |
| 107 |
+++ OpenSRF-1.0.7/src/libopensrf/Makefile.am 2009-11-10 08:19:16.190311593 +0000 |
| 108 |
@@ -94,6 +94,7 @@ |
| 109 |
opensrf_c_SOURCES = opensrf.c |
| 110 |
opensrf_c_DEPENDENCIES = libopensrf.la |
| 111 |
|
| 112 |
+osrf_json_test_DEPENDENCIES = libopensrf.la libosrf_json.la |
| 113 |
osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS) |
| 114 |
|
| 115 |
noinst_LTLIBRARIES = libosrf_json.la |
| 116 |
diff -Nuar OpenSRF-1.0.7.orig/src/Makefile.am OpenSRF-1.0.7/src/Makefile.am |
| 117 |
--- OpenSRF-1.0.7.orig/src/Makefile.am 2008-11-04 03:04:24.000000000 +0000 |
| 118 |
+++ OpenSRF-1.0.7/src/Makefile.am 2009-11-10 08:19:16.190311593 +0000 |
| 119 |
@@ -17,7 +17,7 @@ |
| 120 |
export OPENSRF = opensrf |
| 121 |
export BINDIR = @bindir@ |
| 122 |
export LIBDIR = @libdir@ |
| 123 |
-jsdir = $(LIBDIR)/javascript |
| 124 |
+jsdir = $(datarootdir)/opensrf/javascript |
| 125 |
export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@ |
| 126 |
etcdir = $(ETCDIR) |
| 127 |
|
| 128 |
@@ -41,12 +41,12 @@ |
| 129 |
dist_sysconf_DATA = @top_srcdir@/examples/opensrf.xml.example @top_srcdir@/examples/opensrf_core.xml.example @top_srcdir@/examples/srfsh.xml.example |
| 130 |
|
| 131 |
install-exec-local: |
| 132 |
- mkdir -p $(VAR) |
| 133 |
- mkdir -p $(PID) |
| 134 |
- mkdir -p $(LOG) |
| 135 |
- mkdir -p $(SOCK) |
| 136 |
- mkdir -p $(jsdir) |
| 137 |
- make install-perl |
| 138 |
+ mkdir -p $(DESTDIR)$(VAR) |
| 139 |
+ mkdir -p $(DESTDIR)$(PID) |
| 140 |
+ mkdir -p $(DESTDIR)$(LOG) |
| 141 |
+ mkdir -p $(DESTDIR)$(SOCK) |
| 142 |
+ mkdir -p $(DESTDIR)$(jsdir) |
| 143 |
+# $(MAKE) install-perl |
| 144 |
|
| 145 |
install-exec-hook: |
| 146 |
sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example' |
| 147 |
@@ -55,14 +55,14 @@ |
| 148 |
sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example' |
| 149 |
sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example' |
| 150 |
sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example' |
| 151 |
- cp -r @srcdir@/javascript/* $(jsdir)/ |
| 152 |
+ cp -r @srcdir@/javascript/* $(DESTDIR)$(jsdir)/ |
| 153 |
|
| 154 |
|
| 155 |
install-perl: |
| 156 |
- cd ./perl && perl Makefile.PL || make -s install-perl-fail |
| 157 |
- make -C perl |
| 158 |
- make -C perl test || make -s install-perl-fail |
| 159 |
- make -C perl install |
| 160 |
+# cd ./perl && perl Makefile.PL || $(MAKE) -s install-perl-fail |
| 161 |
+# $(MAKE) -C perl |
| 162 |
+# $(MAKE) -C perl test || $(MAKE) -s install-perl-fail |
| 163 |
+# $(MAKE) -C perl install |
| 164 |
|
| 165 |
install-perl-fail: |
| 166 |
echo |
Archives