jhbuild r2068 - in trunk: . modulesets patches

From: malureau svn gnome org
To: svn-commits-list gnome org
Subject: jhbuild r2068 - in trunk: . modulesets patches
Date: Sat, 3 May 2008 19:18:50 +0100 (BST)
Author: malureau
Date: Sat May  3 18:18:49 2008
New Revision: 2068
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2068&view=rev

Log:
2008-05-03  Marc-AndrÃ Lureau  <marcandre lureau gmail com>

	* patches/python-2.4.4-lib64.patch: renamed in
	python-2.4.5-lib64.patch, without distutils "multiarch-"
	lines. See #344036.


Added:
   trunk/patches/python-2.4.5-lib64.patch
      - copied, changed from r2067, /trunk/patches/python-2.4.4-lib64.patch
Removed:
   trunk/patches/python-2.4.4-lib64.patch
Modified:
   trunk/ChangeLog
   trunk/modulesets/bootstrap.modules

Modified: trunk/modulesets/bootstrap.modules
==============================================================================
--- trunk/modulesets/bootstrap.modules	(original)
+++ trunk/modulesets/bootstrap.modules	Sat May  3 18:18:49 2008
@@ -67,7 +67,7 @@
     <branch repo="python"
 	    module="2.4.5/Python-2.4.5.tar.bz2" version="2.4.5"
 	    size="8159705" md5sum="aade3958cb097cc1c69ae0074297d359">
-      <patch file="python-2.4.4-lib64.patch" strip="1" />
+      <patch file="python-2.4.5-lib64.patch" strip="1" />
     </branch>
   </autotools>
 

Copied: trunk/patches/python-2.4.5-lib64.patch (from r2067, /trunk/patches/python-2.4.4-lib64.patch)
==============================================================================
--- /trunk/patches/python-2.4.4-lib64.patch	(original)
+++ trunk/patches/python-2.4.5-lib64.patch	Sat May  3 18:18:49 2008
@@ -1,142 +1,28 @@
-diff -Naur Python-2.4.4-orig/configure Python-2.4.4-lib64/configure
---- Python-2.4.4-orig/configure	2006-10-17 18:03:36.000000000 +0200
-+++ Python-2.4.4-lib64/configure	2008-01-18 18:37:09.000000000 +0100
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# From configure.in Revision: 52231 .
-+# From configure.in Revision: 52358 .
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59 for python 2.4.
- #
-@@ -312,7 +312,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDS
 HARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT ARCH LIB LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRU
 FT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -3294,6 +3288,49 @@
