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

Unified Diff: libraries/SDL_mixer-1.2.11/nacl-SDL_mixer-1.2.11.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/SDL_mixer-1.2.11/nacl-SDL_mixer-1.2.11.sh
diff --git a/libraries/SDL_mixer-1.2.11/nacl-SDL_mixer-1.2.11.sh b/libraries/SDL_mixer-1.2.11/nacl-SDL_mixer-1.2.11.sh
index d8d2a9aec762890a909c5e5ad26788e636a5c20a..0f0e6f3c98a7aa230dacfb888b2ea2bdad28934b 100755
--- a/libraries/SDL_mixer-1.2.11/nacl-SDL_mixer-1.2.11.sh
+++ b/libraries/SDL_mixer-1.2.11/nacl-SDL_mixer-1.2.11.sh
@@ -17,6 +17,7 @@ readonly PATCH_FILE=nacl-SDL_mixer-1.2.11.patch
readonly PACKAGE_NAME=SDL_mixer-1.2.11
source ../../build_tools/common.sh
+set -x
CustomConfigureStep() {
Banner "Configuring ${PACKAGE_NAME}"
@@ -25,10 +26,10 @@ 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}
# Adding target usr/bin for libmikmod-config
- export PATH=${NACL_BIN_PATH}:${NACL_SDK_USR}/bin:${PATH};
+ export PATH=${NACL_BIN_PATH}:${NACLPORTS_PREFIX}/bin:${PATH};
export LIBS="-lvorbisfile -lvorbis -logg -lm"
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
Remove ${PACKAGE_NAME}-build
@@ -37,10 +38,10 @@ CustomConfigureStep() {
../configure \
--host=nacl \
--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} \
--${NACL_OPTION}-mmx \
--${NACL_OPTION}-sse \
--${NACL_OPTION}-sse2 \

Powered by Google App Engine
This is Rietveld 408576698