lnsocket

A minimal C library for connecting to the lightning network
git clone git://jb55.com/lnsocket
Log | Files | Refs | Submodules | README | LICENSE

commit 8ea374f8a5a53c4bf5067e512bb2ab8581f05a92
parent c9a2b16c613f2eacfb1d80b0b638cc47561b20f1
Author: William Casarin <jb55@jb55.com>
Date:   Fri, 15 Jul 2022 13:24:59 -0700

update secp and remove old patch

Signed-off-by: William Casarin <jb55@jb55.com>

Diffstat:
Dtools/0001-configure-customizable-AR-and-RANLIB.patch | 67-------------------------------------------------------------------
Mtools/secp-wasm.sh | 2--
2 files changed, 0 insertions(+), 69 deletions(-)

diff --git a/tools/0001-configure-customizable-AR-and-RANLIB.patch b/tools/0001-configure-customizable-AR-and-RANLIB.patch @@ -1,67 +0,0 @@ -From 0d253d52e804a5affb0f1c851ec250071e7345d9 Mon Sep 17 00:00:00 2001 -From: Tim Ruffing <crypto@timruffing.de> -Date: Sun, 13 Mar 2022 10:39:55 +0100 -Subject: [PATCH] configure: Use modern way to set AR - -This uses AM_PROG_AR to discover ar, which is the recommended way to do -so. Among other advantages, it honors the AR environment variable (as -set from the outside). The macro has been around since automake 1.11.2 -(Dec 2011). - -This commit also removes code that discovers ranlib and strip. ranlib -has been obsolete for decades (ar does its task now automatically), and -anyway LT_INIT takes care of discovering it. The code we used to set -STRIP was last mentioned in the automake 1.5 manual. Since automake 1.6 -(Mar 2002), strip is discovered automatically when necessary (look for -the *private* macro AM_PROG_INSTALL_STRIP in the automake manual). ---- - .gitignore | 1 + - configure.ac | 11 +++++------ - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 53941f23a..d88627d72 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -46,6 +46,7 @@ coverage.*.html - - src/libsecp256k1-config.h - src/libsecp256k1-config.h.in -+build-aux/ar-lib - build-aux/config.guess - build-aux/config.sub - build-aux/depcomp -diff --git a/configure.ac b/configure.ac -index cc766b20a..16a492071 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,24 +25,23 @@ AC_CANONICAL_HOST - AH_TOP([#ifndef LIBSECP256K1_CONFIG_H]) - AH_TOP([#define LIBSECP256K1_CONFIG_H]) - AH_BOTTOM([#endif /*LIBSECP256K1_CONFIG_H*/]) --AM_INIT_AUTOMAKE([foreign subdir-objects]) - --LT_INIT([win32-dll]) -+# Require Automake 1.11.2 for AM_PROG_AR -+AM_INIT_AUTOMAKE([1.11.2 foreign subdir-objects]) - - # Make the compilation flags quiet unless V=1 is used. - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - PKG_PROG_PKG_CONFIG - --AC_PATH_TOOL(AR, ar) --AC_PATH_TOOL(RANLIB, ranlib) --AC_PATH_TOOL(STRIP, strip) -- - AC_PROG_CC - if test x"$ac_cv_prog_cc_c89" = x"no"; then - AC_MSG_ERROR([c89 compiler support required]) - fi - AM_PROG_AS -+AM_PROG_AR -+ -+LT_INIT([win32-dll]) - - build_windows=no - diff --git a/tools/secp-wasm.sh b/tools/secp-wasm.sh @@ -12,8 +12,6 @@ mkdir -p $PREFIX || exit 1 make distclean > /dev/null -patch -N -p1 < ../../tools/0001-configure-customizable-AR-and-RANLIB.patch - ./configure --disable-shared \ --disable-tests \ --disable-exhaustive-tests \