Accepting request 719862 from home:michel_mno:branches:hardware

- for ppc64* remove in spec the lines about BUNDLE_LIBCXL
  to avoid build error.
- update rpmlintrc

OBS-URL: https://build.opensuse.org/request/show/719862
OBS-URL: https://build.opensuse.org/package/show/hardware/genwqe-tools?expand=0&rev=19
This commit is contained in:
Tomáš Chvátal 2019-07-31 09:25:59 +00:00 committed by Git OBS Bridge
parent ea78d82710
commit c9515819db
3 changed files with 13 additions and 12 deletions

View File

@ -1 +1,3 @@
addFilter(".*macro-in-comment.*") addFilter(".*macro-in-comment.*")
addFilter(".*devel-file-in-non-devel-package.*")
addFilter(".*static-library-without-debuginfo.*")

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 30 15:27:04 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
- for ppc64* remove in spec the lines about BUNDLE_LIBCXL
to avoid build error.
- update rpmlintrc
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 12 09:57:10 UTC 2018 - normand@linux.vnet.ibm.com Mon Feb 12 09:57:10 UTC 2018 - normand@linux.vnet.ibm.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package genwqe-tools # spec file for package genwqe-tools
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright 2015, International Business Machines # Copyright 2015, International Business Machines
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -29,6 +29,7 @@ BuildRequires: help2man
BuildRequires: zlib-devel >= 1.2.7 BuildRequires: zlib-devel >= 1.2.7
%ifarch ppc64le ppc64 %ifarch ppc64le ppc64
BuildRequires: kernel-devel >= 4.4.21-69 BuildRequires: kernel-devel >= 4.4.21-69
BuildRequires: libcxl-devel
%endif %endif
BuildRequires: fdupes BuildRequires: fdupes
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -69,18 +70,9 @@ developing applications that use %{name}.
%prep %prep
%autosetup -p1 -n genwqe-user-%{version} %autosetup -p1 -n genwqe-user-%{version}
%ifarch ppc64le ppc64
%define libcxl "BUNDLE_LIBCXL=1"
%endif
%build %build
%ifarch ppc64le ppc64
mkdir -p ext/libcxl/include/misc/
cp /usr/include/misc/cxl.h ext/libcxl/include/misc/
%endif
make %{?_smp_mflags} tools lib VERSION=%{version} \ make %{?_smp_mflags} tools lib VERSION=%{version} \
CONFIG_ZLIB_PATH=/%{_lib}/libz.so.1 %{?libcxl} CONFIG_ZLIB_PATH=/%{_lib}/libz.so.1
%install %install
make %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \ make %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \