[Lunar-commits] CVS: moonbase/compilers/Python BUILD, 1.9, 1.10 DETAILS, 1.17, 1.18 POST_INSTALL, 1.4, 1.5

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/compilers/Python
In directory espresso.foo-projects.org:/tmp/cvs-serv20595

Modified Files:
	BUILD DETAILS POST_INSTALL 
Log Message:
Fixing Python for good. This time it should not break anything.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/Python/BUILD,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- BUILD	6 Mar 2005 17:52:56 -0000	1.9
+++ BUILD	22 Apr 2005 08:05:18 -0000	1.10
@@ -1,14 +1,18 @@
 (
-  if module_is_expired $MODULE ; then
-        set_module_config OLD_VER "`installed_version $MODULE`"
+  OLDV=$(installed_version $MODULE)
+
+  if [ ${OLDV:0:3} != ${MAJOR_VERSION} ] ; then
+        set_module_config OLD_VER "${OLDV:0:3}"
   fi &&
 
+  sedit "s:-O3:-O2:g" configure &&
+
   default_build &&
   
-  install -d /usr/lib/python$VERSION &&
+  install -d /usr/lib/python$MAJOR_VERSION &&
   install -m755 $SOURCE_DIRECTORY/Tools/i18n/msgfmt.py \
 		$SOURCE_DIRECTORY/Tools/i18n/pygettext.py \
-		/usr/lib/python$VERSION/  &&
+		/usr/lib/python$MAJOR_VERSION/  &&
   gather_docs Misc/*
 
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/Python/DETAILS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- DETAILS	20 Apr 2005 06:32:12 -0000	1.17
+++ DETAILS	22 Apr 2005 08:05:18 -0000	1.18
@@ -1,5 +1,6 @@
           MODULE=Python
          VERSION=2.4.1
+   MAJOR_VERSION=2.4
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=ftp://ftp.python.org/pub/python/$VERSION/
       SOURCE_VFY=sha1:a4b58cf31359198dbb123b789440bcaf9052d198

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/Python/POST_INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- POST_INSTALL	6 Mar 2005 17:52:56 -0000	1.4
+++ POST_INSTALL	22 Apr 2005 08:05:18 -0000	1.5
@@ -1,5 +1,5 @@
-OLD_VER="`get_module_config OLD_VER`"
-NEWPYTHONDIR=/usr/lib/python$VERSION
+OLD_VER="$(get_module_config OLD_VER)"
+NEWPYTHONDIR=/usr/lib/python$MAJOR_VERSION
 OLDPYTHONDIR=/usr/lib/python$OLD_VER
 
 if [ ! -z "$OLD_VER" ]; then