Chromium Code Reviews| 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 |