diff options
author | Morgan Smith <Morgan.J.Smith@outlook.com> | 2025-06-02 16:40:23 -0400 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2025-06-07 19:56:50 +0200 |
commit | a97c086e01ca26dd461d784e89a99df60c42d8de (patch) | |
tree | e7f3851ce5661d566dd098405d420fd027f75d96 /gnu/packages/patches/tup-unbundle-dependencies.patch | |
parent | 8e560da1745330300a77495d0d797a2e76fa4c67 (diff) |
gnu: tup: Update to 0.8.
* gnu/packages/build-tools.scm (tup): Update to 0.8. Use gexps.
<source>: Update URL. Remove patch.
<phases>: Adjust.
<inputs>: Update pcre to pcre2. Add libinih.
<license>: Add Lua license.
* gnu/local.mk: Unregister patch.
* gnu/packages/patches/tup-unbundle-dependencies.patch: Delete file.
Change-Id: If8e55455bbf0dedc70611caf3247e169ad59c4d2
Signed-off-by: Andreas Enge <andreas@enge.fr>
Diffstat (limited to 'gnu/packages/patches/tup-unbundle-dependencies.patch')
-rw-r--r-- | gnu/packages/patches/tup-unbundle-dependencies.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/gnu/packages/patches/tup-unbundle-dependencies.patch b/gnu/packages/patches/tup-unbundle-dependencies.patch deleted file mode 100644 index 6409522bd3..0000000000 --- a/gnu/packages/patches/tup-unbundle-dependencies.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 <errno.h> - #include <ctype.h> - #include <sys/stat.h> --#include "sqlite3/sqlite3.h" -+#include <sqlite3.h> - - #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 <sqlite3.h> - - typedef sqlite3_int64 tupid_t; - --- -2.26.2 - |