| OLD | NEW |
| 1 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2013 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # Use the same patch here as for the destination tree. This allows us to use | 5 # Use the same patch here as for the destination tree. This allows us to use |
| 6 # the same tree for both, although some care should be taken to note that our | 6 # the same tree for both, although some care should be taken to note that our |
| 7 # DYNLOAD will be different between the two builds. | 7 # DYNLOAD will be different between the two builds. |
| 8 BUILD_DIR=${WORK_DIR}/build_host | 8 BUILD_DIR=${WORK_DIR}/build_host |
| 9 | 9 |
| 10 ConfigureStep() { | 10 ConfigureStep() { |
| 11 # Reset CFLAGS and LDFLAGS when configuring the host | 11 # Reset CFLAGS and LDFLAGS when configuring the host |
| 12 # version of python since they hold values designed for | 12 # version of python since they hold values designed for |
| 13 # building for NaCl. Note that we are forcing 32 bits here so | 13 # building for NaCl. Note that we are forcing 32 bits here so |
| 14 # our generated modules use Py_ssize_t of the correct size. | 14 # our generated modules use Py_ssize_t of the correct size. |
| 15 export CC="gcc -m32" | 15 export CC="gcc -m32" |
| 16 export CXX="g++ -m32" | 16 export CXX="g++ -m32" |
| 17 export LD="gcc -m32" | 17 export LD="gcc -m32" |
| 18 LogExecute ${SRC_DIR}/configure --prefix=${NACL_HOST_PYROOT} | 18 LogExecute ${SRC_DIR}/configure --prefix=${NACL_HOST_PYROOT} \ |
| 19 --without-x --without-tk |
| 19 } | 20 } |
| 20 | 21 |
| 21 BuildStep() { | 22 BuildStep() { |
| 22 DefaultBuildStep | 23 DefaultBuildStep |
| 23 ssl_lib=$(find build -name "_ssl.*") | 24 ssl_lib=$(find build -name "_ssl.*") |
| 24 if [ -z "${ssl_lib}" ]; then | 25 if [ -z "${ssl_lib}" ]; then |
| 25 echo "Failed to build _ssl python module." | 26 echo "Failed to build _ssl python module." |
| 26 echo "Check for 32-bit install of libssl and libcryto (see README.rst)" | 27 echo "Check for 32-bit install of libssl and libcryto (see README.rst)" |
| 27 exit 1 | 28 exit 1 |
| 28 fi | 29 fi |
| 29 echo "Built ssl lib: ${ssl_lib}" | 30 echo "Built ssl lib: ${ssl_lib}" |
| 30 } | 31 } |
| 31 | 32 |
| 32 InstallStep() { | 33 InstallStep() { |
| 33 LogExecute make install | 34 LogExecute make install |
| 34 } | 35 } |
| OLD | NEW |