Mercurial > gub
changeset 6199:d4129de94338
Revert "tools::python: -lcrypt, gcc -R build fixes."
This reverts commit 48b18f5e5b1baf0192b65f9cc1ef7617bda27443.
The real fix is teaching setup.py about cross compilation.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Mon, 27 Aug 2012 15:47:39 +0200 |
| parents | a82f41987a16 |
| children | a4dfe4e574ec |
| files | gub/specs/python.py patches/python-2.4.5-Setup-crypt.patch patches/python-2.4.5-gcc-R.patch |
| diffstat | 3 files changed, 1 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/python.py Mon Aug 27 15:46:33 2012 +0200 +++ b/gub/specs/python.py Mon Aug 27 15:47:39 2012 +0200 @@ -180,8 +180,6 @@ 'python-2.4.5-readline.patch', # Stop python from reading ~/.inputrc 'python-2.4.5-db4.7.patch', 'python-2.4.5-regen.patch', - 'python-2.4.5-gcc-R.patch', - 'python-2.4.5-Setup-crypt.patch', ] dependencies = [ 'autoconf', @@ -190,6 +188,6 @@ ] force_autoupdate = True parallel_build_broken = True - make_flags = Python.make_flags + ' LIBC=-lcrypt' + make_flags = Python.make_flags def patch (self): Python.patch (self)
--- a/patches/python-2.4.5-Setup-crypt.patch Mon Aug 27 15:46:33 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- python-2.4.5/Modules/Setup.dist~ 2005-12-27 18:37:16.000000000 +0100 -+++ python-2.4.5/Modules/Setup.dist 2012-08-26 15:53:56.245136116 +0200 -@@ -212,7 +212,7 @@ GLHACK=-Dclear=__GLclear - # - # First, look at Setup.config; configure may have set this for you. - --#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems -+crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems - - - # Some more UNIX dependent modules -- off by default, since these
--- a/patches/python-2.4.5-gcc-R.patch Mon Aug 27 15:46:33 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- python-2.4.5/Lib/distutils/unixccompiler.py~ 2012-08-26 12:32:13.869439859 +0200 -+++ python-2.4.5/Lib/distutils/unixccompiler.py 2012-08-26 12:33:12.678823232 +0200 -@@ -250,6 +250,8 @@ - # the configuration data stored in the Python installation, so - # we use this hack. - compiler = os.path.basename(sysconfig.get_config_var("CC")) -+ if not compiler: -+ compiler = os.environ['CC'] - if sys.platform[:6] == "darwin": - # MacOSX's linker doesn't understand the -R flag at all - return "-L" + dir