Allow building tup after removing some bundled sources from the source tree. diff --git a/build.sh b/build.sh index 2937116d..eab650f7 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,7 @@ else echo "Error: invalid TUP_SERVER \"$server\"" 1>&2 exit 1 fi -LDFLAGS="$LDFLAGS -lm" +LDFLAGS="$LDFLAGS -lm -lsqlite3 `pcre-config --libs`" : ${CC:=gcc} case "$os" in Linux) @@ -65,17 +65,15 @@ mkdir luabuiltin CFLAGS="$CFLAGS -DTUP_SERVER=\"$server\"" CFLAGS="$CFLAGS -DHAVE_CONFIG_H" +CFLAGS="$CFLAGS `pcre-config --cflags`" -for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c ../src/pcre/*.c $plat_files; do +for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c $plat_files; do echo " bootstrap CC $CFLAGS $i" # Put -I. first so we find our new luabuiltin.h file, not one built # by a previous 'tup upd'. - $CC $CFLAGS -c $i -I. -I../src -I../src/pcre $plat_cflags + $CC $CFLAGS -c $i -I. -I../src $plat_cflags done -echo " bootstrap CC $CFLAGS ../src/sqlite3/sqlite3.c" -$CC $CFLAGS -c ../src/sqlite3/sqlite3.c -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $plat_cflags - echo " bootstrap LD tup $LDFLAGS" echo "const char *tup_version(void) {return \"$label\";}" | $CC -x c -c - -o tup_version.o $CC *.o -o tup -lpthread $plat_ldflags $LDFLAGS diff --git a/src/tup/db.c b/src/tup/db.c index 55ee3edd..9bdf7a80 100644 --- a/src/tup/db.c +++ b/src/tup/db.c @@ -46,7 +46,7 @@ #include #include #include -#include "sqlite3/sqlite3.h" +#include #define DB_VERSION 17 #define PARSER_VERSION 12 diff --git a/src/tup/tupid.h b/src/tup/tupid.h index 7b36ae46..19aed438 100644 --- a/src/tup/tupid.h +++ b/src/tup/tupid.h @@ -21,7 +21,7 @@ #ifndef tup_tupid_h #define tup_tupid_h -#include "sqlite3/sqlite3.h" +#include typedef sqlite3_int64 tupid_t; -- 2.26.2 /td>
path: root/build-aux/test-driver.scm
AgeCommit message (Expand)Author
2021-02-02build: Add a --show-duration option to the SCM test-driver....* build-aux/test-driver.scm (script-version): Update. (show-help): Document it. (%options): Add the 'show-duration' option. (test-runner-gnu): Pass as a new argument. [test-cases-start-time]: New inner variable. [test-on-test-begin-gnu]: New hook, used to record the start time. [test-on-test-end-gnu]: Conditionally print elapsed time. Record it as the optional metadata in the test result file (.trs). * doc/guix.texi (Running the Test Suite): Document it. Maxim Cournoyer
2021-01-31build: test-driver.scm: Allow running as a standalone script....* build-aux/test-driver.scm: Add an exec-based shebang and set the script executable bit. (main): Insert a newline after the version string is printed with --version. Maxim Cournoyer
2021-01-31build: test-driver.scm: Add a new '--errors-only' option....* build-aux/test-driver.scm (show-help): Add the help text for the new '--errors-only' option. (%options): Add the errors-only option. (test-runner-gnu): Add the errors-only? parameter and update doc. Move the logging of the test data after the test has completed, so a choice can be made whether to keep it or discard it based on the value of the test result. (main): Pass the errors-only? option to the driver. * doc/guix.texi (Running the Test Suite): Document the new option. Maxim Cournoyer
2021-01-31build: test-driver.scm: Add test cases filtering options....* build-aux/test-driver.scm (show-help): Add help text for the new --select and --exclude options. (%options): Add the new select and exclude options. (test-runner-gnu): Pass them to the test runner. Update doc. (test-match-name*, test-match-name*/negated, %test-match-all): New variables. (main): Compute the test specifier based on the values of the new options and apply it to the current test runner when running the test file. * doc/guix.texi (Running the Test Suite): Document the new options. Maxim Cournoyer
2021-01-31build: test-driver.scm: Enable colored test results by default....The Automake parallel test harness does its own smart detection of the terminal color capability and always provides the --color-tests argument to the driver. This change defaults the --color-tests argument to true when the test driver is run on its own (not via Automake). * build-aux/test-driver.scm (main): Set the default value of the --color-tests argument to true when it's not explicitly provided. Maxim Cournoyer
2021-01-31build: test-driver.scm: Make output redirection optional....This makes it easier (and less surprising) for users to experiment with the custom Scheme test driver directly. The behavior is unchanged from Automake's point of view. * build-aux/test-driver.scm (main): Make the --log-file and --trs-file arguments optional and update doc. Only open, redirect and close a port to a log file when the --log-file option is provided. Only open and close a port to a trs file when the --trs-file option is provided. (test-runner-gnu): Set OUT-PORT parameter default value to the current output port. Set the TRS-PORT parameter default value to a void port. Update doc. Maxim Cournoyer