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

Unified Diff: libraries/zlib/build.sh

Issue 52773003: Fix PNaCl build of zlib on buildbot. (Closed) Base URL: https://naclports.googlecode.com/svn/trunk/src
Patch Set: Created 7 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/zlib/build.sh
diff --git a/libraries/zlib/build.sh b/libraries/zlib/build.sh
index fe99ed0ddf688cf081f9082ee3265686cbbd95c0..fd0e83871e46c1268fc64543b4d839aadd153e9f 100755
--- a/libraries/zlib/build.sh
+++ b/libraries/zlib/build.sh
@@ -10,6 +10,7 @@ source ../../build_tools/common.sh
ConfigureStep() {
Banner "Configuring ${PACKAGE_NAME}"
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
+ LogExecute rm -f libz.*
# TODO: side-by-side install
local CONFIGURE_ARGS="--prefix=${NACLPORTS_PREFIX}"
local CFLAGS="-Dunlink=puts"
@@ -31,6 +32,7 @@ RunMinigzip() {
echo ' *** minigzip test FAILED ***' ; \
exit 1
fi
+ unset LD_LIBRARY_PATH
}
RunExample() {
@@ -42,7 +44,7 @@ RunExample() {
#echo ' *** zlib test FAILED ***'; \
#exit 1
#fi
- return
+ unset LD_LIBRARY_PATH
}
TestStep() {
@@ -87,7 +89,7 @@ PackageInstall() {
PreInstallStep
DownloadStep
ExtractStep
- # zlib doesn't need patching, so no patch step
+ PatchStep
jvoung (off chromium) 2013/10/30 18:26:52 Is this part of a separate change, or is PatchStep
Sam Clegg 2013/10/30 18:28:12 In a no-op when when there is no patch file.
ConfigureStep
BuildStep
ValidateStep
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698