- esac
- 
- 
-+echo "$as_me:$LINENO: checking ARCH" >&5
-+echo $ECHO_N "checking ARCH... $ECHO_C" >&6
-+ARCH=`uname -m`
-+case $ARCH in
-+i?86) ARCH=i386;;
-+esac
-+echo "$as_me:$LINENO: result: $ARCH" >&5
-+echo "${ECHO_T}$ARCH" >&6
-+
-+
-+echo "$as_me:$LINENO: checking LIB" >&5
-+echo $ECHO_N "checking LIB... $ECHO_C" >&6
-+case $ac_sys_system in
-+Linux*)
-+  # Test if the compiler is 64bit
-+  echo 'int i;' > conftest.$ac_ext
-+  python_cv_cc_64bit_output=no
-+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *"ELF 64"*)
-+      python_cv_cc_64bit_output=yes
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+case $ARCH:$python_cv_cc_64bit_output in
-+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+  LIB="lib64"
-+  ;;
-+*:*)
-+  LIB="lib"
-+  ;;
-+esac
-+echo "$as_me:$LINENO: result: $LIB" >&5
-+echo "${ECHO_T}$LIB" >&6
-+
- 
- echo "$as_me:$LINENO: checking LIBRARY" >&5
- echo $ECHO_N "checking LIBRARY... $ECHO_C" >&6
-@@ -21340,6 +21169,8 @@
- s,@CPP@,$CPP,;t t
- s,@EGREP@,$EGREP,;t t
- s,@BUILDEXEEXT@,$BUILDEXEEXT,;t t
-+s,@ARCH@,$ARCH,;t t
-+s,@LIB@,$LIB,;t t
- s,@LIBRARY@,$LIBRARY,;t t
- s,@LDLIBRARY@,$LDLIBRARY,;t t
- s,@DLLLIBRARY@,$DLLLIBRARY,;t t
-@@ -21553,11 +21384,6 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-diff -Naur Python-2.4.4-orig/configure.in Python-2.4.4-lib64/configure.in
---- Python-2.4.4-orig/configure.in	2006-10-17 18:03:36.000000000 +0200
-+++ Python-2.4.4-lib64/configure.in	2008-01-18 18:15:59.000000000 +0100
-@@ -494,6 +494,41 @@
-     ;;
- esac
- 
-+AC_SUBST(ARCH)
-+AC_MSG_CHECKING(ARCH)
-+ARCH=`uname -m`
-+case $ARCH in
-+i?86) ARCH=i386;;
-+esac
-+AC_MSG_RESULT($ARCH)
-+
-+AC_SUBST(LIB)
-+AC_MSG_CHECKING(LIB)
-+case $ac_sys_system in
-+Linux*)
-+  # Test if the compiler is 64bit
-+  echo 'int i;' > conftest.$ac_ext
-+  python_cv_cc_64bit_output=no
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *"ELF 64"*)
-+      python_cv_cc_64bit_output=yes
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+case $ARCH:$python_cv_cc_64bit_output in
-+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+  LIB="lib64"
-+  ;;
-+*:*)
-+  LIB="lib"
-+  ;;
-+esac
-+AC_MSG_RESULT($LIB)
- 
- AC_SUBST(LIBRARY)
- AC_MSG_CHECKING(LIBRARY)
-diff -Naur Python-2.4.4-orig/Include/pythonrun.h Python-2.4.4-lib64/Include/pythonrun.h
---- Python-2.4.4-orig/Include/pythonrun.h	2004-10-07 05:58:07.000000000 +0200
-+++ Python-2.4.4-lib64/Include/pythonrun.h	2008-01-18 18:16:43.000000000 +0100
-@@ -93,6 +93,8 @@
+From 632c655146f6fc7db98e428c9ea9f77defdc3ca6 Mon Sep 17 00:00:00 2001
+From: Marc-Andre Lureau <marcandre lureau gmail com>
+Date: Sat, 3 May 2008 20:29:11 +0300
+Subject: [PATCH] remove pyconfig.h tweaks from python-2.4.4-lib64.patch
+
+---
+ Include/pythonrun.h                 |    2 +
+ Lib/distutils/command/install.py    |    6 ++-
+ Lib/distutils/sysconfig.py          |    6 +++-
+ Lib/distutils/tests/test_install.py |    5 ++-
+ Lib/site.py                         |   12 ++++++--
+ Makefile.pre.in                     |    8 +++--
+ Modules/getpath.c                   |   14 +++++++--
+ Python/getplatform.c                |   20 +++++++++++++
+ Python/sysmodule.c                  |    4 ++
+ configure                           |   54 ++++++++++++++++++++++++++++++----
+ configure.in                        |   35 ++++++++++++++++++++++
+ setup.py                            |   12 ++++----
+ 12 files changed, 151 insertions(+), 27 deletions(-)
+
+diff --git a/Include/pythonrun.h b/Include/pythonrun.h
+index 33497ce..e16ad0c 100644
+--- a/Include/pythonrun.h
++++ b/Include/pythonrun.h
+@@ -93,6 +93,8 @@ PyAPI_FUNC(char *) Py_GetPath(void);
  /* In their own files */
  PyAPI_FUNC(const char *) Py_GetVersion(void);
  PyAPI_FUNC(const char *) Py_GetPlatform(void);
