From d0ab4af735c48cfbbddfaa00741bd0b5be39f262 Mon Sep 17 00:00:00 2001 From: mayeut Date: Tue, 12 Nov 2019 23:22:36 +0100 Subject: [PATCH 1/3] Add ppc64le support --- .travis.yml | 2 ++ docker/Dockerfile-ppc64le | 19 +++++++++++++++++++ docker/build_scripts/build.sh | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 docker/Dockerfile-ppc64le diff --git a/.travis.yml b/.travis.yml index 43db321f..aeeff49e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ matrix: env: PLATFORM="i686" - arch: arm64 env: PLATFORM="aarch64" + - arch: ppc64le + env: PLATFORM="ppc64le" script: - PLATFORM=$PLATFORM TRAVIS_COMMIT=$TRAVIS_COMMIT ./build.sh diff --git a/docker/Dockerfile-ppc64le b/docker/Dockerfile-ppc64le new file mode 100644 index 00000000..13751022 --- /dev/null +++ b/docker/Dockerfile-ppc64le @@ -0,0 +1,19 @@ +FROM ppc64le/centos:7 +LABEL maintainer="The ManyLinux project" + +ENV AUDITWHEEL_ARCH ppc64le +ENV AUDITWHEEL_PLAT manylinux2014_$AUDITWHEEL_ARCH +ENV LC_ALL en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US.UTF-8 +ENV DEVTOOLSET_ROOTPATH /opt/rh/devtoolset-8/root +ENV PATH $DEVTOOLSET_ROOTPATH/usr/bin:$PATH +ENV LD_LIBRARY_PATH $DEVTOOLSET_ROOTPATH/usr/lib64:$DEVTOOLSET_ROOTPATH/usr/lib:$DEVTOOLSET_ROOTPATH/usr/lib64/dyninst:$DEVTOOLSET_ROOTPATH/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib +ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig + +COPY build_scripts /build_scripts +RUN bash build_scripts/build.sh && rm -r build_scripts + +ENV SSL_CERT_FILE=/opt/_internal/certs.pem + +CMD ["/bin/bash"] diff --git a/docker/build_scripts/build.sh b/docker/build_scripts/build.sh index bf5b81f1..001b0288 100755 --- a/docker/build_scripts/build.sh +++ b/docker/build_scripts/build.sh @@ -62,7 +62,7 @@ if [ "${AUDITWHEEL_ARCH}" == "x86_64" ]; then yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm YASM=yasm TOOLCHAIN_DEPS=${DEVTOOLSET8_TOOLCHAIN_DEPS} -elif [ "${AUDITWHEEL_ARCH}" == "aarch64" ]; then +elif [ "${AUDITWHEEL_ARCH}" == "aarch64" ] || [ "${AUDITWHEEL_ARCH}" == "ppc64le" ]; then # Software collection (for devtoolset-8) yum -y install centos-release-scl-rh TOOLCHAIN_DEPS=${DEVTOOLSET8_TOOLCHAIN_DEPS} From ed0cadb8c131a096da3006c9700111cc5c9f18ce Mon Sep 17 00:00:00 2001 From: mayeut Date: Wed, 13 Nov 2019 00:11:19 +0100 Subject: [PATCH 2/3] Use system provided autoconf latest autofconf was released in 2012, use the system provided one which is the latest on CentOS 7 --- docker/build_scripts/build.sh | 5 +---- docker/build_scripts/build_env.sh | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/docker/build_scripts/build.sh b/docker/build_scripts/build.sh index 001b0288..76f17d2e 100755 --- a/docker/build_scripts/build.sh +++ b/docker/build_scripts/build.sh @@ -73,6 +73,7 @@ fi # Development tools and libraries yum -y install \ + autoconf \ automake \ bison \ bzip2 \ @@ -93,10 +94,6 @@ yum -y install \ build_git $GIT_ROOT $GIT_HASH git version -# Install newest autoconf -build_autoconf $AUTOCONF_ROOT $AUTOCONF_HASH -autoconf --version - # Install newest automake build_automake $AUTOMAKE_ROOT $AUTOMAKE_HASH automake --version diff --git a/docker/build_scripts/build_env.sh b/docker/build_scripts/build_env.sh index df2b5727..34eae403 100644 --- a/docker/build_scripts/build_env.sh +++ b/docker/build_scripts/build_env.sh @@ -7,10 +7,6 @@ CPYTHON_VERSIONS="3.5.9 3.6.9 3.7.5 3.8.0" PATCHELF_VERSION=0.10 PATCHELF_HASH=b3cb6bdedcef5607ce34a350cf0b182eb979f8f7bc31eae55a93a70a3f020d13 -AUTOCONF_ROOT=autoconf-2.69 -AUTOCONF_HASH=954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969 -AUTOCONF_DOWNLOAD_URL=http://ftp.gnu.org/gnu/autoconf - AUTOMAKE_ROOT=automake-1.16.1 AUTOMAKE_HASH=608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8 AUTOMAKE_DOWNLOAD_URL=http://ftp.gnu.org/gnu/automake From 01a35ac04d450367929f9b75476209c42317b644 Mon Sep 17 00:00:00 2001 From: mayeut Date: Wed, 13 Nov 2019 22:43:03 +0100 Subject: [PATCH 3/3] Update README with manylinux2014_ppc64le --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 5bb469a9..6d7f8770 100644 --- a/README.rst +++ b/README.rst @@ -91,6 +91,10 @@ aarch64 image: ``quay.io/pypa/manylinux2014_aarch64`` .. image:: https://quay.io/repository/pypa/manylinux2014_aarch64/status :target: https://quay.io/repository/pypa/manylinux2014_aarch64 +ppc64le image: ``quay.io/pypa/manylinux2014_ppc64le`` + +.. image:: https://quay.io/repository/pypa/manylinux2014_ppc64le/status + :target: https://quay.io/repository/pypa/manylinux2014_ppc64le These images are rebuilt using Travis-CI on every commit to this repository; see the