* .travis.yml

* travis-deps.sh: Try to keep up with Niels' changes in base.

.travis.yml

@@ -24,7 +24,7 @@ matrix:
 sudo: required
 before_install:
     - sudo apt-get -qq update
-    - sudo apt-get install -y cmake pkg-config libgnutls28-dev libgmp-dev libffi-dev libicu-dev libxml2-dev libxslt1-dev libssl-dev libavahi-client-dev zlib1g-dev libblocksruntime-dev
+    - sudo apt-get install -y cmake pkg-config libgnutls28-dev libgmp-dev libffi-dev libicu-dev libxml2-dev libxslt1-dev libssl-dev libavahi-client-dev zlib1g-dev
     - >
         if [ $LIBRARY_COMBO = 'gnu-gnu-gnu' ];
         then
@@ -32,7 +32,7 @@ before_install:
           then
             sudo apt-get install -y gobjc;
           fi;
-          sudo apt-get install -y libobjc-4.8-dev;
+          sudo apt-get install -y libobjc-4.8-dev libblocksruntime-dev;
         else
           curl -s -o - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -;
           sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main" && sudo apt-get update -qq;
@@ -45,10 +45,19 @@ before_install:
              sudo update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 10;
           fi;
         fi;
+    # libdispatch requires a fairly recent version of cmake
+    - >
+        if [ $LIBRARY_COMBO = 'ng-gnu-gnu' ];
+        then
+          curl -LO https://cmake.org/files/v3.15/cmake-3.15.5-Linux-x86_64.tar.gz;
+          tar xf cmake-3.15.5-Linux-x86_64.tar.gz;
+          mv cmake-3.15.5-Linux-x86_64 $HOME/cmake;
+          export PATH=$HOME/cmake/:$HOME/cmake/bin:$PATH
+        fi;
 install: ./travis-deps.sh
 before_script: >
-    export LIBRARY_PATH=$HOME/staging/lib:$LIBRARY_PATH;
-    export LD_LIBRARY_PATH=$HOME/staging/lib:$LD_LIBRARY_PATH;
+    export LIBRARY_PATH=$HOME/staging/lib:$HOME/staging/lib64:$LIBRARY_PATH;
+    export LD_LIBRARY_PATH=$HOME/staging/lib:$HOME/staging/lib64:$LD_LIBRARY_PATH;
     if [ $LIBRARY_COMBO = 'ng-gnu-gnu' ];
     then
       export CPATH=$HOME/staging/include;

ChangeLog

@@ -1,3 +1,8 @@
+2019-12-07 Fred Kiefer <FredKiefer@gmx.de>
+
+	* .travis.yml
+	* travis-deps.sh: Try to keep up with Niels' changes in base.
+
 2019-12-06 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSGestureRecognizer.h

travis-deps.sh

@@ -3,6 +3,7 @@
 set -ex
 
 DEP_SRC=$HOME/dependency_source/
+DEP_ROOT=$HOME/staging
 
 install_gnustep_make() {
     cd $DEP_SRC
@@ -12,7 +13,7 @@ install_gnustep_make() {
     then
         echo "RUNTIME_VERSION=$RUNTIME_VERSION" > GNUstep.conf
     fi
-    ./configure --prefix=$HOME/staging --with-library-combo=$LIBRARY_COMBO --with-user-config-file=$PWD/GNUstep.conf
+    ./configure --prefix=$DEP_ROOT --with-library-combo=$LIBRARY_COMBO --with-user-config-file=$PWD/GNUstep.conf
 	make install
     echo Objective-C build flags: `$HOME/staging/bin/gnustep-config --objc-flags`
 }
@@ -30,21 +31,22 @@ install_ng_runtime() {
     export CC="clang"
     export CXX="clang++"
     export CXXFLAGS="-std=c++11"
-    cmake -DTESTS=off -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGNUSTEP_INSTALL_TYPE=NONE -DCMAKE_INSTALL_PREFIX:PATH=$HOME/staging ../
+    cmake -DTESTS=off -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGNUSTEP_INSTALL_TYPE=NONE -DCMAKE_INSTALL_PREFIX:PATH=$DEP_ROOT ../
     make install
 }
 
 install_libdispatch() {
     cd $DEP_SRC
-    git clone https://github.com/ngrewe/libdispatch.git
-    mkdir libdispatch/build
-    cd libdispatch/build
+    # will reference upstream after https://github.com/apple/swift-corelibs-libdispatch/pull/534 is merged
+    git clone -b system-blocksruntime https://github.com/ngrewe/swift-corelibs-libdispatch.git
+    mkdir swift-corelibs-libdispatch/build
+    cd swift-corelibs-libdispatch/build
     export CC="clang"
     export CXX="clang++"
-    export LIBRARY_PATH=$HOME/staging/lib;
-    export LD_LIBRARY_PATH=$HOME/staging/lib:$LD_LIBRARY_PATH;
-    export CPATH=$HOME/staging/include;
-    cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DCMAKE_INSTALL_PREFIX:PATH=$HOME/staging ../
+    export LIBRARY_PATH=$DEP_ROOT/lib;
+    export LD_LIBRARY_PATH=$DEP_ROOT/lib:$LD_LIBRARY_PATH;
+    export CPATH=$DEP_ROOT/include;
+    cmake -DBUILD_TESTING=off -DCMAKE_BUILD_TYPE=RelWithDebInfo  -DCMAKE_INSTALL_PREFIX:PATH=$HOME/staging -DINSTALL_PRIVATE_HEADERS=1 -DBlocksRuntime_INCLUDE_DIR=$DEP_ROOT/include -DBlocksRuntime_LIBRARIES=$DEP_ROOT/lib/libobjc.so ../
     make install
 }
 
@@ -61,7 +63,7 @@ install_gnustep_base() {
 }
 
 mkdir -p $DEP_SRC
-if [ $LIBRARY_COMBO = 'ng-gnu-gnu' ]
+if [ "$LIBRARY_COMBO" = 'ng-gnu-gnu' ]
 then
     install_ng_runtime
     install_libdispatch