[arch-commits] Commit in crypto++/trunk (PKGBUILD fix-simon-speck-simd-build.patch)

[Baptiste Jonglez]

    Date: Saturday, January 27, 2018 @ 19:00:55
  Author: zorun
Revision: 287515

crypto++: simpler build procedure

Modified:
  crypto++/trunk/PKGBUILD
Deleted:
  crypto++/trunk/fix-simon-speck-simd-build.patch

----------------------------------+
 PKGBUILD                         |   29 +++---------------
 fix-simon-speck-simd-build.patch |   59 -------------------------------------
 2 files changed, 6 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-27 18:50:31 UTC (rev 287514)
+++ PKGBUILD	2018-01-27 19:00:55 UTC (rev 287515)
@@ -8,7 +8,7 @@
 pkgname=crypto++
 pkgver=6.0.0
 _srcver=${pkgver//./}
-pkgrel=1
+pkgrel=2
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('x86_64')
 url="https://www.cryptopp.com/"
@@ -18,35 +18,17 @@
 # Fix https://bugs.archlinux.org/task/56689
 install="crypto++.install"
 source=("https://www.cryptopp.com/cryptopp${_srcver}.zip"
-        "fix-simon-speck-simd-build.patch"
         'libcrypto++.pc')
 # Checksums from https://www.cryptopp.com/release600.html
 sha1sums=('290dfc1948b860b29da40f8c5559f6559ce787db'
-          'a4be3000116568260a8fe3169b948deca5576fdf'
           '7a6c6fc7aed96ff7be554eee60450a1914b0cd95')
 sha256sums=('64ac2db96b3f1b7a23675e2be95d16c96055edffa2d5e2de6245fdb6baa92dda'
-            '80d43fe472f2ccffa56097eda5e56820d0944c1d585a68d944049a1d00d395c3'
             '14228b0d1a6f07572090ab17b60bf9829308d174e763eb31966f723b0cb51134')
 sha512sums=('7a60c28be1fc9418adeabe8c66d868b46e65fb3d77d308b9431b16905cde7faa670180619150e849ae44d70f44aa8501a0a0c4354ec84f194fd8138d14aca9bf'
-            '80378bb6b19427fa316892126a3b533a98831405215df6f8c0b251e319b05c625a5d437f7217641ca8e41e5be153a796204686c4844338befdfc42e43a8ece6e'
             'bba4ff9c01e353f0336e01836fd1418a08f43ab9215f678cc80cc94954d689e94e1425c7ed95f9b12d210bfc73574c98d0579b1356232c50f32f342395408ac2')
 
-prepare() {
-  patch -p1 < "$srcdir"/fix-simon-speck-simd-build.patch
-}
-
 build() {
-  make -f GNUmakefile-cross dynamic cryptest.exe \
-    CXXFLAGS+=" -DNDEBUG -fPIC" HAS_SOLIB_VERSION=1 \
-    ARIA_FLAG="-mssse3" \
-    SIMON_FLAG="-mssse3 -msse4.1" \
-    SPECK_FLAG="-mssse3 -msse4.1" \
-    SSSE3_FLAG="-mssse3" \
-    BLAKE2_FLAG="-msse4.2" \
-    CRC_FLAG="-msse4.2" \
-    GCM_FLAG="-mssse3 -mpclmul" \
-    AES_FLAG="-msse4.1 -maes" \
-    SHA_FLAG="-msse4.2 -msha"
+  CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
 }
 
 check() {
@@ -54,14 +36,15 @@
 }
 
 package() {
-  make -f GNUmakefile-cross install DESTDIR="$pkgdir" PREFIX="/usr" HAS_SOLIB_VERSION=1
+  make install DESTDIR="$pkgdir" PREFIX="/usr"
   # Install pkgconfig file
   install -d "${pkgdir}/usr/lib/pkgconfig"
   install -m644 "${srcdir}/libcrypto++.pc" "${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
-  # Remove crypttest.exe: it's only needed for check(), and does not even work when
-  # installed in /usr/bin (it needs additional files)
+  # Remove cryptest.exe and test files, only needed for check() and bloats the package
+  # because cryptest.exe is linked statically.
   rm "${pkgdir}/usr/bin/cryptest.exe"
   rmdir "${pkgdir}/usr/bin/"
+  rm -r "${pkgdir}/usr/share/cryptopp/"
   # Install license
   install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: fix-simon-speck-simd-build.patch
===================================================================
--- fix-simon-speck-simd-build.patch	2018-01-27 18:50:31 UTC (rev 287514)
+++ fix-simon-speck-simd-build.patch	2018-01-27 19:00:55 UTC (rev 287515)
@@ -1,59 +0,0 @@
-diff --git a/GNUmakefile-cross b/GNUmakefile-cross
-index 7ab6ccfe..98d10a9a 100755
---- a/GNUmakefile-cross
-+++ b/GNUmakefile-cross
-@@ -220,12 +220,16 @@ ifeq ($(IS_NEON),1)
-     GCM_FLAG += -mfpu=neon
-     ARIA_FLAG += -mfpu=neon
-     BLAKE2_FLAG += -mfpu=neon
-+    SIMON_FLAG += -mfpu=neon
-+    SPECK_FLAG += -mfpu=neon
-     ifeq ($(IS_ANDROID),1)
-       ifeq ($(findstring -mfloat-abi=softfp,$(CXXFLAGS)),)
-         NEON_FLAG += -mfloat-abi=softfp
-         GCM_FLAG += -mfloat-abi=softfp
-         ARIA_FLAG += -mfloat-abi=softfp
-         BLAKE2_FLAG += -mfloat-abi=softfp
-+        SIMON_FLAG += -mfloat-abi=softfp
-+        SPECK_FLAG += -mfloat-abi=softfp
-       endif
-     endif
-   endif
-@@ -238,6 +242,8 @@ ifneq ($(IS_ARMv8),0)
-     ARIA_FLAG = -march=armv8-a
-     BLAKE2_FLAG = -march=armv8-a
-     NEON_FLAG = -march=armv8-a
-+    SIMON_FLAG = -march=armv8-a
-+    SPECK_FLAG = -march=armv8-a
-   endif
-   HAVE_CRC := $(shell echo | $(CXX) -x c++ $(CXXFLAGS) -march=armv8-a+crc -dM -E - 2>/dev/null | $(EGREP) -i -c __ARM_FEATURE_CRC32)
-   ifeq ($(HAVE_CRC),1)
-@@ -257,6 +263,13 @@ ifneq ($(IS_i686)$(IS_x86_64),00)
-   ifeq ($(HAVE_SSSE3),1)
-     ARIA_FLAG = -mssse3
-     SSSE3_FLAG = -mssse3
-+    SIMON_FLAG = -mssse3
-+    SPECK_FLAG = -mssse3
-+  endif
-+  HAVE_SSE4 = $(shell echo | $(CXX) -x c++ $(CXXFLAGS) -msse4.1 -dM -E - 2>/dev/null | $(EGREP) -i -c __SSE4_1__)
-+  ifeq ($(HAVE_SSE4),1)
-+    SIMON_FLAG = -msse4.1
-+    SPECK_FLAG = -msse4.1
-   endif
-   HAVE_SSE4 = $(shell echo | $(CXX) -x c++ $(CXXFLAGS) -msse4.2 -dM -E - 2>/dev/null | $(EGREP) -i -c __SSE4_2__)
-   ifeq ($(HAVE_SSE4),1)
-@@ -480,6 +493,14 @@ sha-simd.o : sha-simd.cpp
- shacal2-simd.o : shacal2-simd.cpp
- 	$(CXX) $(strip $(CXXFLAGS) $(SHA_FLAG) -c) $<
- 
-+# SSSE3 or NEON available
-+simon-simd.o : simon-simd.cpp
-+	$(CXX) $(strip $(CXXFLAGS) $(SIMON_FLAG) -c) $<
-+
-+# SSSE3 or NEON available
-+speck-simd.o : speck-simd.cpp
-+	$(CXX) $(strip $(CXXFLAGS) $(SPECK_FLAG) -c) $<
-+
- %.o : %.cpp
- 	$(CXX) $(strip $(CXXFLAGS) -c) $<
-