@@ -145,10 +31,11 @@
  PyAPI_FUNC(const char *) Py_GetCopyright(void);
  PyAPI_FUNC(const char *) Py_GetCompiler(void);
  PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-diff -Naur Python-2.4.4-orig/Lib/distutils/command/install.py Python-2.4.4-lib64/Lib/distutils/command/install.py
---- Python-2.4.4-orig/Lib/distutils/command/install.py	2005-01-20 20:15:39.000000000 +0100
-+++ Python-2.4.4-lib64/Lib/distutils/command/install.py	2008-01-18 18:16:35.000000000 +0100
-@@ -19,6 +19,8 @@
+diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
+index 673678c..a6d6ede 100644
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
+@@ -19,6 +19,8 @@ from distutils.util import convert_path, subst_vars, change_root
  from distutils.errors import DistutilsOptionError
  from glob import glob
  
@@ -157,7 +44,7 @@
  if sys.version < "2.2":
      WINDOWS_SCHEME = {
          'purelib': '$base',
-@@ -39,14 +41,14 @@
+@@ -39,14 +41,14 @@ else:
  INSTALL_SCHEMES = {
      'unix_prefix': {
          'purelib': '$base/lib/python$py_version_short/site-packages',
@@ -174,10 +61,11 @@
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -Naur Python-2.4.4-orig/Lib/distutils/sysconfig.py Python-2.4.4-lib64/Lib/distutils/sysconfig.py
---- Python-2.4.4-orig/Lib/distutils/sysconfig.py	2006-10-08 19:41:25.000000000 +0200
-+++ Python-2.4.4-lib64/Lib/distutils/sysconfig.py	2008-01-18 18:19:45.000000000 +0100
-@@ -99,8 +99,12 @@
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index c4df8dc..472139e 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -99,8 +99,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
          prefix = plat_specific and EXEC_PREFIX or PREFIX
  
      if os.name == "posix":
@@ -191,18 +79,10 @@
          if standard_lib:
              return libpython
          else:
-@@ -189,6 +193,8 @@
-         inc_dir = os.curdir
-     else:
-         inc_dir = get_python_inc(plat_specific=1)
-+        prefix = EXEC_PREFIX or PREFIX
-+        inc_dir = os.path.join(prefix, "include", "multiarch-" + sys.arch + "-linux", "python" + sys.version[:3])
-     if sys.version < '2.2':
-         config_h = 'config.h'
-     else:
-diff -Naur Python-2.4.4-orig/Lib/distutils/tests/test_install.py Python-2.4.4-lib64/Lib/distutils/tests/test_install.py
---- Python-2.4.4-orig/Lib/distutils/tests/test_install.py	2004-06-26 01:02:59.000000000 +0200
-+++ Python-2.4.4-lib64/Lib/distutils/tests/test_install.py	2008-01-18 18:16:33.000000000 +0100
+diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
+index c834b91..7decbd5 100644
+--- a/Lib/distutils/tests/test_install.py
++++ b/Lib/distutils/tests/test_install.py
 @@ -1,6 +1,6 @@
  """Tests for distutils.command.install."""
  
@@ -211,7 +91,7 @@
  import unittest
  
  from distutils.command.install import install
-@@ -39,8 +39,9 @@
+@@ -39,8 +39,9 @@ class InstallTestCase(support.TempdirManager, unittest.TestCase):
              self.assertEqual(got, expected)
  
          libdir = os.path.join(destination, "lib", "python")
@@ -222,10 +102,11 @@
          check_path(cmd.install_purelib, libdir)
          check_path(cmd.install_headers,
                     os.path.join(destination, "include", "python", "foopkg"))
-diff -Naur Python-2.4.4-orig/Lib/site.py Python-2.4.4-lib64/Lib/site.py
---- Python-2.4.4-orig/Lib/site.py	2004-07-20 04:28:28.000000000 +0200
-+++ Python-2.4.4-lib64/Lib/site.py	2008-01-18 18:16:26.000000000 +0100
-@@ -179,12 +179,18 @@
+diff --git a/Lib/site.py b/Lib/site.py
+index 2207ec5..467a77b 100644
+--- a/Lib/site.py
++++ b/Lib/site.py
+@@ -179,12 +179,18 @@ def addsitepackages(known_paths):
                  sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
              elif os.sep == '/':
                  sitedirs = [os.path.join(prefix,
@@ -247,10 +128,11 @@
              if sys.platform == 'darwin':
                  # for framework builds *only* we add the standard Apple
                  # locations. Currently only per-user, but /Library and
-diff -Naur Python-2.4.4-orig/Makefile.pre.in Python-2.4.4-lib64/Makefile.pre.in
---- Python-2.4.4-orig/Makefile.pre.in	2006-10-08 19:41:25.000000000 +0200
-+++ Python-2.4.4-lib64/Makefile.pre.in	2008-01-18 18:15:59.000000000 +0100
-@@ -70,6 +70,8 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index d125bf6..0e46302 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -70,6 +70,8 @@ PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
  
  # Machine-dependent subdirectories
  MACHDEP=	@MACHDEP@
@@ -259,7 +141,7 @@
  
  # Install prefix for architecture-independent files
  prefix=		@prefix@
-@@ -79,11 +81,11 @@
+@@ -79,11 +81,11 @@ exec_prefix=	@exec_prefix@
  
  # Expanded directories
  BINDIR=		$(exec_prefix)/bin
@@ -273,7 +155,7 @@
  
  # Detailed destination directories
  BINLIBDEST=	$(LIBDIR)/python$(VERSION)
-@@ -471,7 +473,7 @@
+@@ -471,7 +473,7 @@ Parser/tokenizer_pgen.o:	$(srcdir)/Parser/tokenizer.c
  Python/compile.o Python/symtable.o: $(GRAMMAR_H)
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
@@ -282,9 +164,10 @@
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
  		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-diff -Naur Python-2.4.4-orig/Modules/getpath.c Python-2.4.4-lib64/Modules/getpath.c
---- Python-2.4.4-orig/Modules/getpath.c	2006-02-20 18:37:39.000000000 +0100
-+++ Python-2.4.4-lib64/Modules/getpath.c	2008-01-18 18:16:19.000000000 +0100
+diff --git a/Modules/getpath.c b/Modules/getpath.c
+index 4716d15..c3d1308 100644
+--- a/Modules/getpath.c
++++ b/Modules/getpath.c
 @@ -111,9 +111,17 @@
  #define EXEC_PREFIX PREFIX
  #endif
@@ -305,7 +188,7 @@
  #endif
  
  #ifndef LANDMARK
-@@ -124,7 +132,7 @@
+@@ -124,7 +132,7 @@ static char prefix[MAXPATHLEN+1];
  static char exec_prefix[MAXPATHLEN+1];
  static char progpath[MAXPATHLEN+1];
  static char *module_search_path = NULL;
@@ -314,10 +197,11 @@
  
  static void
  reduce(char *dir)
-diff -Naur Python-2.4.4-orig/Python/getplatform.c Python-2.4.4-lib64/Python/getplatform.c
---- Python-2.4.4-orig/Python/getplatform.c	2000-09-02 01:29:29.000000000 +0200
-+++ Python-2.4.4-lib64/Python/getplatform.c	2008-01-18 18:16:37.000000000 +0100
-@@ -10,3 +10,23 @@
+diff --git a/Python/getplatform.c b/Python/getplatform.c
+index 6899140..66a49c6 100644
+--- a/Python/getplatform.c
++++ b/Python/getplatform.c
+@@ -10,3 +10,23 @@ Py_GetPlatform(void)
  {
  	return PLATFORM;
  }
@@ -341,10 +225,11 @@
 +{
 +	return LIB;
 +}
-diff -Naur Python-2.4.4-orig/Python/sysmodule.c Python-2.4.4-lib64/Python/sysmodule.c
---- Python-2.4.4-orig/Python/sysmodule.c	2006-10-05 20:08:58.000000000 +0200
-+++ Python-2.4.4-lib64/Python/sysmodule.c	2008-01-18 18:16:41.000000000 +0100
-@@ -1037,6 +1037,10 @@
+diff --git a/Python/sysmodule.c b/Python/sysmodule.c
+index d2229a6..25f5159 100644
+--- a/Python/sysmodule.c
++++ b/Python/sysmodule.c
+@@ -1037,6 +1037,10 @@ _PySys_Init(void)
  			    PyString_FromString(Py_GetPlatform()));
  	SET_SYS_FROM_STRING("executable",
  			    PyString_FromString(Py_GetProgramFullPath()));
@@ -355,10 +240,148 @@
  	SET_SYS_FROM_STRING("prefix",
  			    PyString_FromString(Py_GetPrefix()));
  	SET_SYS_FROM_STRING("exec_prefix",
-diff -Naur Python-2.4.4-orig/setup.py Python-2.4.4-lib64/setup.py
---- Python-2.4.4-orig/setup.py	2006-10-08 19:41:25.000000000 +0200
-+++ Python-2.4.4-lib64/setup.py	2008-01-18 18:17:53.000000000 +0100
-@@ -263,12 +263,12 @@
+diff --git a/configure b/configure
+index a6ed9f1..954846e 100755
+--- a/configure
++++ b/configure
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 52231 .
++# From configure.in Revision: 52358 .
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.59 for python 2.4.
+ #
+@@ -312,7 +312,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRUFT SO LDS
 HARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION SOVERSION CONFIG_ARGS UNIVERSALSDK PYTHONFRAMEWORK PYTHONFRAMEWORKDIR PYTHONFRAMEWORKPREFIX PYTHONFRAMEWORKINSTALLDIR FRAMEWORKINSTALLFIRST FRAMEWORKINSTALLLAST FRAMEWORKALTINSTALLFIRST FRAMEWORKALTINSTALLLAST FRAMEWORKUNIXTOOLSPREFIX MACHDEP SGI_ABI EXTRAPLATDIR EXTRAMACHDEPPATH CONFIGURE_MACOSX_DEPLOYMENT_TARGET EXPORT_MACOSX_DEPLOYMENT_TARGET CXX MAINOBJ EXEEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP EGREP BUILDEXEEXT ARCH LIB LIBRARY LDLIBRARY DLLLIBRARY BLDLIBRARY LDLIBRARYDIR INSTSONAME RUNSHARED LINKCC RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN OPT BASECFLAGS OTHER_LIBTOOL_OPT LIBTOOL_CRU
 FT SO LDSHARED BLDSHARED CCSHARED LINKFORSHARED CFLAGSFORSHARED SHLIBS USE_SIGNAL_MODULE SIGNAL_OBJS USE_THREAD_MODULE LDLAST THREADOBJ DLINCLDIR DYNLOADFILE MACHDEP_OBJS TRUE LIBOBJS HAVE_GETHOSTBYNAME_R_6_ARG HAVE_GETHOSTBYNAME_R_5_ARG HAVE_GETHOSTBYNAME_R_3_ARG HAVE_GETHOSTBYNAME_R HAVE_GETHOSTBYNAME LIBM LIBC UNICODE_OBJS THREADHEADERS SRCDIRS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -3294,6 +3294,49 @@ _ACEOF
+ esac
+ 
+ 
++echo "$as_me:$LINENO: checking ARCH" >&5
++echo $ECHO_N "checking ARCH... $ECHO_C" >&6
++ARCH=`uname -m`
++case $ARCH in
++i?86) ARCH=i386;;
++esac
++echo "$as_me:$LINENO: result: $ARCH" >&5
++echo "${ECHO_T}$ARCH" >&6
++
++
++echo "$as_me:$LINENO: checking LIB" >&5
++echo $ECHO_N "checking LIB... $ECHO_C" >&6
++case $ac_sys_system in
++Linux*)
++  # Test if the compiler is 64bit
++  echo 'int i;' > conftest.$ac_ext
++  python_cv_cc_64bit_output=no
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *"ELF 64"*)
++      python_cv_cc_64bit_output=yes
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++esac
++
++case $ARCH:$python_cv_cc_64bit_output in
++ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
++  LIB="lib64"
++  ;;
++*:*)
++  LIB="lib"
++  ;;
++esac
++echo "$as_me:$LINENO: result: $LIB" >&5
++echo "${ECHO_T}$LIB" >&6
++
+ 
+ echo "$as_me:$LINENO: checking LIBRARY" >&5
+ echo $ECHO_N "checking LIBRARY... $ECHO_C" >&6
+@@ -21340,6 +21383,8 @@ s,@OBJEXT@,$OBJEXT,;t t
+ s,@CPP@,$CPP,;t t
+ s,@EGREP@,$EGREP,;t t
+ s,@BUILDEXEEXT@,$BUILDEXEEXT,;t t
++s,@ARCH@,$ARCH,;t t
++s,@LIB@,$LIB,;t t
+ s,@LIBRARY@,$LIBRARY,;t t
+ s,@LDLIBRARY@,$LDLIBRARY,;t t
+ s,@DLLLIBRARY@,$DLLLIBRARY,;t t
+@@ -21553,11 +21598,6 @@ esac
+   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+   esac
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+diff --git a/configure.in b/configure.in
+index 2770b1e..bd9c71f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -494,6 +494,41 @@ SunOS*)
+     ;;
+ esac
+ 
++AC_SUBST(ARCH)
++AC_MSG_CHECKING(ARCH)
++ARCH=`uname -m`
++case $ARCH in
++i?86) ARCH=i386;;
++esac
++AC_MSG_RESULT($ARCH)
++
++AC_SUBST(LIB)
++AC_MSG_CHECKING(LIB)
++case $ac_sys_system in
++Linux*)
++  # Test if the compiler is 64bit
++  echo 'int i;' > conftest.$ac_ext
++  python_cv_cc_64bit_output=no
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *"ELF 64"*)
++      python_cv_cc_64bit_output=yes
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++esac
++
++case $ARCH:$python_cv_cc_64bit_output in
++ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
++  LIB="lib64"
++  ;;
++*:*)
++  LIB="lib"
++  ;;
++esac
++AC_MSG_RESULT($LIB)
+ 
+ AC_SUBST(LIBRARY)
+ AC_MSG_CHECKING(LIBRARY)
+diff --git a/setup.py b/setup.py
+index bb7b26e..15e1bde 100644
+--- a/setup.py
++++ b/setup.py
+@@ -263,12 +263,12 @@ class PyBuildExt(build_ext):
          except NameError:
              have_unicode = 0
  
