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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: examples/tools/thttpd-2.25b/nacl-thttpd-2.25b.sh

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: rebase Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh ('k') | libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 # export the nacl tools 39 # export the nacl tools
40 export CC=${NACLCC} 40 export CC=${NACLCC}
41 export NACLXX=${NACLCXX} 41 export NACLXX=${NACLCXX}
42 export CXX=${NACLCXX} 42 export CXX=${NACLCXX}
43 if [ ${NACL_ARCH} = "pnacl" ] ; then 43 if [ ${NACL_ARCH} = "pnacl" ] ; then
44 export NACL_CCFLAGS="-O3 -g" 44 export NACL_CCFLAGS="-O3 -g"
45 export NACL_LDFLAGS="-O0 -static" 45 export NACL_LDFLAGS="-O0 -static"
46 fi 46 fi
47 export AR=${NACLAR} 47 export AR=${NACLAR}
48 export RANLIB=${NACLRANLIB} 48 export RANLIB=${NACLRANLIB}
49 export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig 49 export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
50 export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB} 50 export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
51 export PATH=${NACL_BIN_PATH}:${PATH}; 51 export PATH=${NACL_BIN_PATH}:${PATH};
52 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" 52 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}"
53 ChangeDir ${PACKAGE_DIR} 53 ChangeDir ${PACKAGE_DIR}
54 make thttpd 54 make thttpd
55 } 55 }
56 56
57 CustomInstallStep() { 57 CustomInstallStep() {
58 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}" 58 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}"
59 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}" 59 local PACKAGE_DIR="${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}"
60 MakeDir ${PUBLISH_DIR} 60 MakeDir ${PUBLISH_DIR}
(...skipping 10 matching lines...) Expand all
71 local NACL_COMPLEMENT_ARCH="x86_64" 71 local NACL_COMPLEMENT_ARCH="x86_64"
72 local NACL_COMPLEMENT_LIBDDIR="lib64" 72 local NACL_COMPLEMENT_LIBDDIR="lib64"
73 if [ ${NACL_ARCH} = "x86_64" ]; then 73 if [ ${NACL_ARCH} = "x86_64" ]; then
74 NACL_COMPLEMENT_ARCH="i686" 74 NACL_COMPLEMENT_ARCH="i686"
75 NACL_COMPLEMENT_LIBDIR="lib32" 75 NACL_COMPLEMENT_LIBDIR="lib32"
76 fi 76 fi
77 if [ -f thttpd_${NACL_COMPLEMENT_ARCH}.nexe ]; then 77 if [ -f thttpd_${NACL_COMPLEMENT_ARCH}.nexe ]; then
78 $NACL_SDK_ROOT/tools/create_nmf.py \ 78 $NACL_SDK_ROOT/tools/create_nmf.py \
79 -L$NACL_LIB_PATH/usr/lib$NACL_COMPLEMENT_LIBDIR \ 79 -L$NACL_LIB_PATH/usr/lib$NACL_COMPLEMENT_LIBDIR \
80 -L$NACL_LIB_PATH/lib$NACL_COMPLEMENT_LIBDIR \ 80 -L$NACL_LIB_PATH/lib$NACL_COMPLEMENT_LIBDIR \
81 -L$NACL_SDK_USR_LIB \ 81 -L$NACLPORTS_LIBDIR \
82 -L$NACL_SDK_LIB \ 82 -L$NACL_SDK_LIB \
83 -D$NACL_BIN_PATH/x86_64-nacl-objdump \ 83 -D$NACL_BIN_PATH/x86_64-nacl-objdump \
84 -o thttpd.nmf -s . \ 84 -o thttpd.nmf -s . \
85 thttpd_${NACL_ARCH}.nexe \ 85 thttpd_${NACL_ARCH}.nexe \
86 thttpd_${NACL_COMPLEMENT_ARCH}.nexe 86 thttpd_${NACL_COMPLEMENT_ARCH}.nexe
87 else 87 else
88 $NACL_SDK_ROOT/tools/create_nmf.py \ 88 $NACL_SDK_ROOT/tools/create_nmf.py \
89 -L$NACL_SDK_USR_LIB \ 89 -L$NACLPORTS_LIBDIR \
90 -L$NACL_SDK_LIB \ 90 -L$NACL_SDK_LIB \
91 -D$NACL_BIN_PATH/x86_64-nacl-objdump \ 91 -D$NACL_BIN_PATH/x86_64-nacl-objdump \
92 -o thttpd.nmf -s . \ 92 -o thttpd.nmf -s . \
93 thttpd_${NACL_ARCH}.nexe 93 thttpd_${NACL_ARCH}.nexe
94 fi 94 fi
95 DefaultTouchStep 95 DefaultTouchStep
96 } 96 }
97 97
98 CustomPackageInstall() { 98 CustomPackageInstall() {
99 DefaultPreInstallStep 99 DefaultPreInstallStep
100 DefaultDownloadStep 100 DefaultDownloadStep
101 DefaultExtractStep 101 DefaultExtractStep
102 DefaultPatchStep 102 DefaultPatchStep
103 PreConfigureStep 103 PreConfigureStep
104 CustomBuildStep 104 CustomBuildStep
105 CustomInstallStep 105 CustomInstallStep
106 DefaultCleanUpStep 106 DefaultCleanUpStep
107 } 107 }
108 108
109 CustomPackageInstall 109 CustomPackageInstall
110 exit 0 110 exit 0
OLDNEW
« no previous file with comments | « examples/systems/dosbox-0.74/nacl-dosbox-0.74.sh ('k') | libraries/FreeImage-3.14.1/nacl-FreeImage-3.14.1.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698