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

Unified Diff: libraries/x264-snapshot-20091023-2245/nacl-x264-snapshot-20091023-2245.sh

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: 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/x264-snapshot-20091023-2245/nacl-x264-snapshot-20091023-2245.sh
diff --git a/libraries/x264-snapshot-20091023-2245/nacl-x264-snapshot-20091023-2245.sh b/libraries/x264-snapshot-20091023-2245/nacl-x264-snapshot-20091023-2245.sh
index d6a4ef9dff7336a0562764cdaef72d1b4a28b6a7..f362f28fd15c7bd478983270a8e86b4c2fa870d5 100755
--- a/libraries/x264-snapshot-20091023-2245/nacl-x264-snapshot-20091023-2245.sh
+++ b/libraries/x264-snapshot-20091023-2245/nacl-x264-snapshot-20091023-2245.sh
@@ -25,8 +25,8 @@ CustomConfigureStep() {
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 PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
+ export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
export PATH=${NACL_BIN_PATH}:${PATH};
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
@@ -41,9 +41,9 @@ CustomConfigureStep() {
--cross-prefix=${NACL_CROSS_PREFIX} \
--disable-asm \
--disable-pthread \
- --prefix=${NACL_SDK_USR} \
- --exec-prefix=${NACL_SDK_USR} \
- --libdir=${NACL_SDK_USR_LIB} \
+ --prefix=${NACLPORTS_PREFIX} \
+ --exec-prefix=${NACLPORTS_PREFIX} \
+ --libdir=${NACLPORTS_LIBDIR} \
--extra-ldflags='-lnosys -lm' \
--host=${naclhost}"
@@ -51,9 +51,9 @@ CustomConfigureStep() {
--cross-prefix=${NACL_CROSS_PREFIX} \
--disable-asm \
--disable-pthread \
- --prefix=${NACL_SDK_USR} \
- --exec-prefix=${NACL_SDK_USR} \
- --libdir=${NACL_SDK_USR_LIB} \
+ --prefix=${NACLPORTS_PREFIX} \
+ --exec-prefix=${NACLPORTS_PREFIX} \
+ --libdir=${NACLPORTS_LIBDIR} \
--extra-ldflags="-lnosys -lm" \
--host=${naclhost}
}

Powered by Google App Engine
This is Rietveld 408576698