diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-12-19 14:23:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-12-19 14:23:52 +0300 |
commit | d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853 (patch) | |
tree | 2e3d31568a5cf4f56e9da81e7954b56d3eadbdda /packaging/nacl/ports/zlib | |
parent | bc28a803b641cb7b33829a6bfd5f9a704cf21fbe (diff) | |
download | mv-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.tar.gz mv-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.tar.bz2 mv-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.tar.xz mv-d3fe6cbd77ac51c6d62ac6fffaf72a7825e7f853.zip |
Update nacl ports.
Diffstat (limited to 'packaging/nacl/ports/zlib')
-rw-r--r-- | packaging/nacl/ports/zlib/build.sh | 76 | ||||
-rw-r--r-- | packaging/nacl/ports/zlib/nacl.patch | 17 | ||||
-rw-r--r-- | packaging/nacl/ports/zlib/pkg_info | 5 |
3 files changed, 0 insertions, 98 deletions
diff --git a/packaging/nacl/ports/zlib/build.sh b/packaging/nacl/ports/zlib/build.sh deleted file mode 100644 index 96c860fd0..000000000 --- a/packaging/nacl/ports/zlib/build.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# Copyright (c) 2011 The Native Client Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# zlib doesn't support custom build directories so we have -# to build directly in the source dir. -BUILD_DIR=${SRC_DIR} -EXECUTABLES="minigzip${NACL_EXEEXT} example${NACL_EXEEXT}" -if [ "${NACL_SHARED}" = "1" ]; then - EXECUTABLES+=" libz.so.1" -fi - -ConfigureStep() { - LogExecute rm -f libz.* - SetupCrossEnvironment - CHOST=${NACL_CROSS_PREFIX} LogExecute ./configure --prefix=${PREFIX} -} - - -RunMinigzip() { -# export LD_LIBRARY_PATH=. -# if echo "hello world" | ./minigzip | ./minigzip -d; then -# echo ' *** minigzip test OK ***' -# else -# echo ' *** minigzip test FAILED ***' -# exit 1 -# fi -# unset LD_LIBRARY_PATH - return 0 -} - - -RunExample() { - export LD_LIBRARY_PATH=. - # This second test does not yet work on nacl (gzopen fails) - #if ./example; then \ - #echo ' *** zlib test OK ***'; \ - #else \ - #echo ' *** zlib test FAILED ***'; \ - #exit 1 - #fi - unset LD_LIBRARY_PATH -} - - -TestStep() { - if [ "${NACL_LIBC}" = "glibc" ]; then - # Tests do not currently run on GLIBC due to fdopen() not working - # TODO(sbc): Remove this once glibc is fixed: - # https://code.google.com/p/nativeclient/issues/detail?id=3362 - return - fi - - if [ "${NACL_ARCH}" = "pnacl" ]; then - local minigzip_pexe="minigzip${NACL_EXEEXT}" - local example_pexe="example${NACL_EXEEXT}" - local minigzip_script="minigzip" - local example_script="example" - TranslateAndWriteSelLdrScript ${minigzip_pexe} x86-32 \ - minigzip.x86-32.nexe ${minigzip_script} - RunMinigzip - TranslateAndWriteSelLdrScript ${minigzip_pexe} x86-64 \ - minigzip.x86-64.nexe ${minigzip_script} - RunMinigzip - TranslateAndWriteSelLdrScript ${example_pexe} x86-32 \ - example.x86-32.nexe ${example_script} - RunExample - TranslateAndWriteSelLdrScript ${example_pexe} x86-64 \ - example.x86-64.nexe ${example_script} - RunExample - else - RunMinigzip - RunExample - fi -} diff --git a/packaging/nacl/ports/zlib/nacl.patch b/packaging/nacl/ports/zlib/nacl.patch deleted file mode 100644 index 176552330..000000000 --- a/packaging/nacl/ports/zlib/nacl.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure b/configure -index b77a8a8..e52609f 100755 ---- a/configure -+++ b/configure -@@ -188,6 +188,12 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then - *BSD | *bsd* | DragonFly) - LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} - LDCONFIG="ldconfig -m" ;; -+ pnacl) -+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} -+ EXE='.pexe' ;; -+ nacl) -+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} -+ EXE='.nexe' ;; - CYGWIN* | Cygwin* | cygwin* | OS/2*) - EXE='.exe' ;; - MINGW* | mingw*) diff --git a/packaging/nacl/ports/zlib/pkg_info b/packaging/nacl/ports/zlib/pkg_info deleted file mode 100644 index 22f1701e5..000000000 --- a/packaging/nacl/ports/zlib/pkg_info +++ /dev/null @@ -1,5 +0,0 @@ -NAME=zlib -VERSION=1.2.8 -URL=http://www.zlib.net/zlib-1.2.8.tar.gz -LICENSE=CUSTOM:README -SHA1=a4d316c404ff54ca545ea71a27af7dbc29817088 |