OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Jul-2007 16:15:48
Branch: HEAD Handle: 2007073115154800
Modified files:
openpkg-src/jabberd jabberd.patch jabberd.spec
Log:
fix MySQL support
Summary:
Revision Changes Path
1.9 +21 -0 openpkg-src/jabberd/jabberd.patch
1.50 +2 -1 openpkg-src/jabberd/jabberd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 jabberd.patch
--- openpkg-src/jabberd/jabberd.patch 27 Jul 2007 06:35:15 -0000 1.8
+++ openpkg-src/jabberd/jabberd.patch 31 Jul 2007 14:15:48 -0000 1.9
@@ -1,3 +1,24 @@
+Index: configure
+--- configure.orig 2007-07-30 21:12:45 +0200
++++ configure 2007-07-31 15:47:45 +0200
+@@ -29528,7 +29528,7 @@
+ fi
+
+ if test "x-$enable_mysql" = "x-yes" ; then
+- for i in /usr /usr/local /usr/local/mysql ; do
++ for i in @l_prefix@ ; do
+ for j in include include/mysql "" ; do
+ if test -r "$i/$j/mysql.h" ; then
+ MYSQL_INCLUDE=$i/$j
+@@ -29546,7 +29546,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmysqlclient $LIBS"
++LIBS="-L$MYSQL_LIBDIR -lmysqlclient $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
Index: etc/c2s.xml.dist.in
--- etc/c2s.xml.dist.in.orig 2007-07-19 15:18:32 +0200
+++ etc/c2s.xml.dist.in 2007-07-27 08:15:22 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jabberd/jabberd.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 jabberd.spec
--- openpkg-src/jabberd/jabberd.spec 31 Jul 2007 07:15:23 -0000 1.49
+++ openpkg-src/jabberd/jabberd.spec 31 Jul 2007 14:15:48 -0000 1.50
@@ -94,7 +94,7 @@
%prep
%setup -q -n jabberd-%{version}
- %patch -p0
+ %{l_sed} <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b
%{l_prefix}/bin/config install
%{l_shtool} subst \
-e 's;exec perl;exec %{l_prefix}/bin/perl;' \
@@ -114,6 +114,7 @@
%if "%{with_mysql}" == "yes"
CPPFLAGS="$CPPFLAGS %{l_cppflags mysql}"
LDFLAGS="$LDFLAGS %{l_ldflags mysql}"
+ LIBS="$LIBS -lz -lm"
%endif
%if "%{with_pgsql}" == "yes"
CPPFLAGS="$CPPFLAGS %{l_cppflags postgresql}"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
