From patchwork Sun Jan 20 19:19:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 10772513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8885214E5 for ; Sun, 20 Jan 2019 19:20:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65C962A2B4 for ; Sun, 20 Jan 2019 19:20:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53CE22A2B0; Sun, 20 Jan 2019 19:20:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E32442A2B0 for ; Sun, 20 Jan 2019 19:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727591AbfATTUA (ORCPT ); Sun, 20 Jan 2019 14:20:00 -0500 Received: from mx1.polytechnique.org ([129.104.30.34]:52126 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727208AbfATTUA (ORCPT ); Sun, 20 Jan 2019 14:20:00 -0500 Received: from localhost.localdomain (89-156-252-9.rev.numericable.fr [89.156.252.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id 1D6E85611EB for ; Sun, 20 Jan 2019 20:19:56 +0100 (CET) From: Nicolas Iooss To: selinux@vger.kernel.org Subject: [PATCH 1/3] Travis-CI: upgrade PyPy to 6.0 Date: Sun, 20 Jan 2019 20:19:31 +0100 Message-Id: <20190120191933.21343-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sun Jan 20 20:19:56 2019 +0100 (CET)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP PyPy 6.0 was released in April 2018 but became available on Travis-CI only recently. Now that it is available, use it. While at it, compile Python modules with libpypy-c.so, now that PyPy provides this library. This would enable linking Python modules with -Wl,-no-undefined (or -Wl,-z,defs) and help fixing issues with https://github.com/SELinuxProject/selinux/pull/130. Tracking issues: * https://github.com/travis-ci/travis-ci/issues/9542 * https://travis-ci.community/t/pypy-2-7-on-xenial/889 Signed-off-by: Nicolas Iooss Acked-by: Petr Lautrbach --- .travis.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08a29b2f5adc..b8e97f83bbcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,8 @@ env: - PYVER=python2.7 RUBYLIBVER=2.5.1 - PYVER=python3.5 RUBYLIBVER=2.5.1 - PYVER=python3.6 RUBYLIBVER=2.5.1 - # pypy2.7 seems not to be available in Travis-CI Xenial template yet. - # https://github.com/travis-ci/travis-ci/issues/9542 - #- PYVER=pypy RUBYLIBVER=2.5.1 - - PYVER=pypy3.5 RUBYLIBVER=2.5.1 + - PYVER=pypy2.7-6.0 RUBYLIBVER=2.5.1 + - PYVER=pypy3.5-6.0 RUBYLIBVER=2.5.1 # Test several Ruby versions - PYVER=python3.7 RUBYLIBVER=2.4 @@ -98,8 +96,12 @@ before_script: - export PYTHON="$VIRTUAL_ENV/bin/python" # Use the header files in /opt/python/... for Python because the virtualenvs do not provide Python.h - export PKG_CONFIG_PATH="/opt/python/$($PYTHON -c 'import sys;print("%d.%d.%d" % sys.version_info[:3])')/lib/pkgconfig" - # PyPy does not provide a config file for pkg-config nor a pypy-c.so - - if echo "$PYVER" | grep -q pypy ; then export PYINC=-I$($PYTHON -c 'import sys;print(sys.prefix)')/include PYLIBS= ; fi + # PyPy does not provide a config file for pkg-config + # libpypy-c.so is provided in bin/libpypy-c.so for PyPy and bin/libpypy3-c.so for PyPy3 + - if echo "$PYVER" | grep -q pypy ; then + export PYINC=-I$($PYTHON -c 'import sys;print(sys.prefix)')/include ; + export PYLIBS="$($PYTHON -c 'import sys;print("-L%s/bin -l%s" % (sys.prefix, "pypy-c" if sys.version_info < (3,) else "pypy3-c"))')" ; + fi # Find the Ruby executable with version $RUBYLIBVER - rvm reinstall ruby-$RUBYLIBVER --binary