| 1 |
robbat2 09/01/02 23:36:28 |
| 2 |
|
| 3 |
Modified: OpenSRF-1.0.1-buildfix.patch |
| 4 |
Log: |
| 5 |
Disable the pkg_config routine for now as it needs functional jabber. Fix a braindead search in the ctl tool, and remember to install the docs and javascript, and everything with correct paths. |
| 6 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-03114-g3c92ec8 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: OpenSRF-1.0.1-buildfix.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 21 |
--- OpenSRF-1.0.1-buildfix.patch 9 Dec 2008 09:13:02 -0000 1.1 |
| 22 |
+++ OpenSRF-1.0.1-buildfix.patch 2 Jan 2009 23:36:28 -0000 1.2 |
| 23 |
@@ -3,6 +3,7 @@ |
| 24 |
- split out install targets to build the apache modules |
| 25 |
- disable perl and apache install targets, will use gentoo tools instead |
| 26 |
- compile fix to osrf_chat.c |
| 27 |
+- Hardcode location of osrf_config instead of using a long recursive find statement |
| 28 |
|
| 29 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 30 |
|
| 31 |
@@ -162,3 +163,16 @@ diff -Nuar OpenSRF-1.0.1.orig/Makefile.a |
| 32 |
- cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h |
| 33 |
+ cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h |
| 34 |
|
| 35 |
+diff -Nuar OpenSRF-1.0.1/bin/osrf_ctl.sh |
| 36 |
+--- OpenSRF-1.0.1.orig/bin/osrf_ctl.sh 2008-09-24 20:27:44.000000000 -0700 |
| 37 |
++++ OpenSRF-1.0.1/bin/osrf_ctl.sh 2008-12-09 02:25:39.018456228 -0800 |
| 38 |
+@@ -87,7 +87,8 @@ |
| 39 |
+ esac; |
| 40 |
+ done |
| 41 |
+ |
| 42 |
+-OSRF_CONFIG=`find $BASEDIR -name osrf_config` |
| 43 |
++#OSRF_CONFIG=`find $BASEDIR -name osrf_config` |
| 44 |
++OSRF_CONFIG=/usr/bin/osrf_config |
| 45 |
+ |
| 46 |
+ [ -z "$OPT_CONFIG" ] && OPT_CONFIG=`$OSRF_CONFIG --sysconfdir`/opensrf_core.xml; |
| 47 |
+ if [ ! -r "$OPT_CONFIG" ]; then |
Archives