From 28a22968dcd424a793dde3f7d95803fe52916da2 Mon Sep 17 00:00:00 2001 From: Jamie Hewland Date: Fri, 6 Jul 2018 19:43:11 +0200 Subject: [PATCH] Fix nis library condition --- 3.4/alpine3.7/Dockerfile | 2 -- 3.5/alpine3.7/Dockerfile | 2 -- update.sh | 7 ++++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/3.4/alpine3.7/Dockerfile b/3.4/alpine3.7/Dockerfile index eb9f5b112..eed4994f9 100644 --- a/3.4/alpine3.7/Dockerfile +++ b/3.4/alpine3.7/Dockerfile @@ -46,10 +46,8 @@ RUN set -ex \ gdbm-dev \ libc-dev \ libffi-dev \ - libnsl-dev \ libressl \ libressl-dev \ - libtirpc-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/3.5/alpine3.7/Dockerfile b/3.5/alpine3.7/Dockerfile index d3e95d4c5..b38c4027f 100644 --- a/3.5/alpine3.7/Dockerfile +++ b/3.5/alpine3.7/Dockerfile @@ -46,10 +46,8 @@ RUN set -ex \ gdbm-dev \ libc-dev \ libffi-dev \ - libnsl-dev \ libressl \ libressl-dev \ - libtirpc-dev \ linux-headers \ make \ ncurses-dev \ diff --git a/update.sh b/update.sh index 11683d650..9aac170aa 100755 --- a/update.sh +++ b/update.sh @@ -159,9 +159,10 @@ for version in "${versions[@]}"; do sed -ri -e 's/libressl/openssl/g' "$dir/Dockerfile" fi - # Libraries to build the nis module available in Alpine 3.7, but also require this patch: - # https://bugs.python.org/issue32521 - if [[ "$variant" == alpine* ]] && [[ "$variant" != alpine3.7 ]]; then + # Libraries to build the nis module only available in Alpine 3.7+. + # Also require this patch https://bugs.python.org/issue32521 only available in Python 2.7, 3.6+. + if [[ "$variant" == alpine* ]] && [[ "$version" == 3.4* || "$version" == 3.5* ]] \ + || [[ "$variant" == alpine3.6 ]]; then sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile" fi pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy