| 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-bochs-2.4.6.sh | 7 # nacl-bochs-2.4.6.sh |
| 8 # | 8 # |
| 9 # usage: nacl-bochs-2.4.6.sh | 9 # usage: nacl-bochs-2.4.6.sh |
| 10 # | 10 # |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 source ../../../build_tools/common.sh | 25 source ../../../build_tools/common.sh |
| 26 | 26 |
| 27 BOCHS_EXAMPLE_DIR=${NACL_SRC}/examples/systems/bochs-2.4.6 | 27 BOCHS_EXAMPLE_DIR=${NACL_SRC}/examples/systems/bochs-2.4.6 |
| 28 | 28 |
| 29 CustomConfigureStep() { | 29 CustomConfigureStep() { |
| 30 Banner "Configuring ${PACKAGE_NAME}" | 30 Banner "Configuring ${PACKAGE_NAME}" |
| 31 # export the nacl tools | 31 # export the nacl tools |
| 32 export CC=${NACLCC} | 32 export CC=${NACLCC} |
| 33 export CXX=${NACLCXX} | 33 export CXX=${NACLCXX} |
| 34 export CXXFLAGS="-O2 -g -I${NACL_SDK_ROOT}/include" | 34 export CXXFLAGS="-O2 -g -I${NACL_SDK_ROOT}/include" |
| 35 export LDFLAGS="" | 35 export LDFLAGS="${NACLPORTS_LDFLAGS}" |
| 36 if [ ${NACL_ARCH} = "pnacl" ] ; then | 36 if [ ${NACL_ARCH} = "pnacl" ] ; then |
| 37 export CXXFLAGS="-O3 -g" | 37 export CXXFLAGS="-O3 -g" |
| 38 export LDFLAGS="-O0 -static" | 38 export LDFLAGS="-O0 -static" |
| 39 fi | 39 fi |
| 40 export AR=${NACLAR} | 40 export AR=${NACLAR} |
| 41 export RANLIB=${NACLRANLIB} | 41 export RANLIB=${NACLRANLIB} |
| 42 # path and package magic to make sure we call the right | 42 # path and package magic to make sure we call the right |
| 43 # sdl-config, etc. | 43 # sdl-config, etc. |
| 44 export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig | 44 export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig |
| 45 export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB} | 45 export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR} |
| 46 export PATH=${NACL_BIN_PATH}:${PATH}; | 46 export PATH=${NACL_BIN_PATH}:${PATH}; |
| 47 export PATH="${NACL_SDK_USR_BIN}:${PATH}" | 47 export PATH="${NACLPORTS_PREFIX_BIN}:${PATH}" |
| 48 | 48 |
| 49 export NACLBXLIBS="-lnacl-mounts -lpthread" | 49 export NACLBXLIBS="-lnacl-mounts -lpthread" |
| 50 | 50 |
| 51 # Hacky way of getting around the bochs configuration tools which don't allow | 51 # Hacky way of getting around the bochs configuration tools which don't allow |
| 52 # --whole-archive and don't allow for multiple libraries with the same name | 52 # --whole-archive and don't allow for multiple libraries with the same name |
| 53 # on the linker line | 53 # on the linker line |
| 54 PWD=$(pwd) | 54 PWD=$(pwd) |
| 55 # TODO(bradnelson): take this out once the sdk is fixed (and do the line | 55 # TODO(bradnelson): take this out once the sdk is fixed (and do the line |
| 56 # after). | 56 # after). |
| 57 if [ "$NACL_ARCH" = "x86_64" ]; then | 57 if [ "$NACL_ARCH" = "x86_64" ]; then |
| (...skipping 22 matching lines...) Expand all Loading... |
| 80 fi | 80 fi |
| 81 export LIBS="$LIBS -Wl,--end-group" | 81 export LIBS="$LIBS -Wl,--end-group" |
| 82 | 82 |
| 83 ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} | 83 ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME} |
| 84 Remove ${PACKAGE_NAME}-build | 84 Remove ${PACKAGE_NAME}-build |
| 85 MakeDir ${PACKAGE_NAME}-build | 85 MakeDir ${PACKAGE_NAME}-build |
| 86 cd ${PACKAGE_NAME}-build | 86 cd ${PACKAGE_NAME}-build |
| 87 ../configure \ | 87 ../configure \ |
| 88 --host=nacl \ | 88 --host=nacl \ |
| 89 --disable-shared \ | 89 --disable-shared \ |
| 90 --prefix=${NACL_SDK_USR} \ | 90 --prefix=${NACLPORTS_PREFIX} \ |
| 91 --exec-prefix=${NACL_SDK_USR} \ | 91 --exec-prefix=${NACLPORTS_PREFIX} \ |
| 92 --libdir=${NACL_SDK_USR_LIB} \ | 92 --libdir=${NACLPORTS_LIBDIR} \ |
| 93 --oldincludedir=${NACL_SDK_USR_INCLUDE} \ | 93 --oldincludedir=${NACLPORTS_INCLUDE} \ |
| 94 --with-x=no \ | 94 --with-x=no \ |
| 95 --with-x11=no \ | 95 --with-x11=no \ |
| 96 --with-sdl=yes \ | 96 --with-sdl=yes \ |
| 97 --with-gnu-ld | 97 --with-gnu-ld |
| 98 } | 98 } |
| 99 | 99 |
| 100 CustomExtractStep(){ | 100 CustomExtractStep(){ |
| 101 Banner "Untaring ${PACKAGE_NAME}.tar.gz" | 101 Banner "Untaring ${PACKAGE_NAME}.tar.gz" |
| 102 ChangeDir ${NACL_PACKAGES_REPOSITORY} | 102 ChangeDir ${NACL_PACKAGES_REPOSITORY} |
| 103 Remove ${PACKAGE_NAME} | 103 Remove ${PACKAGE_NAME} |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 DefaultBuildStep | 214 DefaultBuildStep |
| 215 if [ ${NACL_ARCH} = "pnacl" ] ; then | 215 if [ ${NACL_ARCH} = "pnacl" ] ; then |
| 216 DefaultTranslateStep ${PACKAGE_NAME} ${PACKAGE_NAME}-build/bochs | 216 DefaultTranslateStep ${PACKAGE_NAME} ${PACKAGE_NAME}-build/bochs |
| 217 fi | 217 fi |
| 218 CustomInstallStep | 218 CustomInstallStep |
| 219 DefaultCleanUpStep | 219 DefaultCleanUpStep |
| 220 } | 220 } |
| 221 | 221 |
| 222 CustomPackageInstall | 222 CustomPackageInstall |
| 223 exit 0 | 223 exit 0 |
| OLD | NEW |