gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 09:41:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix CI build for gnustep ABI < 2.0

Browse source
This commit is contained in:
Niels Grewe 2020-02-23 15:45:52 +01:00
parent ee8059c6f4
commit 22fd06b5f1
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -5,16 +5,16 @@ compiler:
- gcc - gcc
env: env:
- LIBRARY_COMBO=gnu-gnu-gnu - LIBRARY_COMBO=gnu-gnu-gnu
- LIBRARY_COMBO=ng-gnu-gnu - LIBRARY_COMBO=ng-gnu-gnu RUNTIME_VERSION=gnustep-1.9
- LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi - LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi RUNTIME_VERSION=gnustep-1.9
- LIBRARY_COMBO=ng-gnu-gnu RUNTIME_VERSION=gnustep-2.0 - LIBRARY_COMBO=ng-gnu-gnu RUNTIME_VERSION=gnustep-2.0
- LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi RUNTIME_VERSION=gnustep-2.0 - LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi RUNTIME_VERSION=gnustep-2.0
matrix: matrix:
exclude: exclude:
- compiler: gcc - compiler: gcc
env: LIBRARY_COMBO=ng-gnu-gnu env: LIBRARY_COMBO=ng-gnu-gnu RUNTIME_VERSION=gnustep-1.9
- compiler: gcc - compiler: gcc
env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi RUNTIME_VERSION=gnustep-1.9
- compiler: gcc - compiler: gcc
env: LIBRARY_COMBO=ng-gnu-gnu RUNTIME_VERSION=gnustep-2.0 env: LIBRARY_COMBO=ng-gnu-gnu RUNTIME_VERSION=gnustep-2.0
- compiler: gcc - compiler: gcc

8
travis-deps.sh
View file

@ -11,10 +11,12 @@ install_gnustep_make() {
cd tools-make cd tools-make
if [ -n "$RUNTIME_VERSION" ] if [ -n "$RUNTIME_VERSION" ]
then then
echo "RUNTIME_VERSION=$RUNTIME_VERSION" > GNUstep.conf WITH_RUNTIME_ABI="--with-runtime-abi=${RUNTIME_VERSION}"
else
WITH_RUNTIME_ABI=""
fi fi
./configure --prefix=$DEP_ROOT --with-library-combo=$LIBRARY_COMBO --with-user-config-file=$PWD/GNUstep.conf ./configure --prefix=$DEP_ROOT --with-library-combo=$LIBRARY_COMBO $WITH_RUNTIME_ABI
make install make install
echo Objective-C build flags: `$HOME/staging/bin/gnustep-config --objc-flags` echo Objective-C build flags: `$HOME/staging/bin/gnustep-config --objc-flags`
} }