[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f4681a54f4716147dd9f5da43816ffbe4d89441f)

Remko van der Vossen scm at sourcemage.org
Thu Feb 5 16:45:11 EST 2009


GIT changes to master grimoire by Remko van der Vossen <wich at grace.yuugen.jp>:

 http/xshttpd/HISTORY   |    3 +++
 http/xshttpd/PRE_BUILD |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9d2313495c8c9a8de9c4940a676bacf05efe80b4
Author: Remko van der Vossen <wich at grace.yuugen.jp>
Commit: Remko van der Vossen <wich at grace.yuugen.jp>

    xshttpd: sedit to compile with python > 2.5

diff --git a/http/xshttpd/HISTORY b/http/xshttpd/HISTORY
index 0347e7d..6f915ab 100644
--- a/http/xshttpd/HISTORY
+++ b/http/xshttpd/HISTORY
@@ -1,3 +1,6 @@
+2009-02-05 Remko van der Vossen <wich at sourcemage.org>
+	* PRE_BUILD: sedit for python > 2.5
+
 2009-02-01 Remko van der Vossen <wich at sourcemage.org>
 	* DETAILS, CONFIGURE, DEPENDS: Devel version 37b06, Stable version 36g01
 
diff --git a/http/xshttpd/PRE_BUILD b/http/xshttpd/PRE_BUILD
index 4a8bb30..de58520 100755
--- a/http/xshttpd/PRE_BUILD
+++ b/http/xshttpd/PRE_BUILD
@@ -1,6 +1,10 @@
 default_pre_build &&
+cd $SOURCE_DIRECTORY &&
 if [[ $XSHTTPD_BRANCH == "stable" ]]; then
-  cd $SOURCE_DIRECTORY &&
   RUBY_SO_NAME=$(ruby -r mkmf -e 'print %&#{CONFIG["RUBY_SO_NAME"]}&') &&
   sedit "s/ruby18/$RUBY_SO_NAME/" configure
+  sedit 's,python2.5/Python.h,Python.h,' src/cgi.c
+  sedit 's,python2.5/Python.h,Python.h,' src/cloader.c
+else
+  sedit 's,python2.5/Python.h,Python.h,' src/mod_python.c
 fi



More information about the SM-Commit mailing list