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

Unified Diff: libraries/Mesa-7.6/nacl-Mesa-7.6.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 side-by-side diff with in-line comments
Download patch
Index: libraries/Mesa-7.6/nacl-Mesa-7.6.sh
diff --git a/libraries/Mesa-7.6/nacl-Mesa-7.6.sh b/libraries/Mesa-7.6/nacl-Mesa-7.6.sh
index a2d7dba0ec862c51048cf209f057887c10a51123..a828c21c2c152009a614fbd6f36d6fd74bb306ab 100755
--- a/libraries/Mesa-7.6/nacl-Mesa-7.6.sh
+++ b/libraries/Mesa-7.6/nacl-Mesa-7.6.sh
@@ -21,8 +21,8 @@ CustomConfigureStep() {
export AR=${NACLAR}
export LD=${NACLLD}
export RANLIB=${NACLRANLIB}
- export PKG_CONFIG_PATH=${NACL_SDK_USR}/lib/pkgconfig
- export PKG_CONFIG_LIBDIR=${NACL_SDK_USR}/lib
+ export PKG_CONFIG_PATH=${NACLPORTS_PREFIX}/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR=${NACLPORTS_PREFIX}/lib
export PATH=${NACL_BIN_PATH}:${PATH};
export X11_INCLUDES=
cd ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
@@ -30,11 +30,11 @@ CustomConfigureStep() {
--host=nacl \
--disable-shared \
--enable-static \
- --prefix=${NACL_SDK_USR} \
- --exec-prefix=${NACL_SDK_USR} \
- --libdir=${NACL_SDK_USR}/lib \
- --oldincludedir=${NACL_SDK_USR}/include \
- --datarootdir=${NACL_SDK_USR} \
+ --prefix=${NACLPORTS_PREFIX} \
+ --exec-prefix=${NACLPORTS_PREFIX} \
+ --libdir=${NACLPORTS_PREFIX}/lib \
+ --oldincludedir=${NACLPORTS_PREFIX}/include \
+ --datarootdir=${NACLPORTS_PREFIX} \
--disable-gl-osmesa \
--with-x=no \
--with-driver=osmesa \

Powered by Google App Engine
This is Rietveld 408576698