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

Side by Side Diff: ports/openssh/build.sh

Issue 907563002: Simplify cli_main (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « ports/ninja/build.sh ('k') | ports/python-static/build.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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="-lppapi_simple -lnacl_io -lcli_main -lppapi_cpp \ 19 export SSHLIBS="-lppapi_simple -lnacl_io -lnacl_spawn -lcli_main -lppapi_cpp \
20 -lppapi -l${NACL_CPP_LIB}" 20 -lppapi -l${NACL_CPP_LIB}"
21 if [ "${NACL_LIBC}" = "newlib" ]; then 21 if [ "${NACL_LIBC}" = "newlib" ]; then
22 CFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" 22 CFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat"
23 export LIBS=" -lcrypto -lglibc-compat" 23 export LIBS=" -lcrypto -lglibc-compat"
24 export LD="${NACLCXX}" 24 export LD="${NACLCXX}"
25 fi 25 fi
26 26
27 PublishStep() { 27 PublishStep() {
28 MakeDir ${PUBLISH_DIR} 28 MakeDir ${PUBLISH_DIR}
29 local ASSEMBLY_DIR="${PUBLISH_DIR}/openssh" 29 local ASSEMBLY_DIR="${PUBLISH_DIR}/openssh"
30 MakeDir ${ASSEMBLY_DIR} 30 MakeDir ${ASSEMBLY_DIR}
31 LogExecute cp ssh${NACL_EXEEXT} \ 31 LogExecute cp ssh${NACL_EXEEXT} \
32 ${ASSEMBLY_DIR}/ssh_${NACL_ARCH}${NACL_EXEEXT} 32 ${ASSEMBLY_DIR}/ssh_${NACL_ARCH}${NACL_EXEEXT}
33 33
34 pushd ${ASSEMBLY_DIR} 34 pushd ${ASSEMBLY_DIR}
35 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \ 35 LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \
36 ssh_*${NACL_EXEEXT} \ 36 ssh_*${NACL_EXEEXT} \
37 -s . \ 37 -s . \
38 -o openssh.nmf 38 -o openssh.nmf
39 LogExecute python ${TOOLS_DIR}/create_term.py openssh.nmf 39 LogExecute python ${TOOLS_DIR}/create_term.py openssh.nmf
40 popd 40 popd
41 41
42 InstallNaClTerm ${ASSEMBLY_DIR} 42 InstallNaClTerm ${ASSEMBLY_DIR}
43 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR} 43 LogExecute cp ${START_DIR}/background.js ${ASSEMBLY_DIR}
44 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR} 44 LogExecute cp ${START_DIR}/manifest.json ${ASSEMBLY_DIR}
45 } 45 }
OLDNEW
« no previous file with comments | « ports/ninja/build.sh ('k') | ports/python-static/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698