| 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 export ac_cv_func_gethostbyname=yes | 5 export ac_cv_func_gethostbyname=yes |
| 6 export ac_cv_func_getaddrinfo=no | 6 export ac_cv_func_getaddrinfo=no |
| 7 export ac_cv_func_connect=yes | 7 export ac_cv_func_connect=yes |
| 8 | 8 |
| 9 # Can't use LIBS here otherwise nacl-spawn gets linked into the libcurl.so | 9 # Can't use LIBS here otherwise nacl-spawn gets linked into the libcurl.so |
| 10 # which we don't ever want. | 10 # which we don't ever want. |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 ${DESTDIR}${PREFIX}/share/curl/ca-bundle.crt | 28 ${DESTDIR}${PREFIX}/share/curl/ca-bundle.crt |
| 29 } | 29 } |
| 30 | 30 |
| 31 PublishStep() { | 31 PublishStep() { |
| 32 if [ "${NACL_SHARED}" = "1" ]; then | 32 if [ "${NACL_SHARED}" = "1" ]; then |
| 33 EXECUTABLE_DIR=.libs | 33 EXECUTABLE_DIR=.libs |
| 34 else | 34 else |
| 35 EXECUTABLE_DIR=. | 35 EXECUTABLE_DIR=. |
| 36 fi | 36 fi |
| 37 | 37 |
| 38 if [ "${NACL_ARCH}" = "pnacl" ]; then | |
| 39 # Just set up the x86-64 version for now. | |
| 40 local pexe="${EXECUTABLE_DIR}/curl${NACL_EXEEXT}" | |
| 41 (cd src; | |
| 42 TranslateAndWriteLauncherScript ${pexe} x86-64 curl.x86-64.nexe curl | |
| 43 ) | |
| 44 fi | |
| 45 | |
| 46 MakeDir ${PUBLISH_DIR} | 38 MakeDir ${PUBLISH_DIR} |
| 47 | 39 |
| 48 local exe=${PUBLISH_DIR}/curl_${NACL_ARCH}${NACL_EXEEXT} | 40 local exe=${PUBLISH_DIR}/curl_${NACL_ARCH}${NACL_EXEEXT} |
| 49 | 41 |
| 50 LogExecute cp ${DESTDIR}${PREFIX}/share/curl/ca-bundle.crt ${PUBLISH_DIR} | 42 LogExecute cp ${DESTDIR}${PREFIX}/share/curl/ca-bundle.crt ${PUBLISH_DIR} |
| 51 LogExecute cp src/${EXECUTABLE_DIR}/curl${NACL_EXEEXT} ${exe} | 43 LogExecute cp src/${EXECUTABLE_DIR}/curl${NACL_EXEEXT} ${exe} |
| 52 if [ "${NACL_ARCH}" = "pnacl" ]; then | 44 if [ "${NACL_ARCH}" = "pnacl" ]; then |
| 53 LogExecute ${PNACLFINALIZE} ${exe} | 45 LogExecute ${PNACLFINALIZE} ${exe} |
| 54 fi | 46 fi |
| 55 | 47 |
| 56 pushd ${PUBLISH_DIR} | 48 pushd ${PUBLISH_DIR} |
| 57 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 49 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
| 58 ${PUBLISH_DIR}/curl*${NACL_EXEEXT} \ | 50 ${PUBLISH_DIR}/curl*${NACL_EXEEXT} \ |
| 59 -L${DESTDIR_LIB} \ | 51 -L${DESTDIR_LIB} \ |
| 60 -s . \ | 52 -s . \ |
| 61 -o curl.nmf | 53 -o curl.nmf |
| 62 popd | 54 popd |
| 63 | 55 |
| 64 InstallNaClTerm ${PUBLISH_DIR} | 56 InstallNaClTerm ${PUBLISH_DIR} |
| 65 LogExecute cp ${START_DIR}/index.html ${PUBLISH_DIR} | 57 LogExecute cp ${START_DIR}/index.html ${PUBLISH_DIR} |
| 66 LogExecute cp ${START_DIR}/curl.js ${PUBLISH_DIR} | 58 LogExecute cp ${START_DIR}/curl.js ${PUBLISH_DIR} |
| 67 } | 59 } |
| OLD | NEW |