From 0a50ef3662942bb3e1e46625bdda9fb60bca4638 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Oct 2010 03:05:30 +0200 Subject: [PATCH] Python: add -lexpat to LDFLAGS, add LDFLAGS support to cross compiling patch Signed-off-by: Stephan Raue --- packages/lang/Python/build | 5 ++++- packages/lang/Python/patches/001-Python-2.6.6-xcompile.diff | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 33f88c3520..04a65ecd21 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -19,7 +19,9 @@ mkdir -p .objdir-host && cd .objdir-host setup_toolchain host OPT="$HOST_CFLAGS" \ +LDFLAGS="$LDFLAGS -lexpat" \ ../configure --prefix=$ROOT/$TOOLCHAIN \ + --cache-file=config.cache \ --enable-shared \ --without-cxx-main \ --with-threads \ @@ -42,9 +44,10 @@ ac_cv_file_dev_ptmx=yes \ ac_cv_func_lchflags_works=no \ ac_cv_func_chflags_works=no \ ac_cv_func_printf_zd=yes -OPT="$CFLAGS -fno-strict-aliasing" \ +OPT="$TARGET_CFLAGS -fno-strict-aliasing" \ ../configure --host=$TARGET_NAME \ --build=$HOST_NAME \ + --cache-file=config.cache \ --prefix=/usr \ --sysconfdir=/etc \ --enable-shared \ diff --git a/packages/lang/Python/patches/001-Python-2.6.6-xcompile.diff b/packages/lang/Python/patches/001-Python-2.6.6-xcompile.diff index f553e5cb39..6075333fb3 100644 --- a/packages/lang/Python/patches/001-Python-2.6.6-xcompile.diff +++ b/packages/lang/Python/patches/001-Python-2.6.6-xcompile.diff @@ -145,8 +145,8 @@ diff -u Python-2.6.6_orig/Makefile.pre.in Python-2.6.6/Makefile.pre.in @case $$MAKEFLAGS in \ - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ ++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ esac # Build static library