Skip to content

Commit

Permalink
Update autosetup to the latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
bapt committed Mar 9, 2020
1 parent aaf3eba commit 1ff0a15
Show file tree
Hide file tree
Showing 22 changed files with 2,616 additions and 2,210 deletions.
11 changes: 7 additions & 4 deletions Makefile.autosetup
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
include @builddir@/mk/defs.mk
DIRS= external compat libpkg/repo libpkg src docs scripts @testsdir@
DIRS= external compat libpkg/repo libpkg src docs scripts
@if TESTS
DIRS+= tests
@endif

include $(MK)/dir.mk

@if coverage == "1"
@if coverage
check: clean-profiles

clean-profiles:
rm -f /tmp/pkg.*.profraw
@endif

check: all
@if testsdir == "tests"
@if TESTS
export LLVM_PROFILE_FILE=/tmp/pkg.%p.profraw
if [ "$(HTML)" != "" ]; then \
args="-r $(top_builddir)/res.db" ; \
Expand All @@ -26,7 +29,7 @@ check: all
exit $${FAILED}
@endif

@if coverage == "1"
@if coverage
check-coverage: check
llvm-profdata merge --output=pkg.profdata /tmp/pkg.*.profraw

Expand Down
11 changes: 5 additions & 6 deletions auto.def
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ foreach header [list endian.h sys/endian.h] {
}

if {[string match *-darwin* [get-define host]]} {
define libabidir libmachista
define libmachista
define waflags ""
define nowaflags ""
} else {
Expand All @@ -219,17 +219,17 @@ if {[string match *-darwin* [get-define host]]} {
cc-with { -libs { -lelf } } {
if {[cc-check-functions gelf_getehdr]} {
define-feature libelf
define libelf-external
define-append EXTRA_LIBS -lelf
define libabidir ""
cc-check-types Elf_Note
} else {
define libelf-internal
define-feature libelf 0
define libabidir "libelf"
}
}
} else {
define-feature libelf 0
define libabidir "libelf"
define libelf-internal
}
}

Expand Down Expand Up @@ -261,11 +261,10 @@ if {[opt-bool with-coverage]} {
}
}

define testsdir ""
if {[pkg-config-init 0]} {
# atf
if {[pkg-config atf-c] && [cc-check-progs kyua]} {
define testsdir tests
define TESTS
puts "test suite will be built"
} else {
puts "Skipping test suite"
Expand Down
2 changes: 1 addition & 1 deletion autosetup/README.autosetup
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
README.autosetup created by autosetup v0.6.8
README.autosetup created by autosetup v0.6.9+

This is the autosetup directory for a local install of autosetup.
It contains autosetup, support files and loadable modules.
Expand Down
Loading

0 comments on commit 1ff0a15

Please sign in to comment.