Mercurial > gub
changeset 6190:40456bb74574
<native>::python: Also add . to LD_LIBRARY_PATH. Fixes build on Precise.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Sun, 26 Aug 2012 00:06:54 +0200 |
| parents | 004832ab02c1 |
| children | 6d3dc146d17e |
| files | gub/specs/python.py patches/python-2.4.5-1.patch |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/python.py Sat Aug 25 20:15:42 2012 +0200 +++ b/gub/specs/python.py Sun Aug 26 00:06:54 2012 +0200 @@ -48,7 +48,6 @@ if 'stat' in misc.librestrict (): self.install_command = ('LIBRESTRICT_ALLOW=/usr/lib/python2.4/lib-dynload:${LIBRESTRICT_ALLOW-/foo} ' + target.AutoBuild.install_command) - def patch (self): target.AutoBuild.patch (self) self.file_sub ([('@CC@', '@CC@ -I$(shell pwd)')],
--- a/patches/python-2.4.5-1.patch Sat Aug 25 20:15:42 2012 +0200 +++ b/patches/python-2.4.5-1.patch Sun Aug 26 00:06:54 2012 +0200 @@ -1083,7 +1083,7 @@ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -@@ -769,9 +802,9 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib +@@ -769,9 +802,10 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib $(srcdir)/Lib/$(PLATDIR): mkdir $(srcdir)/Lib/$(PLATDIR) cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen @@ -1091,6 +1091,7 @@ - export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ - export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ +@CROSS_COMMENT@ export PATH; PATH="`pwd`:$$PATH"; \ ++@CROSS_COMMENT@ export LD_LIBRARY_PATH; LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ +@CROSS_COMMENT@ export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ +@CROSS_COMMENT@ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ export EXE; EXE="$(BUILDEXE)"; \