Jelle van der Waa pushed to branch main at Arch Linux / Packaging / Packages /
glob2
Commits:
27465eac by Jelle van der Waa at 2024-11-13T22:00:35+01:00
Make glob2 reproducible
Allow scons to pass SOURCE_DATE_EPOCH so the build date becomes
reproducible
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + SConstruct-explicit-add-S_D_E.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -27,6 +27,7 @@ pkgbase = glob2
source = glob2-scons3.patch
source = glob2-bool.patch
source = scons-python3.patch
+ source = SConstruct-explicit-add-S_D_E.patch
sha256sums =
0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8
sha256sums =
3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a
sha256sums =
2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba
@@ -34,5 +35,6 @@ pkgbase = glob2
sha256sums =
4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc
sha256sums =
81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591
sha256sums =
6daec0ee916f6bbc4e9696a0a713e2b06e4951381d508af814e67e980bd28664
+ sha256sums =
3618e2b02de62657e3b0af60db6887ebfb8d6d8d99d6a9038422d0fc333b0dc2
pkgname = glob2
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgname=glob2
pkgver=0.9.4.4
-pkgrel=49
+pkgrel=50
pkgdesc='An innovative Real-Time Strategy game which reduces micro-management
by automatically assigning tasks to units'
arch=('x86_64')
url='https://www.globulation2.org/'
@@ -18,14 +18,16 @@
source=(https://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver
glob2-gcc6.patch
glob2-scons3.patch
glob2-bool.patch
- scons-python3.patch)
+ scons-python3.patch
+ SConstruct-explicit-add-S_D_E.patch)
sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
'3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
'2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba'
'a371eb801407a75021c1a0105ffa1e713358d7def3eba8a9bd861f528e051d9b'
'4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc'
'81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591'
- '6daec0ee916f6bbc4e9696a0a713e2b06e4951381d508af814e67e980bd28664')
+ '6daec0ee916f6bbc4e9696a0a713e2b06e4951381d508af814e67e980bd28664'
+ '3618e2b02de62657e3b0af60db6887ebfb8d6d8d99d6a9038422d0fc333b0dc2')
prepare() {
cd "$pkgname-$pkgver"
@@ -36,6 +38,7 @@ prepare() {
patch -p1 -i "$srcdir/glob2-scons3.patch"
patch -p1 -i "$srcdir/glob2-bool.patch"
patch -p1 -i ../scons-python3.patch
+ patch -p1 -i "$srcdir/SConstruct-explicit-add-S_D_E.patch"
}
build() {
=====================================
SConstruct-explicit-add-S_D_E.patch
=====================================
@@ -0,0 +1,27 @@
+From c0f9d36907677eeef270fab53ea0ce24db8b0a2e Mon Sep 17 00:00:00 2001
+From: Vagrant Cascadian <[email protected]>
+Date: Mon, 2 May 2022 03:15:19 +0000
+Subject: [PATCH] SConstruct: Explicitly add SOURCE_DATE_EPOCH to the
+ environment.
+
+https://tests.reproducible-builds.org/debian/issues/scons_doesnt_pass_environment_to_build_tools_issue.html
+---
+ SConstruct | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 37d03bb..1d17a80 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -241,6 +241,8 @@ def main():
+ except AttributeError:
+ env.Clone = env.Copy
+
++ env.Append(ENV={'SOURCE_DATE_EPOCH': os.environ['SOURCE_DATE_EPOCH']})
++
+ if not env['CC']:
+ print("No compiler found in PATH. Please install gcc or another
compiler.")
+ Exit(1)
+--
+2.36.0
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/glob2/-/commit/27465eac4ac455a160948afe06560fee5d8a3faf
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/glob2/-/commit/27465eac4ac455a160948afe06560fee5d8a3faf
You're receiving this email because of your account on gitlab.archlinux.org.
