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

Unified Diff: libraries/fftw-3.2.2/nacl-fftw-3.2.2.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
« no previous file with comments | « libraries/ffmpeg-0.5/nacl-ffmpeg-0.5.sh ('k') | libraries/flac-1.2.1/nacl-flac-1.2.1.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/fftw-3.2.2/nacl-fftw-3.2.2.sh
diff --git a/libraries/fftw-3.2.2/nacl-fftw-3.2.2.sh b/libraries/fftw-3.2.2/nacl-fftw-3.2.2.sh
index 6b07141aaa0c5915fb545bb9739b8c1d8ff07273..71b7f0172771ad83744e429cbe803715a16ff61e 100755
--- a/libraries/fftw-3.2.2/nacl-fftw-3.2.2.sh
+++ b/libraries/fftw-3.2.2/nacl-fftw-3.2.2.sh
@@ -21,8 +21,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}
if [ ${NACL_ARCH} = "pnacl" ] ; then
@@ -31,7 +31,7 @@ CustomConfigureStep() {
extra="--enable-sse2"
fi
- ./configure --prefix=${NACL_SDK_USR} --host=nacl ${extra}
+ ./configure --prefix=${NACLPORTS_PREFIX} --host=nacl ${extra}
}
« no previous file with comments | « libraries/ffmpeg-0.5/nacl-ffmpeg-0.5.sh ('k') | libraries/flac-1.2.1/nacl-flac-1.2.1.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698