!22 [backport]build: boost iostreams is no longer needed
From: @sdlzx Reviewed-by: @liuzhiqiang26 Signed-off-by: @liuzhiqiang26
This commit is contained in:
commit
4639db6d4f
26
0002-build-remove-lboost_iostreams-linker-flag.patch
Normal file
26
0002-build-remove-lboost_iostreams-linker-flag.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From 6b7e66d8f9257c09052586baad692ecae89aaa68 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonathan Wakely <jwakely@redhat.com>
|
||||||
|
Date: Tue, 22 Jun 2021 21:23:52 +0100
|
||||||
|
Subject: [PATCH] [build] Remove -lboost_iostreams linker flag
|
||||||
|
|
||||||
|
This was previously needed for thin-provisioning/thin_metadata_pack.cc
|
||||||
|
but that file was rewritten in Rust and no longer needs Boost. The flag
|
||||||
|
causes every binary to have a completely redundant depedency on
|
||||||
|
libboost_iostream.so, which is an issue for RHEL packaging.
|
||||||
|
---
|
||||||
|
Makefile.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index b29551d9..ec665ca0 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -190,7 +190,7 @@ CXXFLAGS+=@CXX_STRERROR_FLAG@
|
||||||
|
CXXFLAGS+=@CXX_STRERROR_FLAG@
|
||||||
|
CXXFLAGS+=@LFS_FLAGS@
|
||||||
|
INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
|
||||||
|
-LIBS:=-laio -lexpat -lboost_iostreams -ldl
|
||||||
|
+LIBS:=-laio -lexpat -ldl
|
||||||
|
|
||||||
|
ifeq ("@DEVTOOLS@", "yes")
|
||||||
|
LIBS+=-lncurses
|
||||||
@ -1,16 +1,17 @@
|
|||||||
Name: thin-provisioning-tools
|
Name: thin-provisioning-tools
|
||||||
Version: 0.9.0
|
Version: 0.9.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Tools for manipulating Device-mapper metadata
|
Summary: Tools for manipulating Device-mapper metadata
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://github.com/jthornber/thin-provisioning-tools
|
URL: https://github.com/jthornber/thin-provisioning-tools
|
||||||
Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
|
Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
|
||||||
Patch1: 0001-device-mapper-persistent-data-avoid-strip.patch
|
Patch1: 0001-device-mapper-persistent-data-avoid-strip.patch
|
||||||
|
Patch2: 0002-build-remove-lboost_iostreams-linker-flag.patch
|
||||||
|
|
||||||
BuildRequires: autoconf, expat-devel
|
BuildRequires: autoconf, expat-devel
|
||||||
BuildRequires: libaio-devel, libstdc++-devel
|
BuildRequires: libaio-devel, libstdc++-devel
|
||||||
BuildRequires: boost-devel, gcc-c++
|
BuildRequires: boost-devel, gcc-c++
|
||||||
Requires: expat, boost-iostreams
|
Requires: expat
|
||||||
Recommends: %{name}-help = %{version}-%{release}
|
Recommends: %{name}-help = %{version}-%{release}
|
||||||
Provides: device-mapper-persistent-data
|
Provides: device-mapper-persistent-data
|
||||||
Obsoletes: device-mapper-persistent-data
|
Obsoletes: device-mapper-persistent-data
|
||||||
@ -50,6 +51,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
|
|||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 15 2021 Liu Zixian <liuzixian4@huawei.com> - 0.9.0-3
|
||||||
|
- Remove redundant dependency
|
||||||
|
|
||||||
* Thu Dec 17 2020 yanglongkang <yanglongkang@huawei.com> - 0.9.0-2
|
* Thu Dec 17 2020 yanglongkang <yanglongkang@huawei.com> - 0.9.0-2
|
||||||
- Set help package as install require
|
- Set help package as install require
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user