From 159e0bfdbb135e74aac10e54c7a499e9e34aa5a2 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Mon, 17 Jun 2019 03:38:27 +0200
Subject: Rework libghdl build/install procedure (#840)

* feat(libghdl): add libghdl_pkg.py, add option to generate libghdl-py.tgz with dist/travis/build.sh

* libghdl*.so is now part of GHDL

* move python sources to python/libghdl and python/pnodes
* rename src/vhdl/python to src/vhdl/libghdl
* add generation of tarball for libghdl-py to the makefile
* deprecate --enable-python and --disable-python
* add configuration option --disable-libghdl

* feat(python/libghdl): add support for LIBGHDL_PREFIX (#844)

* fix(travis): disable libghdl on mac

* feat(python/libghdl): add support for GHDL_BIN_PATH and VUNIT_GHDL_PATH
---
 dist/travis/travis-ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dist/travis')

diff --git a/dist/travis/travis-ci.sh b/dist/travis/travis-ci.sh
index e036f677e..664412a76 100755
--- a/dist/travis/travis-ci.sh
+++ b/dist/travis/travis-ci.sh
@@ -5,7 +5,7 @@ build_img_ghdl() {
     travis_start "build_run" "$ANSI_BLUE[DOCKER build] ghdl/ghdl:${IMAGE_TAG}$ANSI_NOCOLOR"
     docker build -t ghdl/ghdl:$IMAGE_TAG . -f-<<EOF
 FROM ghdl/run:$IMAGE_TAG
-ADD `ls | grep -oP 'ghdl-.*tgz'` /usr/local
+ADD `ls | grep '^ghdl.*\.tgz'` /usr/local
 EOF
     travis_finish "build_run"
 }
@@ -58,7 +58,7 @@ travis_finish "opts"
 RUN="docker run --rm -t -e TRAVIS=$TRAVIS -e CONFIG_OPTS="$CONFIG_OPTS" -v $(pwd):/work -w /work"
 
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    bash -c "${scriptdir}/build.sh $BUILD_CMD_OPTS"
+    CONFIG_OPTS="--disable-libghdl" bash -c "${scriptdir}/build.sh $BUILD_CMD_OPTS"
 else
     # Assume linux
 
-- 
cgit v1.2.3