]> git.ipfire.org Git - thirdparty/vectorscan.git/commitdiff
5.4.11-2 release debian
authorKonstantinos Margaritis <markos@freevec.org>
Sat, 20 Jan 2024 21:32:42 +0000 (23:32 +0200)
committerKonstantinos Margaritis <markos@freevec.org>
Sat, 20 Jan 2024 21:32:42 +0000 (23:32 +0200)
debian/changelog
debian/patches/default-to-power8.patch [new file with mode: 0644]
debian/patches/reproducible-builds.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]

index b68a4a9cad076a2ca95ca1068a9f657a37ec4fda..e75115e87871695cb48fd9795cc707b59d9df725 100644 (file)
@@ -1,3 +1,13 @@
+vectorscan (5.4.11-2) unstable; urgency=medium
+
+  * Make build reproducible: Closes: #1056649
+    Thanks to Chris Lamb <lamby@debian.org> for the patch
+  * Set ppc64le target arch to power8, as that's the port's default. Caused
+    a SIGILL on Debian's CI:
+    https://ci.debian.net/packages/v/vectorscan/testing/ppc64el/41889410/
+
+ -- Konstantinos Margaritis <markos@debian.org>  Sat, 20 Jan 2024 23:26:19 +0200
+
 vectorscan (5.4.11-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/default-to-power8.patch b/debian/patches/default-to-power8.patch
new file mode 100644 (file)
index 0000000..3cea7fd
--- /dev/null
@@ -0,0 +1,14 @@
+diff --git a/cmake/archdetect.cmake b/cmake/archdetect.cmake
+index 015140f..2126840 100644
+--- a/cmake/archdetect.cmake
++++ b/cmake/archdetect.cmake
+@@ -85,7 +85,7 @@ else()
+        set(GNUCC_ARCH armv7a)
+        set(TUNE_FLAG generic)
+     else()
+-       set(GNUCC_ARCH power9)
+-       set(TUNE_FLAG power9)
++       set(GNUCC_ARCH power8)
++       set(TUNE_FLAG power8)
+     endif()
+ endif()
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
new file mode 100644 (file)
index 0000000..b0fed5f
--- /dev/null
@@ -0,0 +1,15 @@
+Description: Make the build reproducible
+Author: Chris Lamb <lamby@debian.org>
+Last-Update: 2023-11-24
+
+--- vectorscan-5.4.11.orig/CMakeLists.txt
++++ vectorscan-5.4.11/CMakeLists.txt
+@@ -7,7 +7,7 @@ set (HS_MINOR_VERSION 4)
+ set (HS_PATCH_VERSION 11)
+ set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION})
+-string (TIMESTAMP BUILD_DATE "%Y-%m-%d")
++string (TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
+ message(STATUS "Build date: ${BUILD_DATE}")
+ # Dependencies check
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..ffc76c2
--- /dev/null
@@ -0,0 +1,2 @@
+reproducible-builds.patch
+default-to-power8.patch