gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Travis issues

Browse source 
- Fixed --disable-mixedabi option spelling
- Updated GNUstep make repository URL (was being redirected)
- Removed obsolete --enable-objc-nonfragile-abi flag
This commit is contained in:
Frederik Seiffert 2019-11-28 14:16:14 +01:00
parent 69f7130fa7
commit 0dd114e7fb
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -6,13 +6,13 @@ compiler:
env: env:
- LIBRARY_COMBO=gnu-gnu-gnu - LIBRARY_COMBO=gnu-gnu-gnu
- LIBRARY_COMBO=ng-gnu-gnu - LIBRARY_COMBO=ng-gnu-gnu
- LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixed-abi - LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi
matrix: matrix:
exclude: exclude:
- compiler: gcc - compiler: gcc
env: LIBRARY_COMBO=ng-gnu-gnu env: LIBRARY_COMBO=ng-gnu-gnu
- compiler: gcc - compiler: gcc
env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixed-abi env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi
- compiler: clang - compiler: clang
env: LIBRARY_COMBO=gnu-gnu-gnu env: LIBRARY_COMBO=gnu-gnu-gnu
sudo: required sudo: required

12
travis-deps.sh
View file

@ -6,15 +6,9 @@ DEP_SRC=$HOME/dependency_source/
install_gnustep_make() { install_gnustep_make() {
cd $DEP_SRC cd $DEP_SRC
git clone https://github.com/gnustep/make.git git clone https://github.com/gnustep/tools-make.git
cd make cd tools-make
if [ $LIBRARY_COMBO = 'ng-gnu-gnu' ] ./configure --prefix=$HOME/staging --with-library-combo=$LIBRARY_COMBO
then
ADDITIONAL_FLAGS="--enable-objc-nonfragile-abi"
else
ADDITIONAL_FLAGS=""
fi
./configure --prefix=$HOME/staging --with-library-combo=$LIBRARY_COMBO $ADDITIONAL_FLAGS
make install make install
} }