* [gentoo-commits] repo/gentoo:master commit in: dev-perl/CryptX/, dev-perl/CryptX/files/
@ 2023-12-29 23:32 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-12-29 23:32 UTC (permalink / raw
To: gentoo-commits
commit: 3b34816f06a5f8ef0ac2151fea06c99411d67bfa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 23:31:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 23:31:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b34816f
dev-perl/CryptX: fix build w/ sse4.1 but w/o aesni
Closes: https://bugs.gentoo.org/916387
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-perl/CryptX/CryptX-0.80.0-r1.ebuild | 52 +++++++++++++++++++++++++
dev-perl/CryptX/files/CryptX-0.80.0-aesni.patch | 38 ++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/dev-perl/CryptX/CryptX-0.80.0-r1.ebuild b/dev-perl/CryptX/CryptX-0.80.0-r1.ebuild
new file mode 100644
index 000000000000..4e532364d203
--- /dev/null
+++ b/dev-perl/CryptX/CryptX-0.80.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: unbundle libtommath, libtomcrypt. There's experimental support upstream.
+# bug #732634
+
+DIST_AUTHOR=MIK
+DIST_VERSION=0.080
+inherit perl-module
+
+DESCRIPTION="Self-contained crypto toolkit"
+
+LICENSE="|| ( Artistic GPL-1+ ) public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="minimal"
+
+RDEPEND="
+ virtual/perl-Math-BigInt
+ !minimal? (
+ dev-perl/JSON
+ )
+"
+BDEPEND="
+ ${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.880.0
+ !minimal? (
+ >=virtual/perl-Math-BigInt-1.999.715
+ >=virtual/perl-Storable-2.0.0
+ )
+ )
+"
+
+PERL_RM_FILES=(
+ t/002_all_pm.t
+ t/003_all_pm_pod.t
+ t/004_all_pm_pod_spelling.t
+ t/005_all_pm_pod_coverage.t
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.80.0-respect-flags.patch
+ "${FILESDIR}"/${PN}-0.80.0-aesni.patch
+)
+
+#src_configure() {
+# CRYPTX_LDFLAGS='-ltommath -ltomcrypt' perl-module_src_configure
+#}
diff --git a/dev-perl/CryptX/files/CryptX-0.80.0-aesni.patch b/dev-perl/CryptX/files/CryptX-0.80.0-aesni.patch
new file mode 100644
index 000000000000..3a6f34c7e885
--- /dev/null
+++ b/dev-perl/CryptX/files/CryptX-0.80.0-aesni.patch
@@ -0,0 +1,38 @@
+https://github.com/DCIT/perl-CryptX/pull/99
+https://bugs.gentoo.org/916387
+--- a/src/ltc/headers/tomcrypt_cfg.h
++++ b/src/ltc/headers/tomcrypt_cfg.h
+@@ -96,6 +96,9 @@ LTC_EXPORT int LTC_CALL XSTRCMP(const char *s1, const char *s2);
+ #define LTC_AMD64_SSE4_1
+ #endif
+ #endif
++ #if defined(__AES__)
++ #define LTC_AMD64_AES_NI
++ #endif
+ #endif
+
+ /* detect PPC32 */
+--- a/src/ltc/headers/tomcrypt_private.h
++++ b/src/ltc/headers/tomcrypt_private.h
+@@ -77,7 +77,7 @@ typedef struct
+
+ /* tomcrypt_cipher.h */
+
+-#if defined(LTC_AES_NI) && defined(LTC_AMD64_SSE4_1)
++#if defined(LTC_AES_NI) && defined(LTC_AMD64_AES_NI)
+ #define LTC_HAS_AES_NI
+ #endif
+
+--- a/src/ltc/misc/crypt/crypt.c
++++ b/src/ltc/misc/crypt/crypt.c
+@@ -416,7 +416,7 @@ const char *crypt_build_settings =
+ #if defined(LTC_ADLER32)
+ " ADLER32 "
+ #endif
+-#if defined(LTC_AES_NI) && defined(LTC_AMD64_SSE4_1)
++#if defined(LTC_AES_NI) && defined(LTC_AMD64_AES_NI)
+ " AES-NI "
+ #endif
+ #if defined(LTC_BASE64)
+
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/CryptX/, dev-perl/CryptX/files/
@ 2025-02-09 6:34 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-02-09 6:34 UTC (permalink / raw
To: gentoo-commits
commit: 9a9811ccb4438c51c9c721f64700f4678322f7ab
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 06:28:29 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 06:28:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9811cc
dev-perl/CryptX: add 0.85.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-perl/CryptX/CryptX-0.85.0.ebuild | 51 ++++++++++++++++++++++
dev-perl/CryptX/Manifest | 1 +
.../CryptX/files/CryptX-0.85.0-respect-flags.patch | 23 ++++++++++
3 files changed, 75 insertions(+)
diff --git a/dev-perl/CryptX/CryptX-0.85.0.ebuild b/dev-perl/CryptX/CryptX-0.85.0.ebuild
new file mode 100644
index 000000000000..01b79501f057
--- /dev/null
+++ b/dev-perl/CryptX/CryptX-0.85.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: unbundle libtommath, libtomcrypt. There's experimental support upstream.
+# bug #732634
+
+DIST_AUTHOR=MIK
+DIST_VERSION=0.085
+inherit perl-module
+
+DESCRIPTION="Self-contained crypto toolkit"
+
+LICENSE="|| ( Artistic GPL-1+ ) public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="minimal"
+
+RDEPEND="
+ virtual/perl-Math-BigInt
+ !minimal? (
+ dev-perl/JSON
+ )
+"
+BDEPEND="
+ ${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.880.0
+ !minimal? (
+ >=virtual/perl-Math-BigInt-1.999.715
+ >=virtual/perl-Storable-2.0.0
+ )
+ )
+"
+
+PERL_RM_FILES=(
+ t/002_all_pm.t
+ t/003_all_pm_pod.t
+ t/004_all_pm_pod_spelling.t
+ t/005_all_pm_pod_coverage.t
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.85.0-respect-flags.patch
+)
+
+#src_configure() {
+# CRYPTX_LDFLAGS='-ltommath -ltomcrypt' perl-module_src_configure
+#}
diff --git a/dev-perl/CryptX/Manifest b/dev-perl/CryptX/Manifest
index 353647ecc541..1aea6be4cee8 100644
--- a/dev-perl/CryptX/Manifest
+++ b/dev-perl/CryptX/Manifest
@@ -1 +1,2 @@
DIST CryptX-0.084.tar.gz 1786781 BLAKE2B 25df25f6ba67f34193dccd15051c6ceb9b71ab9a42735f6560bccdaf10918ed9217a7f7d4ca73b617981c385a18e961b27bdd8f6acf82c15cb246e8e3deba8b2 SHA512 c67c5b0aca1899155c37c3dbdb92249d1bc3e1781478a0aec3b3d4e01c70efd806bc325dc991462f9064ba0f18ec7c56c6d8383f068277ae1fc684cad88d4bd9
+DIST CryptX-0.085.tar.gz 1786764 BLAKE2B c29f3092e65f6c48d44989b108c799a53c8636eafe26a926e2931de460b049adaad2c104700008f8ddaf763bb69202dd4f9e4b15ad4db4249912db96a1179da3 SHA512 620eb8d9a8a1e9fbd2d877491d34667fbafb7d29a4de0bc1b95e9eddef22b4b6fa749a1f8f86ff25088bc8d4d3efdeea0a462b0a32b03e63c343392884b79cd9
diff --git a/dev-perl/CryptX/files/CryptX-0.85.0-respect-flags.patch b/dev-perl/CryptX/files/CryptX-0.85.0-respect-flags.patch
new file mode 100644
index 000000000000..9628aaedf756
--- /dev/null
+++ b/dev-perl/CryptX/files/CryptX-0.85.0-respect-flags.patch
@@ -0,0 +1,23 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -27,20 +27,6 @@ else {
+ );
+ $mycflags = " $Config{ccflags} $Config{cccdlflags} $Config{optimize} "; # keep leading + trailing spaces
+
+- my $try_aes_ni = 0;
+- $try_aes_ni = 1 if $Config{archname} =~ /x86_64/; # x86_64-cygwin-threads-multi / x86_64-linux-thread-multi
+- $try_aes_ni = 1 if $Config{archname} =~ /MSWin32-x64/; # MSWin32-x64-multi-thread
+- $try_aes_ni = 1 if $Config{archname} =~ /amd64/; # OpenBSD.amd64-openbsd-thread-multi / amd64-freebsd
+- $try_aes_ni = 1 if $Config{archname} =~ /darwin/ && qx(uname -m) =~ /x86_64/; # darwin-thread-multi-2level / darwin-2level
+- $try_aes_ni = 1 if $Config{archname} =~ /i86pc-solaris(-.+)?-64/; # i86pc-solaris-thread-multi-64 / i86pc-solaris-64
+- if ($try_aes_ni && $Config{gccversion}) {
+- my $ver1;
+- $ver1 ||= $1 if $Config{gccversion} =~ /^([0-9]+)\./; # gccversion='10.2.0'
+- $ver1 ||= $1 if $Config{gccversion} =~ /LLVM ([0-9]+)\./i; # gccversion='Apple LLVM 14.0.0 (clang-1400.0.29.202)'
+- $ver1 ||= $1 if $Config{gccversion} =~ /Clang ([0-9]+)\./i; # gccversion='FreeBSD Clang 13.0.0 (git@github.com:llvm/llvm-project.git llvmorg-13.0.0-0-gd7b669b3a303)' or 'OpenBSD Clang 13.0.0'
+- $mycflags .= " -DLTC_AES_NI" if $ver1 > 4; # target attributes are supported since gcc-4.9
+- }
+-
+ #FIX: this is particularly useful for Debian https://github.com/DCIT/perl-CryptX/pull/39
+ $mycflags .= " $ENV{CFLAGS} " if $ENV{CFLAGS};
+ $mycflags .= " $ENV{CPPFLAGS} " if $ENV{CPPFLAGS};
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-09 6:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-09 6:34 [gentoo-commits] repo/gentoo:master commit in: dev-perl/CryptX/, dev-perl/CryptX/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-29 23:32 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox