| OLD | NEW |
| 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2011 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 EXECUTABLES="scp${NACL_EXEEXT} ssh${NACL_EXEEXT} \ | 5 EXECUTABLES="scp${NACL_EXEEXT} ssh${NACL_EXEEXT} \ |
| 6 ssh-add${NACL_EXEEXT} sshd${NACL_EXEEXT}" | 6 ssh-add${NACL_EXEEXT} sshd${NACL_EXEEXT}" |
| 7 INSTALL_TARGETS="install-nokeys" | 7 INSTALL_TARGETS="install-nokeys" |
| 8 | 8 |
| 9 # Add --with-privsep-path otherwise openssh creates /var/empty | 9 # Add --with-privsep-path otherwise openssh creates /var/empty |
| 10 # in the root of DESTDIR. | 10 # in the root of DESTDIR. |
| 11 EXTRA_CONFIGURE_ARGS="--with-privsep-path=${PREFIX}/var/empty" | 11 EXTRA_CONFIGURE_ARGS="--with-privsep-path=${PREFIX}/var/empty" |
| 12 | 12 |
| 13 # Force configure to recognise the existence of truncate | 13 # Force configure to recognise the existence of truncate |
| 14 # and sigaction. Normally it will detect that both this functions | 14 # and sigaction. Normally it will detect that both this functions |
| 15 # are implemented by glibc in terms of NOSYS. | 15 # are implemented by glibc in terms of NOSYS. |
| 16 export ac_cv_func_truncate=yes | 16 export ac_cv_func_truncate=yes |
| 17 export ac_cv_func_sigaction=yes | 17 export ac_cv_func_sigaction=yes |
| 18 | 18 |
| 19 export SSHLIBS="${NACL_CLI_MAIN_LIB}" | |
| 20 if [ "${NACL_LIBC}" = "newlib" ]; then | 19 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 21 NACLPORTS_LIBS+=" -lcrypto" | 20 NACLPORTS_LIBS+=" -lcrypto" |
| 22 export LD="${NACLCXX}" | 21 export LD="${NACLCXX}" |
| 23 fi | 22 fi |
| 24 | 23 |
| 25 if [ "${NACL_LIBC}" = "glibc" ]; then | 24 if [ "${NACL_LIBC}" = "glibc" ]; then |
| 26 # The host version of 'strip' doesn't always recognise NaCl binaries | 25 # The host version of 'strip' doesn't always recognise NaCl binaries |
| 27 # and ssh runs 'install -s' which doesn't always runs the host 'strip' | 26 # and ssh runs 'install -s' which doesn't always runs the host 'strip' |
| 28 EXTRA_CONFIGURE_ARGS+=" --disable-strip" | 27 EXTRA_CONFIGURE_ARGS+=" --disable-strip" |
| 29 fi | 28 fi |
| 30 | 29 |
| 30 EnableCliMain |
| 31 EnableGlibcCompat | 31 EnableGlibcCompat |
| 32 | 32 |
| 33 PublishStep() { | 33 PublishStep() { |
| 34 DefaultInstallStep | |
| 35 | |
| 36 MakeDir ${PUBLISH_DIR} | 34 MakeDir ${PUBLISH_DIR} |
| 37 local ASSEMBLY_DIR="${PUBLISH_DIR}/openssh" | 35 local ASSEMBLY_DIR="${PUBLISH_DIR}/openssh" |
| 38 MakeDir ${ASSEMBLY_DIR} | 36 MakeDir ${ASSEMBLY_DIR} |
| 39 LogExecute cp ssh${NACL_EXEEXT} \ | 37 LogExecute cp ssh${NACL_EXEEXT} \ |
| 40 ${ASSEMBLY_DIR}/ssh_${NACL_ARCH}${NACL_EXEEXT} | 38 ${ASSEMBLY_DIR}/ssh_${NACL_ARCH}${NACL_EXEEXT} |
| 41 | 39 |
| 42 pushd ${ASSEMBLY_DIR} | 40 pushd ${ASSEMBLY_DIR} |
| 43 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ | 41 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ |
| 44 ssh_*${NACL_EXEEXT} \ | 42 ssh_*${NACL_EXEEXT} \ |
| 45 -s . \ | 43 -s . \ |
| 46 -o openssh.nmf | 44 -o openssh.nmf |
| 47 LogExecute python ${TOOLS_DIR}/create_term.py openssh.nmf | 45 LogExecute python ${TOOLS_DIR}/create_term.py openssh.nmf |
| 48 popd | 46 popd |
| 49 | 47 |
| 50 InstallNaClTerm ${ASSEMBLY_DIR} | 48 InstallNaClTerm ${ASSEMBLY_DIR} |
| 51 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR} | 49 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR} |
| 52 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR} | 50 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR} |
| 53 } | 51 } |
| OLD | NEW |