@@ -373,7 +396,7 @@
              ]
          inc_dirs = self.compiler.include_dirs + ['/usr/include']
          exts = []
-@@ -450,7 +450,7 @@
+@@ -450,7 +450,7 @@ class PyBuildExt(build_ext):
              elif self.compiler.find_library_file(lib_dirs, 'curses'):
                  readline_libs.append('curses')
              elif self.compiler.find_library_file(lib_dirs +
@@ -382,7 +405,7 @@
                                                 'termcap'):
                  readline_libs.append('termcap')
  
-@@ -465,7 +465,7 @@
+@@ -465,7 +465,7 @@ class PyBuildExt(build_ext):
                  readline_extra_link_args = ()
  
              exts.append( Extension('readline', ['readline.c'],
@@ -391,7 +414,7 @@
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          if platform not in ['mac']:
-@@ -1069,8 +1069,8 @@
+@@ -1069,8 +1069,8 @@ class PyBuildExt(build_ext):
              added_lib_dirs.append('/usr/openwin/lib')
          elif os.path.exists('/usr/X11R6/include'):
              include_dirs.append('/usr/X11R6/include')
@@ -402,3 +425,6 @@
          elif os.path.exists('/usr/X11R5/include'):
              include_dirs.append('/usr/X11R5/include')
              added_lib_dirs.append('/usr/X11R5/lib')
+-- 
+1.5.5.1.g880b
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]