Accepting request 628329 from science:HPC
OBS-URL: https://build.opensuse.org/request/show/628329 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/infinipath-psm?expand=0&rev=14
This commit is contained in:
commit
11911f7fc6
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 2 09:21:12 UTC 2018 - schwab@suse.de
|
||||
|
||||
- sysmacros.patch: Include <sys/sysmacros.h> for minor
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 14 04:58:35 UTC 2018 - bwiedemann@suse.com
|
||||
|
||||
- Add reproducible.patch to fix build date (boo#1047218)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 14 08:29:56 UTC 2018 - nmoreychaisemartin@suse.com
|
||||
|
||||
|
@ -22,7 +22,7 @@ Name: infinipath-psm
|
||||
Version: 3.3
|
||||
Release: 0
|
||||
Summary: QLogic PSM Libraries
|
||||
License: BSD-2-Clause or GPL-2.0
|
||||
License: BSD-2-Clause OR GPL-2.0-only
|
||||
Group: Productivity/Networking/System
|
||||
Url: http://www.qlogic.com/
|
||||
Source0: %{name}-%{version}%{git_ver}.tar.gz
|
||||
@ -33,6 +33,10 @@ Patch0: infinipath-psm-cflags.patch
|
||||
Patch1: infinipath-psm-no_werror.patch
|
||||
# PATCH-FIX-UPSTREAM infinipath-psm-executable_headers.patch pth@suse.de
|
||||
Patch3: infinipath-psm-executable_headers.patch
|
||||
# PATCH-FIX-UPSTREAM bmwiedemann https://github.com/intel/psm/pull/16 boo#1047218
|
||||
Patch4: reproducible.patch
|
||||
# PATCH-FIX-UPSTREAM Include <sys/sysmacros.h> for minor
|
||||
Patch5: sysmacros.patch
|
||||
BuildRequires: libuuid-devel
|
||||
Conflicts: infinipath-libs
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
@ -97,6 +101,8 @@ interfaces in parallel environments.
|
||||
%patch0
|
||||
%patch1
|
||||
%patch3
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
export RPM_OPT_FLAGS="%{optflags} -Wno-unused-but-set-variable"
|
||||
|
28
reproducible.patch
Normal file
28
reproducible.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 47497ea8597baaa65d7781468d4db09abb8ebd53 Mon Sep 17 00:00:00 2001
|
||||
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
|
||||
Date: Sun, 23 Jul 2017 07:02:28 +0200
|
||||
Subject: [PATCH] Allow to override build date
|
||||
|
||||
in order to make builds reproducible.
|
||||
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.
|
||||
|
||||
Also uses UTC to be independent of timezone settings.
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d79c4bd..99406ef 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -270,7 +270,7 @@ ${TARGLIB}.so.${MAJOR}: ${TARGLIB}.so.${MAJOR}.${MINOR}
|
||||
# file around. Generate it such that the ident command can find it
|
||||
# and strings -a | grep InfiniPath does a reasonable job as well.
|
||||
${TARGLIB}.so.${MAJOR}.${MINOR}: ${${TARGLIB}-objs}
|
||||
- date +'char psmi_infinipath_revision[] ="$$""Date: %F %R ${rpm_extra_description}InfiniPath $$";' > ${lib_build_dir}/_revision.c
|
||||
+ date -u -d@$${SOURCE_DATE_EPOCH:-$$(date +%s)} +'char psmi_infinipath_revision[] ="$$""Date: %F %R ${rpm_extra_description}InfiniPath $$";' > ${lib_build_dir}/_revision.c
|
||||
$(CC) -c $(BASECFLAGS) $(INCLUDES) _revision.c -o _revision.o
|
||||
$(CC) $(LDFLAGS) -o $@ -Wl,-soname=${TARGLIB}.so.${MAJOR} -shared -Wl,--unique='*fastpath*' \
|
||||
${${TARGLIB}-objs} _revision.o -L$(build_dir)/ipath $(LDLIBS)
|
12
sysmacros.patch
Normal file
12
sysmacros.patch
Normal file
@ -0,0 +1,12 @@
|
||||
Index: infinipath-psm-3.3.26.604758e/ipath/ipath_proto.c
|
||||
===================================================================
|
||||
--- infinipath-psm-3.3.26.604758e.orig/ipath/ipath_proto.c
|
||||
+++ infinipath-psm-3.3.26.604758e/ipath/ipath_proto.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <sys/poll.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
Loading…
Reference in New Issue
Block a user