Allow re-targeting of naclports install

build_tools/common.sh

 # 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.
 #
 # Environment variable NACL_ARCH should be unset or set to "i686"
 # for a 32-bit build.  It should be set to "x86_64", "pnacl", or "arm"
 # for a 64-bit, pnacl, or arm builds.
 
 
 # NAMING CONVENTION
@@ skipping 157 matching lines @@
   export NACLCXX=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-g++
   export NACLAR=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ar
   export NACLRANLIB=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ranlib
   export NACLLD=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ld
   export NACLSTRINGS=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strings
   export NACLSTRIP=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strip
 
   # NACL_SDK_GCC_SPECS_PATH is where nacl-gcc 'specs' file will be installed
   readonly NACL_SDK_GCC_SPECS_PATH=${NACL_TOOLCHAIN_ROOT}/lib/gcc/x86_64-nacl/4.4.3
 
-  # NACL_SDK_USR is where the headers, libraries, etc. will be installed
-  readonly NACL_SDK_USR=${NACL_TOOLCHAIN_ROOT}/${NACL_CROSS_PREFIX}/usr
-  readonly NACL_SDK_USR_INCLUDE=${NACL_SDK_USR}/include
-
   if [ ${NACL_ARCH} = "arm" ] ; then
     local NACL_LIBDIR=arm-nacl/lib
   elif [ ${NACL_ARCH} = "x86_64" ] ; then
     local NACL_LIBDIR=x86_64-nacl/lib64
   else
     local NACL_LIBDIR=x86_64-nacl/lib32
   fi
 
+  # NACLPORTS_PREFIX is where the headers, libraries, etc. will be installed
+  # Default to the usr folder within the SDK.
+  readonly NACLPORTS_PREFIX=${NACLPORTS_PREFIX:-${NACL_TOOLCHAIN_ROOT}/${NACL_CROSS_PREFIX}/usr}
+  readonly NACLPORTS_INCLUDE=${NACLPORTS_PREFIX}/include
   readonly NACL_SDK_LIB=${NACL_TOOLCHAIN_ROOT}/${NACL_LIBDIR}
+  readonly NACLPORTS_LIBDIR=${NACLPORTS_PREFIX}/lib
+  readonly NACLPORTS_PREFIX_BIN=${NACLPORTS_PREFIX}/bin
 
-  readonly NACL_SDK_USR_LIB=${NACL_SDK_USR}/lib
-  readonly NACL_SDK_USR_BIN=${NACL_SDK_USR}/bin
+  readonly NACLPORTS_CFLAGS="-I${NACLPORTS_INCLUDE}"
+  readonly NACLPORTS_LDFLAGS="-L${NACLPORTS_LIBDIR}"
+  export CFLAGS=${NACLPORTS_CFLAGS}
+  export LDFLAGS=${NACLPORTS_LDFLAGS}
 
