Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.8' into master-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
jepler committed Apr 17, 2020
2 parents fda24ef + bb8a572 commit 677f490
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions scripts/travis-build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
cd src
./autogen.sh
./configure --with-realtime=uspace --disable-check-runtime-deps --enable-build-documentation
make -j2 # cores: ~2, bursted
../scripts/rip-environment runtests -v
make -O -j$(nproc)
../scripts/rip-environment runtests
4 changes: 3 additions & 1 deletion scripts/travis-install-build-deps.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/sh -e
sudo sh -c 'echo deb-src http://us.archive.ubuntu.com/ubuntu/ xenial main universe >> /etc/apt/sources.list'
grep . /etc/apt/sources.list /etc/apt/sources.list.d/*
sudo apt-get update -qq
sudo apt-get install -y devscripts equivs build-essential --no-install-recommends
sudo apt-get remove -f libreadline6-dev || true
sudo apt-get remove -f libreadline-dev || true
debian/configure uspace
debian/configure uspace noauto
mk-build-deps -i -r -s sudo -t 'apt-get --no-install-recommends --no-install-suggests'
2 changes: 1 addition & 1 deletion src/hal/user_comps/Submakefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ USERSRCS += $(XHC_HB04_SRC)
$(call TOOBJSDEPS, $(XHC_HB04_SRC)) : EXTRAFLAGS += $(LIBUSB10_CFLAGS)
../bin/xhc-hb04: $(call TOOBJS, $(XHC_HB04_SRC)) ../lib/liblinuxcnchal.so.0 ../lib/liblinuxcncini.so.0
$(ECHO) Linking $(notdir $@)
$(Q)$(CC) $(LDFLAGS) -o $@ $^ -lm -lstdc++ $(LIBUSB10_LIBS)
$(Q)$(CXX) $(LDFLAGS) -o $@ $^ -lm $(LIBUSB10_LIBS)
TARGETS += ../bin/xhc-hb04
endif # HAVE_LIBUSB10

Expand Down

0 comments on commit 677f490

Please sign in to comment.