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 guix/log/etc?id=fd8acd3d348687939134fa602d92c4fc0c91b71c'>etc/git
AgeCommit message (Expand)Author
2024-01-24gitconfig: b4: Automatically add 'Signed-off-by' when applying patches....Also use --3way to ease conflict resolutions. * etc/git/gitconfig [b4]: Add shazam-am-flags option. Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea Maxim Cournoyer
2023-11-07doc: Add some guidelines for reviewing....* doc/contributing.texi (Contributing) [Reviewing the Work of Others]: New section. (Debbugs Usertags): Expound with Emacs Debbugs information and document the 'reviewed-looks-good' usertag. * etc/git/gitconfig [b4]: New section. Change-Id: I56630b15ec4fbc5c67e5420dbf2838556a005d6b Reviewed-by: Ludovic Courtès <ludo@gnu.org> Maxim Cournoyer
2023-10-22build: Add a commit-msg hook that embeds Change-Id in commit messages....Partially implements <https://issues.guix.gnu.org/66027>. This will make it possible to track a merged commit back to its original posting on the mailing list, and open the door to new opportunities such as closing fully merged series automatically. * Makefile.am (COMMIT_MSG_MAGIC): New variable. (.git/hooks/commit-msg): New target. * etc/git/commit-msg: New file. * doc/contributing.texi (Configuring Git): Document Change-Id. Series-changes: 3 - Clarify documentation text, as suggested by Simon Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6 Reviewed-by: Simon Tournier <zimon.toutoune@gmail.com> Maxim Cournoyer
2023-05-18etc: gitconfig: Do not enforced signed commits....This change was more invasive than initially thought, and cannot be disabled easily, as raised by a few people. Let's revert it for now. At least the pre-push hook should be deployed automatically and catch any unsigned commits attempted to be pushed to Savannah. * etc/git/gitconfig [commit]: Remove section. Maxim Cournoyer
2023-05-01Makefile.am: Auto-configure Git on 'make'....This means we do not need to worry anymore about manually syncing the pre-push git hook or the Guix-provided git configuration. * etc/git/gitconfig: Augment configuration template with useful options to allow for auto-configuration. * Makefile.am (.git/hooks/pre-push, .git/config): New targets. (nodist_noinst_DATA): New primary variable holding the above targets. Maxim Cournoyer
2021-10-14Add git configuration templates to improve diff hunk header detection....This is a follow-up to commit 9fc8ae4171e5da4939a64fc6d684c8b9d85bbe84, which missed two hunks from <https://issues.guix.gnu.org/50363>. Reported by hackeryarn on #guix. * .gitattributes, etc/git/gitconfig: New files. Signed-off-by: Marius Bakke <marius@gnu.org> Sarah Morgensen
2020-12-14maint: Only run `make authenticate` when pushing commits....* etc/git/pre-push: Exit early when deleting a branch. Leo Famulari
2020-06-01maint: Adjust comment in 'pre-push' hook....* etc/git/pre-push: Adjust comment. Ludovic Courtès
2020-05-29maint: Git pre-push hook runs "make authenticate check-channel-news"....* etc/git/pre-push: Change to run "make authenticate check-channel-news". Ludovic Courtès