From bf4c0fe3c71fb8a7a02cb41996031761bb6c5997695105dd49714982ac2b25c8 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Mon, 16 Jul 2018 05:26:55 +0000 Subject: [PATCH] Accepting request 622857 from home:bmwiedemann:branches:science:HPC Add reproducible.patch to fix build time (boo#1047218) OBS-URL: https://build.opensuse.org/request/show/622857 OBS-URL: https://build.opensuse.org/package/show/science:HPC/dapl?expand=0&rev=22 --- dapl.changes | 5 +++++ dapl.spec | 3 +++ reproducible.patch | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 reproducible.patch diff --git a/dapl.changes b/dapl.changes index 14e7c61..ba6a546 100644 --- a/dapl.changes +++ b/dapl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jul 14 20:21:56 UTC 2018 - bwiedemann@suse.com + +- Add reproducible.patch to fix build time (boo#1047218) + ------------------------------------------------------------------- Tue May 29 06:04:37 UTC 2018 - nmoreychaisemartin@suse.com diff --git a/dapl.spec b/dapl.spec index 6dcd039..f9d5527 100644 --- a/dapl.spec +++ b/dapl.spec @@ -33,6 +33,8 @@ Patch7: dapl-fsf_address.patch Patch12: dapl-s390.patch Patch13: dapl-add-arm-platform-support.patch Patch14: ucm-mcm-fix-backlog-parameter-for-socket.patch +# PATCH-FIX-UPSTREAM http://git.openfabrics.org/?p=~ardavis/dapl.git;a=commitdiff;h=f1e05b7adcee629ee7c1d4d86ea55344d9309232 +Patch15: reproducible.patch Url: http://www.openfabrics.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -132,6 +134,7 @@ Test suite to validate the uDAPL library APIs. %patch12 %patch13 %patch14 +%patch15 -p1 %build %if %suse_version == 1110 diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..51db6f2 --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,32 @@ +merged upstream http://git.openfabrics.org/?p=~ardavis/dapl.git;a=commitdiff;h=f1e05b7adcee629ee7c1d4d86ea55344d9309232 +with a insignificant diff + +commit a25b1d9042ca3ae485f0d16c47e7a29bdbb35ec0 +Author: Bernhard M. Wiedemann +Date: Fri Jul 14 17:53:30 2017 +0200 + + Allow to override build date + + in order to allow for reproducible builds. + See https://reproducible-builds.org/ for why this is good + and https://reproducible-builds.org/specs/source-date-epoch/ + for the definition of this variable. + + Note: This variant works with GNU date, if BSD date support is important, + a more complex patch can be done + + Signed-off-by: Bernhard M. Wiedemann + +diff --git a/Makefile.am b/Makefile.am +index 483ba90..91def97 100755 +--- a/Makefile.am ++++ b/Makefile.am +@@ -48,7 +48,7 @@ AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DDAT_CONF="\"$(sysconfdir)/dat.conf\"" + endif + + AM_CFLAGS += -DMPXYD_CONF="\"$(sysconfdir)/mpxyd.conf\"" +-AM_CFLAGS += -DPACKAGE_DATE=$$(date +'%Y%m%d') ++AM_CFLAGS += -DPACKAGE_DATE=$$(date -u -d@$${SOURCE_DATE_EPOCH:-$$(date +%s)} +'%Y%m%d') + + sysconf_DATA = doc/dat.conf +