[patch] patch to correctly use apxs2 in configure.rb

mod_ruby_1.2.4-r2_apxs2.patch (text/plain), 2.53 KB, created by David Parrott on 2005-04-19 02:13:40 UTC

diff -rauN /usr/portage/dev-ruby/mod_ruby/Manifest ./Manifest
--- Manifest	2005-04-13 06:05:31.000000000 -0700
+++ Manifest	2005-04-19 01:51:28.000000000 -0700
@@ -1,6 +1,6 @@
 MD5 ca3971be5992c98df25220e1a4e7782a mod_ruby-1.2.2.ebuild 1958
 MD5 18a1d02fea28a3aafaac7e05f81d3152 mod_ruby-1.2.4.ebuild 1957
-MD5 92087ded863891825cc5ebff1dd1a567 mod_ruby-1.2.4-r2.ebuild 1160
+MD5 c036ebb96024cb99ad45b1619239ebeb mod_ruby-1.2.4-r2.ebuild 1246
 MD5 0a3b2010518d678dcb74dacf8511fe28 mod_ruby-1.0.7.ebuild 927
 MD5 2b4d5ae65d1dc92adf5c70292819be42 mod_ruby-1.2.4-r1.ebuild 1136
 MD5 594bc7b5071758685ae0222908bdc4f8 ChangeLog 4260
@@ -13,3 +13,4 @@
 MD5 094ecc3f9ad4a6698c2ef4ee0c8139cc files/digest-mod_ruby-1.2.2 65
 MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4 66
 MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
+MD5 5d0e64a112874281f27ac4b2c5dcf323 files/mod_ruby-1.2.4-apxs2.diff 579
diff -rauN /usr/portage/dev-ruby/mod_ruby/files/mod_ruby-1.2.4-apxs2.diff ./files/mod_ruby-1.2.4-apxs2.diff
--- files/mod_ruby-1.2.4-apxs2.diff	1969-12-31 16:00:00.000000000 -0800
+++ files/mod_ruby-1.2.4-apxs2.diff	2005-04-19 01:46:46.000000000 -0700
@@ -0,0 +1,12 @@
+diff -rau mod_ruby-1.2.4/configure.rb mod_ruby-1.2.4v/configure.rb
+--- mod_ruby-1.2.4/configure.rb	2004-09-23 11:43:18.000000000 -0700
++++ mod_ruby-1.2.4v/configure.rb	2005-04-19 01:12:34.000000000 -0700
+@@ -481,6 +481,8 @@
+ if $APXS
+   $APACHE_INCLUDES = "-I" + `#{$APXS} -q INCLUDEDIR`.chomp
+   apache_cflags = `#{$APXS} -q CFLAGS`.chomp
++  apache_cflags += " " + `#{$APXS} -q EXTRA_CFLAGS`.chomp if $APXS =~ /2$/
++  apache_cflags += " " + `#{$APXS} -q EXTRA_CPPFLAGS`.chomp if $APXS =~ /2$/ 
+   apache_cflags.gsub!(/-I\S+/) do |inc|
+     $APACHE_INCLUDES += " " + inc
+     ""
diff -rauN /usr/portage/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild ./mod_ruby-1.2.4-r2.ebuild
--- mod_ruby-1.2.4-r2.ebuild	2005-04-13 05:48:43.000000000 -0700
+++ mod_ruby-1.2.4-r2.ebuild	2005-04-19 01:46:36.000000000 -0700
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild,v 1.2 2005/04/13 12:48:43 caleb Exp $
 
-inherit apache-module
+inherit eutils apache-module
 
 DESCRIPTION="Embeds the Ruby interpreter into Apache"
 HOMEPAGE="http://modruby.net/"
@@ -25,6 +25,11 @@
 
 need_apache
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-apxs2.diff
+}
+		
 src_compile() {
 	use apache2 || ./configure.rb --with-apxs=${APXS1}
 	use apache2 && ./configure.rb --with-apxs=${APXS2}