-  # NACL_SDK_MULITARCH_USR is a version of NACL_SDK_USR that gets passed into
+  # NACL_SDK_MULITARCH_USR is a version of NACLPORTS_PREFIX that gets passed into
   # the gcc specs file.  It has a gcc spec-file conditional for ${NACL_ARCH}
   readonly NACL_SDK_MULTIARCH_USR=${NACL_TOOLCHAIN_ROOT}/\%\(nacl_arch\)/usr
   readonly NACL_SDK_MULTIARCH_USR_INCLUDE=${NACL_SDK_MULTIARCH_USR}/include
   readonly NACL_SDK_MULTIARCH_USR_LIB=${NACL_SDK_MULTIARCH_USR}/lib
 }
 
 
 InitializePNaClToolchain() {
   NACL_GLIBC=${NACL_GLIBC:-0}
   if [ $NACL_GLIBC = "1" ] ; then
@@ skipping 17 matching lines @@
   # pnacl's translator
   export TRANSLATOR=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-translate
   # pnacl's pexe optimizer
   export OPT=${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-opt
   # TODO(robertm): figure our why we do not have a pnacl-string
   #export NACLSTRINGS=${NACL_BIN_PATH}/pnacl-strings
   # until then use the host's strings tool
   # (used only by the cairo package)
   export NACLSTRINGS="$(which strings)"
 
-  # NACL_SDK_USR is where the headers, libraries, etc. will be installed
+  # NACLPORTS_PREFIX is where the headers, libraries, etc. will be installed
   # FIXME:
-  readonly NACL_SDK_USR=${NACL_SDK_BASE}/usr
-  readonly NACL_SDK_USR_INCLUDE=${NACL_SDK_USR}/include
-  readonly NACL_SDK_USR_LIB=${NACL_SDK_USR}/lib
-  readonly NACL_SDK_USR_BIN=${NACL_SDK_USR}/bin
+  readonly NACLPORTS_PREFIX=${NACL_SDK_BASE}/usr
+  readonly NACLPORTS_INCLUDE=${NACLPORTS_PREFIX}/include
+  readonly NACLPORTS_LIBDIR=${NACLPORTS_PREFIX}/lib
+  readonly NACLPORTS_PREFIX_BIN=${NACLPORTS_PREFIX}/bin
 }
 
 if [ ${NACL_ARCH} = "pnacl" ] ; then
   InitializePNaClToolchain
 else
   InitializeNaClGccToolchain
 fi
 
 ######################################################################
 # Always run
@@ skipping 216 matching lines @@
     }" |\
     sed "/*link_libgcc:/{
       N
       s|$| -L${SED_SAFE_SPACES_USR_LIB}|
     }" >${NACL_SDK_GCC_SPECS_PATH}/specs
 }
 
 
 DefaultPreInstallStep() {
   cd ${NACL_NATIVE_CLIENT_SDK}/..
-  MakeDir ${NACL_SDK_USR}
-  MakeDir ${NACL_SDK_USR_INCLUDE}
-  MakeDir ${NACL_SDK_USR_LIB}
+  MakeDir ${NACLPORTS_PREFIX}
+  MakeDir ${NACLPORTS_INCLUDE}
+  MakeDir ${NACLPORTS_LIBDIR}
   MakeDir ${NACL_PACKAGES_REPOSITORY}
   MakeDir ${NACL_PACKAGES_TARBALLS}
   MakeDir ${NACL_PACKAGES_PUBLISH}
   Remove ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
 }
 
 
 DefaultExtractStep() {
   Banner "Untaring ${PACKAGE_NAME}.tgz"
   ChangeDir ${NACL_PACKAGES_REPOSITORY}
@@ skipping 46 matching lines @@
 
 
 DefaultConfigureStep() {
   local EXTRA_CONFIGURE_OPTS=("${@:-}")
   Banner "Configuring ${PACKAGE_NAME}"
   # export the nacl tools
   export CC=${NACLCC}
   export CXX=${NACLCXX}
   export AR=${NACLAR}
   export RANLIB=${NACLRANLIB}
-  export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig
-  export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB}
-  export FREETYPE_CONFIG=${NACL_SDK_USR_BIN}/freetype-config
+  export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
+  export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
+  export FREETYPE_CONFIG=${NACLPORTS_PREFIX_BIN}/freetype-config
   export PATH=${NACL_BIN_PATH}:${PATH};
   ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
   Remove ${PACKAGE_NAME}-build
   MakeDir ${PACKAGE_NAME}-build
   cd ${PACKAGE_NAME}-build
   echo "Directory: $(pwd)"
 
   local conf_host=${NACL_CROSS_PREFIX}
   if [[ ${NACL_ARCH} = "pnacl" ]]; then
     # The PNaCl tools use "pnacl-" as the prefix, but config.sub
     # does not know about "pnacl".  It only knows about "le32-nacl".
     # Unfortunately, most of the config.subs here are so old that
     # it doesn't know about that "le32" either.  So we just say "nacl".
     conf_host="nacl"
   fi
   ../configure \
     --host=${conf_host} \
     --disable-shared \
-    --prefix=${NACL_SDK_USR} \
-    --exec-prefix=${NACL_SDK_USR} \
-    --libdir=${NACL_SDK_USR_LIB} \
-    --oldincludedir=${NACL_SDK_USR_INCLUDE} \
+    --prefix=${NACLPORTS_PREFIX} \
+    --exec-prefix=${NACLPORTS_PREFIX} \
+    --libdir=${NACLPORTS_LIBDIR} \
+    --oldincludedir=${NACLPORTS_INCLUDE} \
     --with-http=off \
     --with-html=off \
     --with-ftp=off \
     --${NACL_OPTION}-mmx \
     --${NACL_OPTION}-sse \
     --${NACL_OPTION}-sse2 \
     --${NACL_OPTION}-asm \
     --with-x=no  \
     "${EXTRA_CONFIGURE_OPTS[@]}"
 }
@@ skipping 108 matching lines @@
 DefaultPackageInstall() {
   DefaultPreInstallStep
   DefaultDownloadStep
   DefaultExtractStep
   DefaultPatchStep
   DefaultConfigureStep
   DefaultBuildStep
   DefaultInstallStep
   DefaultCleanUpStep
 }