OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2007 18:42:07
Branch: HEAD Handle: 2007062217420700
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
reuse the libtool from APR but post-adjust it for DSO support
Summary:
Revision Changes Path
1.31 +2 -2 openpkg-src/apache/apache.patch
1.412 +4 -3 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.30 -r1.31 apache.patch
--- openpkg-src/apache/apache.patch 22 Jun 2007 15:33:13 -0000 1.30
+++ openpkg-src/apache/apache.patch 22 Jun 2007 16:42:07 -0000 1.31
@@ -6,7 +6,7 @@
fi
-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
-+APR_LIBTOOL="@prefix@/bin/libtool"
++APR_LIBTOOL="@prefix@/share/apache/build/libtool"
APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
@@ -122,7 +122,7 @@
-my $libtool = `$apr_config --apr-libtool`;
-chomp($libtool);
-+my $libtool = "$prefix/bin/libtool";
++my $libtool = "$prefix/share/apache/build/libtool";
my $apr_includedir = `$apr_config --includes`;
chomp($apr_includedir);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.411 -r1.412 apache.spec
--- openpkg-src/apache/apache.spec 22 Jun 2007 16:37:36 -0000 1.411
+++ openpkg-src/apache/apache.spec 22 Jun 2007 16:42:07 -0000 1.412
@@ -71,8 +71,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, perl, libtool, make
-PreReq: OpenPKG, openpkg >= 20060823, perl, libtool
+BuildPreReq: OpenPKG, openpkg >= 20060823, perl, make
+PreReq: OpenPKG, openpkg >= 20060823, perl
BuildPreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
PreReq: apr, apr::with_db = yes, apr::with_iconv = yes, pcre
%if "%{with_mod_ldap}" == "yes"
@@ -242,8 +242,9 @@
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars
# adjust GNU libtool configuration
- %{l_shtool} subst \
+ %{l_shtool} install -c -m 755 \
-e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \
+ %{l_prefix}/share/apr/build-1/libtool \
$RPM_BUILD_ROOT%{l_prefix}/share/apache/build/libtool
# install shell environment script
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
