Accepting request 943548 from home:dirkmueller:Factory

- fix pkgconfig pc file settings by passing in right prefix during build

OBS-URL: https://build.opensuse.org/request/show/943548
OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=72
This commit is contained in:
Martin Pluskal 2022-01-03 10:22:01 +00:00 committed by Git OBS Bridge
parent 4929028b0c
commit 716ab31830
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 3 09:18:49 UTC 2022 - Dirk Müller <dmueller@suse.com>
- fix pkgconfig pc file settings by passing in right prefix during build
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 27 14:59:02 UTC 2021 - Dirk Müller <dmueller@suse.com> Mon Dec 27 14:59:02 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package zstd # spec file for package zstd
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -91,7 +91,7 @@ Needed for compiling programs that link with the library.
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export CXXFLAGS="$CFLAGS -std=c++11" export CXXFLAGS="$CFLAGS -std=c++11"
# lib-mt is alias for multi-threaded library support # lib-mt is alias for multi-threaded library support
%make_build -C lib lib-mt %make_build prefix=%{_prefix} libdir=%{_libdir} -C lib lib-mt
for dir in programs contrib/pzstd; do for dir in programs contrib/pzstd; do
%make_build -C "$dir" %make_build -C "$dir"
done done
@ -103,7 +103,7 @@ export CXXFLAGS="%{optflags} -std=c++11"
#make %{?_smp_mflags} -C contrib/pzstd test-pzstd #make %{?_smp_mflags} -C contrib/pzstd test-pzstd
%install %install
%make_install V=1 VERBOSE=1 PREFIX=%{_prefix} LIBDIR=%{_libdir} %make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir}
install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1