Mercurial > gub
changeset 6193:dcf6c618308d
tools::python: -lcrypt, gcc -R build fixes.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Sun, 26 Aug 2012 16:21:18 +0200 |
| parents | 194987553373 |
| children | 60305a4352ff |
| 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, 25 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/python.py Sun Aug 26 10:59:17 2012 +0200 +++ b/gub/specs/python.py Sun Aug 26 16:21:18 2012 +0200 @@ -180,6 +180,8 @@ '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', @@ -188,6 +190,6 @@ ] force_autoupdate = True parallel_build_broken = True - make_flags = Python.make_flags + make_flags = Python.make_flags + ' LIBC=-lcrypt' def patch (self): Python.patch (self)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/python-2.4.5-Setup-crypt.patch Sun Aug 26 16:21:18 2012 +0200 @@ -0,0 +1,11 @@ +--- 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/python-2.4.5-gcc-R.patch Sun Aug 26 16:21:18 2012 +0200 @@ -0,0 +1,11 @@ +--- 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