OLD | NEW |
---|---|
1 #!/bin/bash | 1 #!/bin/bash |
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 # | 5 # |
6 | 6 |
7 # nacl-thttpd-2.25.sh | 7 # nacl-thttpd-2.25.sh |
8 # | 8 # |
9 # Usage: nacl-thttpd-2.25.sh | 9 # Usage: nacl-thttpd-2.25.sh |
10 # | 10 # |
(...skipping 25 matching lines...) Expand all Loading... | |
36 cp -f ${START_DIR}/${FILE} . | 36 cp -f ${START_DIR}/${FILE} . |
37 done | 37 done |
38 } | 38 } |
39 | 39 |
40 CustomBuildStep() { | 40 CustomBuildStep() { |
41 Banner "Building ${PACKAGE_NAME}" | 41 Banner "Building ${PACKAGE_NAME}" |
42 # export the nacl tools | 42 # export the nacl tools |
43 export CC=${NACLCC} | 43 export CC=${NACLCC} |
44 export NACLXX=${NACLCXX} | 44 export NACLXX=${NACLCXX} |
45 export CXX=${NACLCXX} | 45 export CXX=${NACLCXX} |
46 if [ ${NACL_PACKAGES_BITSIZE} == "pnacl" ] ; then | 46 if [ ${NACL_ARCH} = "pnacl" ] ; then |
47 export NACL_CCFLAGS="-O3 -g" | 47 export NACL_CCFLAGS="-O3 -g" |
48 export NACL_LDFLAGS="-O0 -static" | 48 export NACL_LDFLAGS="-O0 -static" |
49 fi | 49 fi |
50 export AR=${NACLAR} | 50 export AR=${NACLAR} |
51 export RANLIB=${NACLRANLIB} | 51 export RANLIB=${NACLRANLIB} |
52 export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig | 52 export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig |
53 export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB} | 53 export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB} |
54 export PATH=${NACL_BIN_PATH}:${PATH}; | 54 export PATH=${NACL_BIN_PATH}:${PATH}; |
55 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" | 55 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" |
56 ChangeDir ${PACKAGE_DIR} | 56 ChangeDir ${PACKAGE_DIR} |
57 make thttpd | 57 make thttpd |
58 } | 58 } |
59 | 59 |
60 CustomInstallStep() { | 60 CustomInstallStep() { |
61 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}" | 61 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}" |
62 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" | 62 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" |
63 MakeDir ${PUBLISH_DIR} | 63 MakeDir ${PUBLISH_DIR} |
64 install ${START_DIR}/thttpd.html ${PUBLISH_DIR} | 64 install ${START_DIR}/thttpd.html ${PUBLISH_DIR} |
65 install ${START_DIR}/nacl.js ${PUBLISH_DIR} | 65 install ${START_DIR}/nacl.js ${PUBLISH_DIR} |
66 install ${START_DIR}/peppermount_helper.js ${PUBLISH_DIR} | 66 install ${START_DIR}/peppermount_helper.js ${PUBLISH_DIR} |
67 install ${START_DIR}/json2min.js ${PUBLISH_DIR} | 67 install ${START_DIR}/json2min.js ${PUBLISH_DIR} |
68 BUILD_DIR=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} | 68 BUILD_DIR=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} |
69 cp ${BUILD_DIR}/thttpd ${BUILD_DIR}/thttpd_x86-${NACL_PACKAGES_BITSIZE}.nexe | 69 cp ${BUILD_DIR}/thttpd ${BUILD_DIR}/thttpd_x86-${NACL_PACKAGES_BITSIZE}.nexe |
70 install ${BUILD_DIR}/thttpd_x86-${NACL_PACKAGES_BITSIZE}.nexe \ | 70 install ${BUILD_DIR}/thttpd_x86-${NACL_PACKAGES_BITSIZE}.nexe \ |
71 ${PUBLISH_DIR}/thttpd_x86-${NACL_PACKAGES_BITSIZE}.nexe | 71 ${PUBLISH_DIR}/thttpd_x86-${NACL_PACKAGES_BITSIZE}.nexe |
72 ChangeDir ${PUBLISH_DIR} | 72 ChangeDir ${PUBLISH_DIR} |
73 local NACL_LIB_PATH=$NACL_TOOLCHAIN_ROOT/x86_64-nacl | 73 local NACL_LIB_PATH=$NACL_TOOLCHAIN_ROOT/x86_64-nacl |
74 local NACL_COMPLEMENT_BITSIZE=64 | 74 local NACL_COMPLEMENT_BITSIZE=64 |
75 if [ ${NACL_PACKAGES_BITSIZE} == "64" ]; then | 75 if [ ${NACL_PACKAGES_BITSIZE} = "64" ]; then |
bradn
2012/12/21 19:24:40
Did you mean to change this one to arch ?
Sam Clegg
2012/12/28 15:31:43
Done.
| |
76 NACL_COMPLEMENT_BITSIZE=32 | 76 NACL_COMPLEMENT_BITSIZE=32 |
77 fi | 77 fi |
78 if [ -f thttpd_x86-${NACL_COMPLEMENT_BITSIZE}.nexe ]; then | 78 if [ -f thttpd_x86-${NACL_COMPLEMENT_BITSIZE}.nexe ]; then |
79 $NACL_SDK_ROOT/tools/create_nmf.py \ | 79 $NACL_SDK_ROOT/tools/create_nmf.py \ |
80 -L$NACL_LIB_PATH/usr/lib$NACL_COMPLEMENT_BITSIZE \ | 80 -L$NACL_LIB_PATH/usr/lib$NACL_COMPLEMENT_BITSIZE \ |
81 -L$NACL_LIB_PATH/lib$NACL_COMPLEMENT_BITSIZE \ | 81 -L$NACL_LIB_PATH/lib$NACL_COMPLEMENT_BITSIZE \ |
82 -L$NACL_LIB_PATH/usr/lib$NACL_PACKAGES_BITSIZE \ | 82 -L$NACL_LIB_PATH/usr/lib$NACL_PACKAGES_BITSIZE \ |
83 -L$NACL_LIB_PATH/lib$NACL_PACKAGES_BITSIZE \ | 83 -L$NACL_LIB_PATH/lib$NACL_PACKAGES_BITSIZE \ |
84 -D$NACL_BIN_PATH/x86_64-nacl-objdump \ | 84 -D$NACL_BIN_PATH/x86_64-nacl-objdump \ |
85 -o thttpd.nmf -s . \ | 85 -o thttpd.nmf -s . \ |
(...skipping 16 matching lines...) Expand all Loading... | |
102 DefaultExtractStep | 102 DefaultExtractStep |
103 DefaultPatchStep | 103 DefaultPatchStep |
104 PreConfigureStep | 104 PreConfigureStep |
105 CustomBuildStep | 105 CustomBuildStep |
106 CustomInstallStep | 106 CustomInstallStep |
107 DefaultCleanUpStep | 107 DefaultCleanUpStep |
108 } | 108 } |
109 | 109 |
110 CustomPackageInstall | 110 CustomPackageInstall |
111 exit 0 | 111 exit 0 |
OLD | NEW |