diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2024-09-03 13:33:11 +0200 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2024-09-03 13:34:01 +0200 |
| commit | 3a870bc0402c136e9316eaa237c1635f3be1ce3f (patch) | |
| tree | 48c6ab3e07dc22e4460a331361c4e795ba9d3a49 /net-p2p/c-lightning/files | |
| parent | sysutils/pfetch: Update to 1.4.0 (diff) | |
net-p2p/c-lightning: upgrade from 24.05 to 24.08
Diffstat (limited to 'net-p2p/c-lightning/files')
| -rwxr-xr-x | net-p2p/c-lightning/files/check_python_plugins_deps.sh | 9 | ||||
| -rw-r--r-- | net-p2p/c-lightning/files/patch-Makefile | 16 | ||||
| -rw-r--r-- | net-p2p/c-lightning/files/patch-configure | 4 |
3 files changed, 17 insertions, 12 deletions
diff --git a/net-p2p/c-lightning/files/check_python_plugins_deps.sh b/net-p2p/c-lightning/files/check_python_plugins_deps.sh index 172be8d8874a..820ee83a8001 100755 --- a/net-p2p/c-lightning/files/check_python_plugins_deps.sh +++ b/net-p2p/c-lightning/files/check_python_plugins_deps.sh @@ -1,12 +1,17 @@ #!/usr/bin/env bash +set -e + declare -A requirements=(["plugins/clnrest/requirements.txt"]="CLNRESTDEPS_RUN_DEPENDS" ["plugins/wss-proxy/requirements.txt"]="WSSPROXYDEPS_RUN_DEPENDS") +WRKSRC=$(make -V WRKSRC) + for file in ${!requirements[@]} ; do + (cd ${WRKSRC}/$(dirname ${file}) && poetry export --output $(basename ${file})) make_var="${requirements[${file}]}" ok=1 - for req in $(grep -E '^[^[:space:]]' "$(make -V WRKSRC)/${file}" |cut -f 1 -d =) ; do + for req in $(grep -E '^[^[:space:]]' "${WRKSRC}/${file}" |cut -f 1 -d =) ; do # "cryptography" is handled separately via USE_PYTHON+=cryptography # "pkgutil-resolve-name" is included in Python 3.9 if [ "${req}" != "cryptography" -a \ @@ -18,6 +23,6 @@ for file in ${!requirements[@]} ; do fi done if [ ${ok} -eq 1 ] ; then - echo "ok: ${file}" + echo "ok: ${make_var} matches ${WRKSRC}/${file}" fi done diff --git a/net-p2p/c-lightning/files/patch-Makefile b/net-p2p/c-lightning/files/patch-Makefile index ff53286f8604..05cd9403e26f 100644 --- a/net-p2p/c-lightning/files/patch-Makefile +++ b/net-p2p/c-lightning/files/patch-Makefile @@ -1,18 +1,18 @@ ---- Makefile.orig 2023-08-23 06:24:14 UTC -+++ Makefile -@@ -268,9 +268,9 @@ ifeq ($(STATIC),1) +--- Makefile.orig 2024-08-29 06:49:21.000000000 +0200 ++++ Makefile 2024-09-03 12:56:39.050177000 +0200 +@@ -271,9 +271,9 @@ # For MacOS, Jacob Rapoport <jacob@rumblemonkey.com> changed this to: # -L/usr/local/lib -lsqlite3 -lz -Wl,-lm -lpthread -ldl $(COVFLAGS) # But that doesn't static link. --LDLIBS = -L$(CPATH) -Wl,-dn $(SQLITE3_LDLIBS) -lz -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) -+LDLIBS = -L$(LIBRARY_PATH) -Wl,-dn $(SQLITE3_LDLIBS) -lz -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) +-LDLIBS = -L$(CPATH) -Wl,-dn $(SQLITE3_LDLIBS) -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) ++LDLIBS = -L$(LIBRARY_PATH) -Wl,-dn $(SQLITE3_LDLIBS) -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) else --LDLIBS = -L$(CPATH) -lm $(SQLITE3_LDLIBS) -lz $(COVFLAGS) -+LDLIBS = -L$(LIBRARY_PATH) -lm $(SQLITE3_LDLIBS) -lz $(COVFLAGS) +-LDLIBS = -L$(CPATH) -lm $(SQLITE3_LDLIBS) $(COVFLAGS) ++LDLIBS = -L$(LIBRARY_PATH) -lm $(SQLITE3_LDLIBS) $(COVFLAGS) endif # If we have the postgres client library we need to link against it as well -@@ -760,7 +760,7 @@ docdir = $(datadir)/doc/$(PKGNAME) +@@ -767,7 +767,7 @@ plugindir = $(pkglibexecdir)/plugins datadir = $(PREFIX)/share docdir = $(datadir)/doc/$(PKGNAME) diff --git a/net-p2p/c-lightning/files/patch-configure b/net-p2p/c-lightning/files/patch-configure index 8479216ba0ec..8ddd9a01c8f2 100644 --- a/net-p2p/c-lightning/files/patch-configure +++ b/net-p2p/c-lightning/files/patch-configure @@ -1,4 +1,4 @@ ---- configure.orig 2023-06-22 13:48:20 UTC +--- configure.orig 2024-06-05 01:23:24 UTC +++ configure @@ -15,7 +15,7 @@ else LIBRARY_PATH=/opt/homebrew/lib @@ -7,5 +7,5 @@ -CPATH=/usr/local/lib +CPATH=/usr/local/include LIBRARY_PATH=/usr/local/lib - export PKG_CONFIG_PATH=/usr/local/opt/sqlite/lib/pkgconfig + export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/sqlite/lib/pkgconfig fi |