* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsecp256k1/, dev-libs/libsecp256k1/files/
@ 2024-12-01 11:51 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-12-01 11:51 UTC (permalink / raw
To: gentoo-commits
commit: b1748b232d03a33e9a4a2cbcbfa91f24117df1bb
Author: Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Thu Nov 7 12:42:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 11:49:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1748b23
dev-libs/libsecp256k1: drop old
Closes: https://bugs.gentoo.org/752165
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/libsecp256k1/Manifest | 8 --
.../files/0.3.0-fix-cross-compile.patch | 99 ----------------------
.../libsecp256k1-0.1_pre20190401.ebuild | 72 ----------------
.../libsecp256k1-0.1_pre20201028-r1.ebuild | 72 ----------------
dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild | 71 ----------------
dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild | 71 ----------------
dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild | 71 ----------------
dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild | 72 ----------------
dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild | 63 --------------
dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild | 63 --------------
dev-libs/libsecp256k1/metadata.xml | 2 -
11 files changed, 664 deletions(-)
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index 229f65591a0d..0ed4a6d06fa5 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,10 +1,2 @@
-DIST libsecp256k1-0.3.0.tar.gz 2475682 BLAKE2B a531a87da63abc67a55e756852cde41cdc56d388963871beb23233623721f583ade4ce6b273ffa1c319a3875541e18c549512034d7b6a9eb926e8e916513d14d SHA512 77251b37990b0e73442aa1ec1ff51c5c7e293755ace9abc92ce6c3d21c7ed7f3b1666b939b4410bf1f637e3a69b16a7d33069caf071327f05177420a10f15eda
-DIST libsecp256k1-0.3.1.tar.gz 2560292 BLAKE2B 70ff57e222dd47d0e63a40653d4e7b4e727f6bcb5abf005f15c94cf70e7d11843281d7406d2640b06a0f6a2c2f79cc66ea544cca761d1587973d57006ca39daf SHA512 58ec679625ef4663c94c7198ee953283106c1e027623c3de341277fa757265b822ad3c0e98019f9e425f0e9e414b03e6b62853a1581611813cce753e81845d0f
-DIST libsecp256k1-0.3.2.tar.gz 2566680 BLAKE2B bf0a5ac1edbc115247148912822a2cefe798651f6c6a480422eee90eba96ebbfba772d561e321ac2bf7a0f8261f8ccd9f3af0e66e196f1e861aa550ee1303f27 SHA512 18104b72dd5d1f5e776d72c31c36247e450736437b453b59cf6ec86f84fedeafcf231e266c1ddad727befd9864c65a779000d01e6cef4b9a6485850afebc8a81
-DIST libsecp256k1-0.4.0.tar.gz 2607093 BLAKE2B abbd68580e5e35478d74cad13e0e55a175d2000a0a071dc0812655a47ee262572c1e6944d2d5c8f3dd2b798a72e90be7b64d76f7be25e85ba2471e03254a8fb0 SHA512 84cc115a74d39bc4173012f321ae13195ae92bb96f1dcdcb01fe8392fd5b2437addfa63a1654d07f70e67f0ea6e27978134196442b9ae25bc6f9159ee9ef6527
-DIST libsecp256k1-0.4.1.tar.gz 2614189 BLAKE2B 50de3e2699afa6b80aa64b9c593a6eff98d779706fde3cbb9b54ae0b596c584538abfc9f6d03cdcfd92e6df46db287049a83609e4f5dbb197fd067202f728810 SHA512 68d057d6820ca77006a16d6997c1e8240480b2d6e8d6a4d68188c699c476b71a46850dd3bc217e53a2ebd518b4db37d669058d2104d89cb2a356ba54892ad447
-DIST libsecp256k1-0.5.0.tar.gz 1960832 BLAKE2B 118e3bb1d8e0a4493debae3b1feb68ff5a93348bbed32486779416cc2359dd65d8cfaa7bb47afca8b4ddb214b7ce05c9997896fd256ad73df35ec51a8966fe69 SHA512 b8511b0d8b581d371ee48f2c8a5a72930e7a0686a860200e56e83e2f58a63f2d781af75829d922e98f6648d361e20efde29abcf52c086b77647457c6c3586e78
DIST libsecp256k1-0.5.1.tar.gz 1962518 BLAKE2B edff454529755c5de4f7a5192235b7e461426cc05da83ba1be03a3f9f4327397ae96b11bbf4250cd09165a1a6bd5383b928d4374713c47ef930de0af11cfc772 SHA512 5cba94794ac9c0e9a72111958562690bfb79b1ccd3071e0aaa22c4c6a4fe4007b87e402c00bbab1bdc93f31490d4b528d7ac368870ac05de12ee76db8313e510
DIST libsecp256k1-0.6.0.tar.gz 1996783 BLAKE2B 6c8ec26bd3d10f463ac4aeed4aa092718a8101012d9ae0b8931166a4bec717f9d5bdc2c8ef21395f6ce2285828871deefa1e47299654d19634c9398d7447acea SHA512 bccaa15295b0633e1fe5a4a4d7a80be812e40c8ed815be4f0d3f3348a5e185633c599cd50b7461a3584f89aea94f6d5321772876c5146553e2732df8b72becc2
-DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae5dcb5a92f68bc3fb39a397c532951c6392347df14ea0347bbe05cab43158512e0d9f5ea87bd8f69bece1b04440860ebb8065ee SHA512 8c4945e93cb5ff241482ba4426b25162a7ae3b26860edc10c91d06b1c396887202ad971f4d38e035828352531b87fc29087a12b675e43da44f23c9ea3b6c0cc8
-DIST libsecp256k1-v0.1_pre20201028.tgz 200051 BLAKE2B 90d636049b411e02703feb2661006900a55f952f60e76e2b7147a5afe8e391a06a80d6ae1489b1e7f2382176c7ea831526465a85bca09156dc6d37b417fcb33b SHA512 54a0fa21b64dd6836e4227de51f3539afe06e0e2f352683397d6adb5dd0508af443d2e25f91e90e1ae366b261965fe7d438292314705baee799cf37421644958
diff --git a/dev-libs/libsecp256k1/files/0.3.0-fix-cross-compile.patch b/dev-libs/libsecp256k1/files/0.3.0-fix-cross-compile.patch
deleted file mode 100644
index 1aec78d36589..000000000000
--- a/dev-libs/libsecp256k1/files/0.3.0-fix-cross-compile.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://github.com/bitcoin-core/secp256k1/pull/1159
-
-From dc87b08eea757aae95b1efc25fe543e91510df0a Mon Sep 17 00:00:00 2001
-From: Matt Whitlock <bitcoin@mattwhitlock.name>
-Date: Sun, 20 Nov 2022 01:46:07 -0500
-Subject: [PATCH] Makefile: build precomp generators using build-system
- toolchain
-
-When cross-compiling libsecp256k1, if the `precomputed_ecmult*.c` source
-files need to be regenerated, then the generators need to be built for
-the *build* system, not for the *host* system. Autoconf supports this
-fairly cleanly via the `AX_PROG_CC_FOR_BUILD` macro (from Autoconf
-Archive), but Automake requires some hackery. When building the
-generators, we override the `CC` variable to its build-system
-counterpart, `CC_FOR_BUILD`, and we specify Automake per-program
-overrides for `CFLAGS`, `CPPFLAGS`, and `LDFLAGS`, setting their values
-respectively from the `CFLAGS_FOR_BUILD`, `CPPFLAGS_FOR_BUILD`, and
-`LDFLAGS_FOR_BUILD` variables, whose values in turn are populated by the
-aforementioned Autoconf macro and may be overridden on the `make`
-command line. Since Automake lacks support for overriding `EXEEXT` on a
-per-program basis, we define a recipe that builds the generator binaries
-with names suffixed with `$(EXEEXT)` and then renames them suffixed with
-`$(BUILD_EXEEXT)`.
----
- Makefile.am | 35 +++++++++++++++++++++++++++--------
- configure.ac | 1 +
- 2 files changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e3fdf4da..5e859c91 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -186,15 +186,34 @@ endif
- endif
-
- ### Precomputed tables
--EXTRA_PROGRAMS = precompute_ecmult precompute_ecmult_gen
--CLEANFILES = $(EXTRA_PROGRAMS)
-+PROGRAMS_FOR_BUILD = precompute_ecmult precompute_ecmult_gen
-+$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override CC = $(CC_FOR_BUILD)
-+# Automake has no support for PROGRAMS suffixed with BUILD_EXEEXT
-+# instead of EXEEXT, so if those extensions differ, then we define a
-+# recipe that builds the latter and renames it to the former. Since
-+# Cygwin toolchains always append '.exe' to the output file name given
-+# by '-o', we ignore rename failures since the toolchain will have
-+# already created the right output file. (Note: The leading spaces
-+# before ifneq and endif here are a hack so Automake won't try to
-+# interpret them as an Automake conditional.)
-+ ifneq ($(BUILD_EXEEXT),$(EXEEXT))
-+%$(BUILD_EXEEXT) : %$(EXEEXT)
-+ mv -- '$<' '$@' || :
-+ endif
-+
-+EXTRA_PROGRAMS = $(PROGRAMS_FOR_BUILD)
-+CLEANFILES = $(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD))
-
- precompute_ecmult_SOURCES = src/precompute_ecmult.c
--precompute_ecmult_CPPFLAGS = $(SECP_CONFIG_DEFINES)
-+precompute_ecmult_CFLAGS = $(CFLAGS_FOR_BUILD)
-+precompute_ecmult_CPPFLAGS = $(CPPFLAGS_FOR_BUILD) $(SECP_CONFIG_DEFINES)
-+precompute_ecmult_LDFLAGS = $(LDFLAGS_FOR_BUILD)
- precompute_ecmult_LDADD = $(COMMON_LIB)
-
- precompute_ecmult_gen_SOURCES = src/precompute_ecmult_gen.c
--precompute_ecmult_gen_CPPFLAGS = $(SECP_CONFIG_DEFINES)
-+precompute_ecmult_gen_CFLAGS = $(CFLAGS_FOR_BUILD)
-+precompute_ecmult_gen_CPPFLAGS = $(CPPFLAGS_FOR_BUILD) $(SECP_CONFIG_DEFINES)
-+precompute_ecmult_gen_LDFLAGS = $(LDFLAGS_FOR_BUILD)
- precompute_ecmult_gen_LDADD = $(COMMON_LIB)
-
- # See Automake manual, Section "Errors with distclean".
-@@ -204,11 +223,11 @@ precompute_ecmult_gen_LDADD = $(COMMON_LIB)
- # This means that rebuilds of the prebuilt files always need to be
- # forced by deleting them, e.g., by invoking `make clean-precomp`.
- src/precomputed_ecmult.c:
-- $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(EXEEXT)
-- ./precompute_ecmult$(EXEEXT)
-+ $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(BUILD_EXEEXT)
-+ ./precompute_ecmult$(BUILD_EXEEXT)
- src/precomputed_ecmult_gen.c:
-- $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(EXEEXT)
-- ./precompute_ecmult_gen$(EXEEXT)
-+ $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(BUILD_EXEEXT)
-+ ./precompute_ecmult_gen$(BUILD_EXEEXT)
-
- PRECOMP = src/precomputed_ecmult_gen.c src/precomputed_ecmult.c
- precomp: $(PRECOMP)
-diff --git a/configure.ac b/configure.ac
-index a46a0a7b..3b88d0d0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AC_PROG_CC
- AM_PROG_AS
- AM_PROG_AR
-+AX_PROG_CC_FOR_BUILD
-
- # Clear some cache variables as a workaround for a bug that appears due to a bad
- # interaction between AM_PROG_AR and LT_INIT when combining MSVC's archiver lib.exe.
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
deleted file mode 100644
index f9c8c9d6cffd..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20190401.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-COMMITHASH="b19c000063be11018b4d1a6b0a85871ab9d0bdcf"
-SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- ecdh? ( experimental )
- java? ( ecdh )
- test-openssl? ( test )
-"
-RDEPEND="
- gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
- java? ( virtual/jdk )
- test-openssl? ( dev-libs/openssl:0 )
-"
-BDEPEND="
- java? ( virtual/jdk )
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local asm_opt
- if use asm; then
- if use arm; then
- asm_opt=arm
- else
- asm_opt=auto
- fi
- else
- asm_opt=no
- fi
- econf \
- --disable-benchmark \
- $(use_enable experimental) \
- $(use_enable java jni) \
- $(use_enable test tests) \
- $(use_enable test-openssl openssl-tests) \
- $(use_enable ecdh module-ecdh) \
- $(use_enable endomorphism) \
- --with-asm=$asm_opt \
- --with-bignum=$(usex gmp gmp no) \
- $(use_enable recovery module-recovery) \
- --disable-static
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
deleted file mode 100644
index 5d25d6fc5453..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20201028-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-COMMITHASH="3967d96bf184519eb98b766af665b4d4b072563e"
-SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="asm ecdh +experimental +extrakeys gmp lowmem +recovery +schnorr test test-openssl valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- extrakeys? ( experimental )
- schnorr? ( experimental extrakeys )
- test-openssl? ( test )
-"
-RDEPEND="
- gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test-openssl? ( dev-libs/openssl:0 )
- valgrind? ( dev-debug/valgrind )
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local asm_opt
- if use asm; then
- if use arm; then
- asm_opt=arm
- else
- asm_opt=auto
- fi
- else
- asm_opt=no
- fi
- econf \
- --disable-benchmark \
- $(use_enable experimental) \
- $(use_enable test tests) \
- $(use_enable test exhaustive-tests) \
- $(use_enable test-openssl openssl-tests) \
- $(use_enable ecdh module-ecdh) \
- $(use_enable extrakeys module-extrakeys) \
- --with-asm=${asm_opt} \
- --with-bignum=$(usex gmp gmp no) \
- $(use_enable recovery module-recovery) \
- $(use_enable schnorr module-schnorrsig) \
- $(usex lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2' '') \
- $(use_with valgrind) \
- --disable-static
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
deleted file mode 100644
index 9dacf0b84fde..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2" # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- schnorr? ( extrakeys )
-"
-BDEPEND="
- dev-build/autoconf-archive
- virtual/pkgconfig
- valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/0.3.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Generate during build
- rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-benchmark
- $(use_enable experimental)
- $(use_enable test tests)
- $(use_enable test exhaustive-tests)
- $(use_enable {,module-}ecdh)
- $(use_enable {,module-}extrakeys)
- $(use_enable {,module-}recovery)
- $(use_enable schnorr module-schnorrsig)
- $(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2')
- $(use_with valgrind)
- )
- if use asm; then
- if use arm; then
- myeconfargs+=( --with-asm=arm )
- else
- myeconfargs+=( --with-asm=auto )
- fi
- else
- myeconfargs+=( --with-asm=no )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
deleted file mode 100644
index 9dacf0b84fde..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2" # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- schnorr? ( extrakeys )
-"
-BDEPEND="
- dev-build/autoconf-archive
- virtual/pkgconfig
- valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/0.3.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Generate during build
- rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-benchmark
- $(use_enable experimental)
- $(use_enable test tests)
- $(use_enable test exhaustive-tests)
- $(use_enable {,module-}ecdh)
- $(use_enable {,module-}extrakeys)
- $(use_enable {,module-}recovery)
- $(use_enable schnorr module-schnorrsig)
- $(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2')
- $(use_with valgrind)
- )
- if use asm; then
- if use arm; then
- myeconfargs+=( --with-asm=arm )
- else
- myeconfargs+=( --with-asm=auto )
- fi
- else
- myeconfargs+=( --with-asm=no )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
deleted file mode 100644
index a1de3bf23f5c..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2" # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- schnorr? ( extrakeys )
-"
-BDEPEND="
- dev-build/autoconf-archive
- virtual/pkgconfig
- valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/0.3.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Generate during build
- rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-benchmark
- $(use_enable experimental)
- $(use_enable test tests)
- $(use_enable test exhaustive-tests)
- $(use_enable {,module-}ecdh)
- $(use_enable {,module-}extrakeys)
- $(use_enable {,module-}recovery)
- $(use_enable schnorr module-schnorrsig)
- $(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2')
- $(use_with valgrind)
- )
- if use asm; then
- if use arm; then
- myeconfargs+=( --with-asm=arm32 )
- else
- myeconfargs+=( --with-asm=auto )
- fi
- else
- myeconfargs+=( --with-asm=no )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
deleted file mode 100644
index af00152f3730..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2" # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- schnorr? ( extrakeys )
-"
-BDEPEND="
- dev-build/autoconf-archive
- virtual/pkgconfig
- valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/0.4.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Generate during build
- rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-benchmark
- $(use_enable experimental)
- $(use_enable test tests)
- $(use_enable test exhaustive-tests)
- $(use_enable {,module-}ecdh)
- $(use_enable {,module-}ellswift)
- $(use_enable {,module-}extrakeys)
- $(use_enable {,module-}recovery)
- $(use_enable schnorr module-schnorrsig)
- $(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2')
- $(use_with valgrind)
- )
- if use asm; then
- if use arm; then
- myeconfargs+=( --with-asm=arm32 )
- else
- myeconfargs+=( --with-asm=auto )
- fi
- else
- myeconfargs+=( --with-asm=no )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
deleted file mode 100644
index 09b8366b8764..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2" # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- schnorr? ( extrakeys )
-"
-BDEPEND="
- dev-build/autoconf-archive
- virtual/pkgconfig
- valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/0.4.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Generate during build
- rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-benchmark
- $(use_enable experimental)
- $(use_enable test tests)
- $(use_enable test exhaustive-tests)
- $(use_enable {,module-}ecdh)
- $(use_enable {,module-}ellswift)
- $(use_enable {,module-}extrakeys)
- $(use_enable {,module-}recovery)
- $(use_enable schnorr module-schnorrsig)
- $(use_with asm asm "$(usex arm arm32 auto)")
- $(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-precision=2')
- $(use_with valgrind)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
deleted file mode 100644
index 57b2d865e1ba..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.5.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-SRC_URI="https://github.com/bitcoin-core/secp256k1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MyPN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/2" # subslot is "$((_LIB_VERSION_CURRENT-_LIB_VERSION_AGE))" from configure.ac
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="asm +ecdh +ellswift experimental +extrakeys lowmem +recovery +schnorr test valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- asm? ( || ( amd64 arm ) arm? ( experimental ) )
- schnorr? ( extrakeys )
-"
-BDEPEND="
- dev-build/autoconf-archive
- virtual/pkgconfig
- valgrind? ( dev-debug/valgrind )
-"
-
-PATCHES=(
- "${FILESDIR}/0.4.0-fix-cross-compile.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Generate during build
- rm -f src/precomputed_ecmult.c src/precomputed_ecmult_gen.c || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-benchmark
- $(use_enable experimental)
- $(use_enable test tests)
- $(use_enable test exhaustive-tests)
- $(use_enable {,module-}ecdh)
- $(use_enable {,module-}ellswift)
- $(use_enable {,module-}extrakeys)
- $(use_enable {,module-}recovery)
- $(use_enable schnorr module-schnorrsig)
- $(use_with asm asm "$(usex arm arm32 auto)")
- $(usev lowmem '--with-ecmult-window=4 --with-ecmult-gen-kb=2')
- $(use_with valgrind)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 734060bad981..08a4e16cdf19 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -16,14 +16,12 @@
<use>
<flag name="ecdh">Enable ECDH shared secret computation</flag>
<flag name="ellswift">Enable ElligatorSwift encoding for public keys</flag>
- <flag name="endomorphism">Enable endomorphism</flag>
<flag name="experimental">Allow experimental USE flags</flag>
<flag name="extrakeys">Enable extrakeys module</flag>
<flag name="lowmem">Reduce runtime memory usage at the expense of performance (ecmult window size 4, gen precision 2)</flag>
<flag name="musig">Enable MuSig2 module</flag>
<flag name="recovery">Enable ECDSA pubkey recovery module</flag>
<flag name="schnorr">Enable Schnorr signature module</flag>
- <flag name="test-openssl">Enable OpenSSL comparison tests</flag>
</use>
<upstream>
<remote-id type="github">bitcoin-core/secp256k1</remote-id>
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsecp256k1/, dev-libs/libsecp256k1/files/
@ 2023-01-07 7:41 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-01-07 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 691874242c42faac0995de394c9ec60787eab0e9
Author: Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name>
AuthorDate: Fri Jan 6 22:25:56 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 07:39:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69187424
dev-libs/libsecp256k1: fix cross-compilation
See: https://github.com/bitcoin-core/secp256k1/pull/1159
Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://github.com/gentoo/gentoo/pull/28990
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/0.2.0-fix-cross-compile.patch | 85 ++++++++++++++++++++++
dev-libs/libsecp256k1/libsecp256k1-0.2.0-r2.ebuild | 5 ++
2 files changed, 90 insertions(+)
diff --git a/dev-libs/libsecp256k1/files/0.2.0-fix-cross-compile.patch b/dev-libs/libsecp256k1/files/0.2.0-fix-cross-compile.patch
new file mode 100644
index 000000000000..585e9b491a81
--- /dev/null
+++ b/dev-libs/libsecp256k1/files/0.2.0-fix-cross-compile.patch
@@ -0,0 +1,85 @@
+From 772e747bd9104d80fe531bed61f23f75342d7d63 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <bitcoin@mattwhitlock.name>
+Date: Sun, 20 Nov 2022 01:46:07 -0500
+Subject: [PATCH] Makefile: build precomp generators using build-system
+ toolchain
+
+When cross-compiling libsecp256k1, if the `precomputed_ecmult*.c` source
+files need to be regenerated, then the generators need to be built for
+the *build* system, not for the *host* system. Autoconf supports this
+fairly cleanly via the `AX_PROG_CC_FOR_BUILD` macro (from Autoconf
+Archive), but Automake requires some hackery. When building the
+generators, we override the `CC`, `CFLAGS`, `CPPFLAGS`, and `LDFLAGS`
+variables to their build-system counterparts, whose names are suffixed
+with `_FOR_BUILD` and whose values are populated by the aforementioned
+Autoconf macro and may be overridden on the `make` command line. Since
+Automake lacks support for overriding `EXEEXT` on a per-program basis,
+we define a recipe that builds the generator binaries with names
+suffixed with `$(EXEEXT)` and then renames them suffixed with
+`$(BUILD_EXEEXT)`.
+---
+ Makefile.am | 30 ++++++++++++++++++++++++------
+ configure.ac | 1 +
+ 2 files changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 30b6a794d0..e929300298 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -180,8 +180,26 @@ endif
+ endif
+
+ ### Precomputed tables
+-EXTRA_PROGRAMS = precompute_ecmult precompute_ecmult_gen
+-CLEANFILES = $(EXTRA_PROGRAMS)
++PROGRAMS_FOR_BUILD = precompute_ecmult precompute_ecmult_gen
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override CC = $(CC_FOR_BUILD)
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override CFLAGS = $(CFLAGS_FOR_BUILD)
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
++$(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD)) : override LDFLAGS = $(LDFLAGS_FOR_BUILD)
++# Automake has no support for PROGRAMS suffixed with BUILD_EXEEXT
++# instead of EXEEXT, so if those extensions differ, then we define a
++# recipe that builds the latter and renames it to the former. Since
++# Cygwin toolchains always append '.exe' to the output file name given
++# by '-o', we ignore rename failures since the toolchain will have
++# already created the right output file. (Note: The leading spaces
++# before ifneq and endif here are a hack so Automake won't try to
++# interpret them as an Automake conditional.)
++ ifneq ($(BUILD_EXEEXT),$(EXEEXT))
++%$(BUILD_EXEEXT) : %$(EXEEXT)
++ mv -- '$<' '$@' || :
++ endif
++
++EXTRA_PROGRAMS = $(PROGRAMS_FOR_BUILD)
++CLEANFILES = $(addsuffix $(BUILD_EXEEXT),$(PROGRAMS_FOR_BUILD))
+
+ precompute_ecmult_SOURCES = src/precompute_ecmult.c
+ precompute_ecmult_CPPFLAGS = $(SECP_INCLUDES)
+@@ -198,11 +216,11 @@ precompute_ecmult_gen_LDADD = $(SECP_LIBS) $(COMMON_LIB)
+ # This means that rebuilds of the prebuilt files always need to be
+ # forced by deleting them, e.g., by invoking `make clean-precomp`.
+ src/precomputed_ecmult.c:
+- $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(EXEEXT)
+- ./precompute_ecmult$(EXEEXT)
++ $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(BUILD_EXEEXT)
++ ./precompute_ecmult$(BUILD_EXEEXT)
+ src/precomputed_ecmult_gen.c:
+- $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(EXEEXT)
+- ./precompute_ecmult_gen$(EXEEXT)
++ $(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(BUILD_EXEEXT)
++ ./precompute_ecmult_gen$(BUILD_EXEEXT)
+
+ PRECOMP = src/precomputed_ecmult_gen.c src/precomputed_ecmult.c
+ precomp: $(PRECOMP)
+diff --git a/configure.ac b/configure.ac
+index a2a15d2b82..013964f5ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AC_PROG_CC
+ AM_PROG_AS
+ AM_PROG_AR
++AX_PROG_CC_FOR_BUILD
+
+ # Clear some cache variables as a workaround for a bug that appears due to a bad
+ # interaction between AM_PROG_AR and LT_INIT when combining MSVC's archiver lib.exe.
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r2.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r2.ebuild
index 9391a6c99236..588001fd95a4 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r2.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.2.0-r2.ebuild
@@ -21,10 +21,15 @@ REQUIRED_USE="
schnorr? ( extrakeys )
"
BDEPEND="
+ sys-devel/autoconf-archive
virtual/pkgconfig
valgrind? ( dev-util/valgrind )
"
+PATCHES=(
+ "${FILESDIR}/0.2.0-fix-cross-compile.patch"
+)
+
S="${WORKDIR}/${MyPN}-${PV}"
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsecp256k1/, dev-libs/libsecp256k1/files/
@ 2017-01-24 1:17 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-01-24 1:17 UTC (permalink / raw
To: gentoo-commits
commit: 7e4f64ed2f47697ab0a7f606cd8ba3e05c5a6509
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 21:24:59 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 01:17:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4f64ed
dev-libs/libsecp256k1: Drop old
Package-Manager: portage-2.3.0
dev-libs/libsecp256k1/Manifest | 2 -
dev-libs/libsecp256k1/files/20141212-fixes.patch | 289 ---------------------
.../libsecp256k1-0.0.0_pre20141212.ebuild | 74 ------
.../libsecp256k1-0.0.0_pre20150423.ebuild | 57 ----
4 files changed, 422 deletions(-)
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index ea22c61..f988266 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,4 +1,2 @@
DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 SHA256 1cb5350e50d8d7e9061835d40a06e8419d8dcf95210bdf887380d2b933217743 SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd WHIRLPOOL af3bf6aeffa66f2d442dcc11255a60e5f24d281b30751ddcf72d9abbfb052cb8197081b56281e4b19a99602eead204ca985ed74feeb4b1e5c89543c70014f454
-DIST secp256k1-v0.0.0_pre20141212.tgz 60007 SHA256 f5d3a7cac425caf64040395d99c1a91ab2ca1c973b228a66772ba4a290f355ce SHA512 ab2a211c1bf882ebb62e78891e4e12c3ed7244d46d532e37ff2a669ba08db8dcafec7b4c57c073310e463957fd2fa0dffb940c4f35b61890cb8ce86d4283f0f6 WHIRLPOOL 3aa8b7545ca24028ceb17e770fdbf997e2895212ec25a193fcd926660e78f16d704bf27a5b1aa7cf3cabe643c33b128bf0b0568172c15833eb82fcc58e5941c1
-DIST secp256k1-v0.0.0_pre20150423.tgz 77451 SHA256 7e4e78d5ded245b59dbe8abc9804fdf7ba41d9030936fb39766d5f2bd7e29b2e SHA512 a640188d83e9aa5a4292900c211e29815f2f1b57db4fbccfb8a3bf770bb52f0232d405044f317a3b6b6ea4d5a5107180dc4e374cf7ab06eb79676c270061c3b7 WHIRLPOOL 5796d32cd8f578ef28f6e79ced53fa505519273af39bdeaa413e9b48669ce7945d12437c6093f3aa0b3db9412dac50638c335a3f4f8cf0d4ffa8c94665a85f72
DIST secp256k1-v0.0.0_pre20151118.tgz 125884 SHA256 75549cea9b22affda02d6731385a7184b60703f1ca0a4f098fec8c702a20f7b0 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19 WHIRLPOOL 61eb9a709e8986db9113d305a989d44700f5e53143471485935bed0f79d18c745cb78f2b4b5e55614b6ca80a6bd29830b52108797bc21bc792789a7590597fed
diff --git a/dev-libs/libsecp256k1/files/20141212-fixes.patch b/dev-libs/libsecp256k1/files/20141212-fixes.patch
deleted file mode 100644
index f8cb274..00000000
--- a/dev-libs/libsecp256k1/files/20141212-fixes.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-diff --git a/build-aux/m4/bitcoin_secp.m4 b/build-aux/m4/bitcoin_secp.m4
-index 1373478..4a398d6 100644
---- a/build-aux/m4/bitcoin_secp.m4
-+++ b/build-aux/m4/bitcoin_secp.m4
-@@ -1,12 +1,6 @@
- dnl libsecp25k1 helper checks
- AC_DEFUN([SECP_INT128_CHECK],[
- has_int128=$ac_cv_type___int128
--if test x"$has_int128" != x"yes" && test x"$set_field" = x"64bit"; then
-- AC_MSG_ERROR([$set_field field support explicitly requested but is not compatible with this host])
--fi
--if test x"$has_int128" != x"yes" && test x"$set_scalar" = x"64bit"; then
-- AC_MSG_ERROR([$set_scalar scalar support explicitly requested but is not compatible with this host])
--fi
- ])
-
- dnl
-@@ -18,11 +12,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- __asm__ __volatile__("movq $0x100000000,%1; mulq %%rsi" : "+a"(a) : "S"(tmp) : "cc", "%rdx");
- ]])],[has_64bit_asm=yes],[has_64bit_asm=no])
- AC_MSG_RESULT([$has_64bit_asm])
--if test x"$set_field" == x"64bit_asm"; then
-- if test x"$has_64bit_asm" == x"no"; then
-- AC_MSG_ERROR([$set_field field support explicitly requested but no x86_64 assembly available])
-- fi
--fi
- ])
-
- dnl
-@@ -43,7 +32,7 @@ else
- )])
- LIBS=
- fi
--if test x"$has_libcrypto" == x"yes" && test x"$has_openssl_ec" = x; then
-+if test x"$has_libcrypto" = x"yes" && test x"$has_openssl_ec" = x; then
- AC_MSG_CHECKING(for EC functions in libcrypto)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <openssl/ec.h>
-@@ -69,11 +58,4 @@ if test x"$has_gmp" != x"yes"; then
- CPPFLAGS="$CPPFLAGS_TEMP"
- LIBS="$LIBS_TEMP"
- fi
--if test x"$set_field" = x"gmp" && test x"$has_gmp" != x"yes"; then
-- AC_MSG_ERROR([$set_field field support explicitly requested but libgmp was not found])
--fi
--if test x"$set_bignum" = x"gmp" && test x"$has_gmp" != x"yes"; then
-- AC_MSG_ERROR([$set_bignum field support explicitly requested but libgmp was not found])
--fi
- ])
--
-diff --git a/configure.ac b/configure.ac
-index 40e121e..bd99013 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ if test "x$CFLAGS" = "x"; then
- fi
-
- AC_PROG_CC_C99
--if test x"$ac_cv_prog_cc_c99" == x"no"; then
-+if test x"$ac_cv_prog_cc_c99" = x"no"; then
- AC_MSG_ERROR([c99 compiler support required])
- fi
-
-@@ -96,15 +96,18 @@ AC_ARG_ENABLE(endomorphism,
- [use_endomorphism=$enableval],
- [use_endomorphism=no])
-
--AC_ARG_WITH([field], [AS_HELP_STRING([--with-field=gmp|64bit|64bit_asm|32bit|auto],
-+AC_ARG_WITH([field], [AS_HELP_STRING([--with-field=gmp|64bit|32bit|auto],
- [Specify Field Implementation. Default is auto])],[req_field=$withval], [req_field=auto])
-
--AC_ARG_WITH([bignum], [AS_HELP_STRING([--with-bignum=gmp|none|auto],
-+AC_ARG_WITH([bignum], [AS_HELP_STRING([--with-bignum=gmp|no|auto],
- [Specify Bignum Implementation. Default is auto])],[req_bignum=$withval], [req_bignum=auto])
-
- AC_ARG_WITH([scalar], [AS_HELP_STRING([--with-scalar=64bit|32bit|auto],
- [Specify scalar implementation. Default is auto])],[req_scalar=$withval], [req_scalar=auto])
-
-+AC_ARG_WITH([asm], [AS_HELP_STRING([--with-asm=x86_64|no|auto]
-+[Specify assembly optimizations to use. Default is auto])],[req_asm=$withval], [req_asm=auto])
-+
- AC_CHECK_TYPES([__int128])
-
- AC_MSG_CHECKING([for __builtin_expect])
-@@ -113,40 +116,66 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[void myfunc() {__builtin_expect(0,0);}]])],
- [ AC_MSG_RESULT([no])
- ])
-
--if test x"$req_field" = x"auto"; then
-+if test x"$req_asm" = x"auto"; then
- SECP_64BIT_ASM_CHECK
- if test x"$has_64bit_asm" = x"yes"; then
-- set_field=64bit_asm
-+ set_asm=x86_64
-+ fi
-+ if test x"$set_asm" = x; then
-+ set_asm=no
- fi
-+else
-+ set_asm=$req_asm
-+ case $set_asm in
-+ x86_64)
-+ SECP_64BIT_ASM_CHECK
-+ if test x"$has_64bit_asm" != x"yes"; then
-+ AC_MSG_ERROR([x86_64 assembly optimization requested but not available])
-+ fi
-+ ;;
-+ no)
-+ ;;
-+ *)
-+ AC_MSG_ERROR([invalid assembly optimization selection])
-+ ;;
-+ esac
-+fi
-
-+if test x"$req_field" = x"auto"; then
-+ if test x"set_asm" = x"x86_64"; then
-+ set_field=64bit
-+ fi
- if test x"$set_field" = x; then
- SECP_INT128_CHECK
- if test x"$has_int128" = x"yes"; then
- set_field=64bit
- fi
- fi
--
- if test x"$set_field" = x; then
- SECP_GMP_CHECK
- if test x"$has_gmp" = x"yes"; then
- set_field=gmp
- fi
- fi
--
- if test x"$set_field" = x; then
- set_field=32bit
- fi
- else
- set_field=$req_field
- case $set_field in
-- 64bit_asm)
-- SECP_64BIT_ASM_CHECK
-- ;;
- 64bit)
-- SECP_INT128_CHECK
-+ if test x"$set_asm" != x"x86_64"; then
-+ SECP_INT128_CHECK
-+ if test x"$has_int128" != x"yes"; then
-+ AC_MSG_ERROR([64bit field explicitly requested but neither __int128 support or x86_64 assembly available])
-+ fi
-+ fi
- ;;
- gmp)
- SECP_GMP_CHECK
-+ if test x"$has_gmp" != x"yes"; then
-+ AC_MSG_ERROR([gmp field explicitly requested but libgmp not available])
-+ fi
- ;;
- 32bit)
- ;;
-@@ -157,11 +186,9 @@ else
- fi
-
- if test x"$req_scalar" = x"auto"; then
-- if test x"$set_scalar" = x; then
-- SECP_INT128_CHECK
-- if test x"$has_int128" = x"yes"; then
-- set_scalar=64bit
-- fi
-+ SECP_INT128_CHECK
-+ if test x"$has_int128" = x"yes"; then
-+ set_scalar=64bit
- fi
- if test x"$set_scalar" = x; then
- set_scalar=32bit
-@@ -171,6 +198,9 @@ else
- case $set_scalar in
- 64bit)
- SECP_INT128_CHECK
-+ if test x"$has_int128" != x"yes"; then
-+ AC_MSG_ERROR([64bit scalar explicitly requested but __int128 support not available])
-+ fi
- ;;
- 32bit)
- ;;
-@@ -187,15 +217,18 @@ if test x"$req_bignum" = x"auto"; then
- fi
-
- if test x"$set_bignum" = x; then
-- set_bignum=none
-+ set_bignum=no
- fi
- else
- set_bignum=$req_bignum
- case $set_bignum in
- gmp)
- SECP_GMP_CHECK
-+ if test x"$has_gmp" != x"yes"; then
-+ AC_MSG_ERROR([gmp bignum explicitly requested but libgmp not available])
-+ fi
- ;;
-- none)
-+ no)
- ;;
- *)
- AC_MSG_ERROR([invalid bignum implementation selection])
-@@ -203,14 +236,21 @@ else
- esac
- fi
-
-+# select assembly optimization
-+case $set_asm in
-+x86_64)
-+ AC_DEFINE(USE_ASM_X86_64, 1, [Define this symbol to enable x86_64 assembly optimizations])
-+ ;;
-+no)
-+ ;;
-+*)
-+ AC_MSG_ERROR([invalid assembly optimizations])
-+ ;;
-+esac
-+
- # select field implementation
- case $set_field in
--64bit_asm)
-- AC_DEFINE(USE_FIELD_5X52_ASM, 1, [Define this symbol to use the assembly version for the 5x52 field implementation])
-- AC_DEFINE(USE_FIELD_5X52, 1, [Define this symbol to use the FIELD_5X52 implementation])
-- ;;
- 64bit)
-- AC_DEFINE(USE_FIELD_5X52_INT128, 1, [Define this symbol to use the __int128 version for the 5x52 field implementation])
- AC_DEFINE(USE_FIELD_5X52, 1, [Define this symbol to use the FIELD_5X52 implementation])
- ;;
- gmp)
-@@ -233,7 +273,7 @@ gmp)
- AC_DEFINE(USE_FIELD_INV_NUM, 1, [Define this symbol to use the num-based field inverse implementation])
- AC_DEFINE(USE_SCALAR_INV_NUM, 1, [Define this symbol to use the num-based scalar inverse implementation])
- ;;
--none)
-+no)
- AC_DEFINE(USE_NUM_NONE, 1, [Define this symbol to use no num implementation])
- AC_DEFINE(USE_FIELD_INV_BUILTIN, 1, [Define this symbol to use the native field inverse implementation])
- AC_DEFINE(USE_SCALAR_INV_BUILTIN, 1, [Define this symbol to use the native scalar inverse implementation])
-@@ -258,7 +298,7 @@ esac
-
- if test x"$use_tests" = x"yes"; then
- SECP_OPENSSL_CHECK
-- if test x"$has_openssl_ec" == x"yes"; then
-+ if test x"$has_openssl_ec" = x"yes"; then
- AC_DEFINE(ENABLE_OPENSSL_TESTS, 1, [Define this symbol if OpenSSL EC functions are available])
- SECP_TEST_INCLUDES="$SSL_CFLAGS $CRYPTO_CFLAGS"
- SECP_TEST_LIBS="$CRYPTO_LIBS"
-@@ -281,9 +321,11 @@ if test x"$use_endomorphism" = x"yes"; then
- AC_DEFINE(USE_ENDOMORPHISM, 1, [Define this symbol to use endomorphism optimization])
- fi
-
-+AC_MSG_NOTICE([Using assembly optimizations: $set_asm])
- AC_MSG_NOTICE([Using field implementation: $set_field])
- AC_MSG_NOTICE([Using bignum implementation: $set_bignum])
- AC_MSG_NOTICE([Using scalar implementation: $set_scalar])
-+AC_MSG_NOTICE([Using endomorphism optimizations: $use_endomorphism])
-
- AC_CONFIG_HEADERS([src/libsecp256k1-config.h])
- AC_CONFIG_FILES([Makefile libsecp256k1.pc])
-@@ -291,7 +333,6 @@ AC_SUBST(SECP_INCLUDES)
- AC_SUBST(SECP_LIBS)
- AC_SUBST(SECP_TEST_LIBS)
- AC_SUBST(SECP_TEST_INCLUDES)
--AM_CONDITIONAL([USE_ASM], [test x"$set_field" == x"64bit_asm"])
- AM_CONDITIONAL([USE_TESTS], [test x"$use_tests" != x"no"])
- AM_CONDITIONAL([USE_BENCHMARK], [test x"$use_benchmark" != x"no"])
-
-diff --git a/src/field_5x52_impl.h b/src/field_5x52_impl.h
-index 63176d6..a045db3 100644
---- a/src/field_5x52_impl.h
-+++ b/src/field_5x52_impl.h
-@@ -16,12 +16,10 @@
- #include "num.h"
- #include "field.h"
-
--#if defined(USE_FIELD_5X52_ASM)
-+#if defined(USE_ASM_X86_64)
- #include "field_5x52_asm_impl.h"
--#elif defined(USE_FIELD_5X52_INT128)
--#include "field_5x52_int128_impl.h"
- #else
--#error "Please select field_5x52 implementation"
-+#include "field_5x52_int128_impl.h"
- #endif
-
- /** Implements arithmetic modulo FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE FFFFFC2F,
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
deleted file mode 100644
index b9f5da8..00000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20141212.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
-COMMITHASH="2a53a472f24acd9ff10878b5bf21b5b27ab8060a"
-SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="+asm doc endomorphism gmp test"
-
-REQUIRED_USE="
- asm? ( amd64 )
-"
-RDEPEND="
- gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/gcc-4.7
- test? ( dev-libs/openssl:0 )
-"
-
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-src_prepare() {
- epatch "${FILESDIR}/20141212-fixes.patch"
- eautoreconf
-}
-
-src_configure() {
- local field
- if use gmp && ! use asm; then
- field=gmp
- elif use amd64; then
- field=64bit
- else
- field=32bit
- fi
-
- econf \
- --disable-benchmark \
- $(use_enable test tests) \
- $(use_enable endomorphism) \
- --with-asm=$(usex asm auto no) \
- --with-bignum=$(usex gmp gmp no) \
- --with-field=${field} \
- --disable-static
-}
-
-src_compile() {
- emake
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- if use doc; then
- dodoc README.md
- fi
-
- emake DESTDIR="${D}" install
- prune_libtool_files
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild
deleted file mode 100644
index ac42c2b..00000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20150423.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
-COMMITHASH="22f60a62801a8a49ecd049e7a563f69a41affd8d"
-SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm doc endomorphism gmp libressl test"
-
-REQUIRED_USE="
- asm? ( amd64 )
-"
-RDEPEND="
- gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-benchmark \
- $(use_enable test tests) \
- $(use_enable endomorphism) \
- --with-asm=$(usex asm auto no) \
- --with-bignum=$(usex gmp gmp no) \
- --disable-static
-}
-
-src_install() {
- if use doc; then
- dodoc README.md
- fi
-
- emake DESTDIR="${D}" install
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-01 11:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-01 11:51 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libsecp256k1/, dev-libs/libsecp256k1/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-07 7:41 Sam James
2017-01-24 1:17 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox