Enable glibc shared library support for zlib.

examples/systems/bochs/nacl-bochs.sh

 #!/bin/bash
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-#
 
-# nacl-bochs.sh
-#
-# usage:  nacl-bochs.sh
-#
-# this script downloads, patches, and builds bochs for Native Client.
-#
+source pkg_info
+source ../../../build_tools/common.sh
 
 # Linux disk image
 readonly LINUX_IMG_URL=http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/bochs-linux-img.tar.gz
 readonly LINUX_IMG_NAME=linux-img
 
-source pkg_info
-source ../../../build_tools/common.sh
-
 BOCHS_EXAMPLE_DIR=${NACL_SRC}/examples/systems/bochs
+EXECUTABLES=bochs
 
 CustomConfigureStep() {
   Banner "Configuring ${PACKAGE_NAME}"
   # export the nacl tools
   export CC=${NACLCC}
   export CXX=${NACLCXX}
   export CXXFLAGS="-O2 -g -I${NACL_SDK_ROOT}/include"
   export LDFLAGS="${NACLPORTS_LDFLAGS}"
   if [ ${NACL_ARCH} = "pnacl" ] ; then
     export CXXFLAGS="-O3 -g -I${NACL_SDK_ROOT}/include"
@@ skipping 36 matching lines @@
   export LIBS="$LIBS -lnacl-mounts"
   export LIBS="$LIBS -lpthread"
   export LIBS="$LIBS -lppapi_cpp_COPY"
   # TOOD(robertm): investigate why this is only necessary for pnacl
   if [ ${NACL_ARCH} = "pnacl" ] ; then
     export LIBS="$LIBS -lnosys"
   fi
   export LIBS="$LIBS -Wl,--end-group"
 
   ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
-  Remove ${PACKAGE_NAME}-build
-  MakeDir ${PACKAGE_NAME}-build
-  cd ${PACKAGE_NAME}-build
+  Remove build-nacl
+  MakeDir build-nacl
+  cd build-nacl
   ../configure \
     --host=nacl \
     --disable-shared \
     --prefix=${NACLPORTS_PREFIX} \
     --exec-prefix=${NACLPORTS_PREFIX} \
     --libdir=${NACLPORTS_LIBDIR} \
     --oldincludedir=${NACLPORTS_INCLUDE} \
     --with-x=no \
     --with-x11=no \
     --with-sdl=yes \
     --with-gnu-ld
 }
 
 CustomExtractStep(){
   Banner "Untaring ${PACKAGE_NAME}.tar.gz"
   ChangeDir ${NACL_PACKAGES_REPOSITORY}
   Remove ${PACKAGE_NAME}
   if [ $OS_SUBDIR = "windows" ]; then
     tar --no-same-owner -zxf ${NACL_PACKAGES_TARBALLS}/${PACKAGE_NAME}.tar.gz
   else
     tar zxf ${NACL_PACKAGES_TARBALLS}/${PACKAGE_NAME}.tar.gz
   fi
 }
 
 CustomInstallStep(){
   BOCHS_DIR=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
-  BOCHS_BUILD=${BOCHS_DIR}/${PACKAGE_NAME}-build
+  BOCHS_BUILD=${BOCHS_DIR}/build-nacl
 
   ChangeDir ${BOCHS_DIR}
   mkdir -p img/usr/local/share/bochs/
   cp -r ${NACL_PACKAGES_REPOSITORY}/${LINUX_IMG_NAME} img/
   mv img/linux-img/bochsrc old-bochsrc
   cp ${START_DIR}/bochsrc img/linux-img/bochsrc
   cp -r ${BOCHS_DIR}/bios/VGABIOS-lgpl-latest img/
   cp -r ${BOCHS_DIR}/bios/BIOS-bochs-latest img/
   cp -r ${BOCHS_DIR}/msrs.def img/
   cd img
@@ skipping 80 matching lines @@
 
 CustomPackageInstall() {
   GameGetStep ${LINUX_IMG_URL} ${LINUX_IMG_NAME}
   DefaultPreInstallStep
   CustomDownloadStep2 ${URL} ${PACKAGE_NAME} \
     ${BOCHS_EXAMPLE_DIR}/bochs-2.4.6.sha1
   DefaultExtractStep
   CustomPatchStep
   CustomConfigureStep
   DefaultBuildStep
-  if [ ${NACL_ARCH} = "pnacl" ] ; then
-    DefaultTranslateStep ${PACKAGE_NAME} ${PACKAGE_NAME}-build/bochs
-  fi
+  DefaultTranslateStep
+  DefaultValidateStep
   CustomInstallStep
   DefaultCleanUpStep
 }
 
 CustomPackageInstall
 exit 0