Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Unified Diff: libraries/python/nacl-python.sh

Issue 18112024: Fix python to build with newlib. (Closed) Base URL: https://naclports.googlecode.com/svn/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « libraries/python/nacl.patch ('k') | libraries/python/pkg_info » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/python/nacl-python.sh
diff --git a/libraries/python/nacl-python.sh b/libraries/python/nacl-python.sh
index 01c73a53288f653130704abd85348bb99f5e63f0..7c7614ad41a7d674bcfce7c6754f93403a6f436e 100755
--- a/libraries/python/nacl-python.sh
+++ b/libraries/python/nacl-python.sh
@@ -10,15 +10,19 @@ EXECUTABLES=python.nexe
# Currently this package only builds on linux.
# The build relies on certain host binaries and pythong's configure
# requires us to sett --build= as well as --host=.
-EXTRA_CONFIGURE_ARGS="--disable-ipv6 --with-suffix=.nexe --build=x86_64-linux-gnu"
-export MAKEFLAGS="PGEN=../build-nacl-host/Parser/pgen"
HERE=$(cd "$(dirname "$BASH_SOURCE")" ; pwd)
BuildHostPython() {
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_DIR}
MakeDir build-nacl-host
ChangeDir build-nacl-host
- LogExecute ../configure
+ if [ -f python -a -f Parser/pgen ]; then
+ return
+ fi
+ # Reset CFLAGS and LDFLAGS when configuring the host
+ # version of python since they hold values designed for
+ # building for NaCl.
+ CFLAGS="" LDFLAGS="" LogExecute ../configure
LogExecute make -j${OS_JOBS} python Parser/pgen
}
@@ -29,6 +33,14 @@ CustomConfigureStep() {
# since we are doing a cross compile. The $CONFIG_SITE file is sourced
# by configure early on.
export CONFIG_SITE=${HERE}/config.site
+ # Disable ipv6 since configure claims it requires a working getaddrinfo
+ # which we do not provide. TODO(sbc): remove this once nacl_io supports
+ # getaddrinfo.
+ EXTRA_CONFIGURE_ARGS="--disable-ipv6"
+ EXTRA_CONFIGURE_ARGS+=" --with-suffix=.nexe"
+ EXTRA_CONFIGURE_ARGS+=" --build=x86_64-linux-gnu"
+ export MAKEFLAGS="PGEN=../build-nacl-host/Parser/pgen"
+ export LIBS="-lc -lnosys"
DefaultConfigureStep
}
« no previous file with comments | « libraries/python/nacl.patch ('k') | libraries/python/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698