From 183e2407bd98ac2875c6bbbb7639691f8a6eb61b Mon Sep 17 00:00:00 2001 From: nicholastao Date: Mon, 11 Sep 2023 12:46:54 +0000 Subject: [PATCH 1/8] add relocation sub rpm Signed-off-by: nicholastao --- gmp.spec | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/gmp.spec b/gmp.spec index 914f821..5fb79f7 100644 --- a/gmp.spec +++ b/gmp.spec @@ -1,6 +1,8 @@ +%global ENABLE_RLOC 1 + Name: gmp Version: 6.3.0 -Release: 2 +Release: 3 Epoch: 1 URL: https://gmplib.org Source0: https://gmplib.org/download/gmp/gmp-%{version}.tar.xz @@ -30,6 +32,16 @@ Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description c++ GMP dependent library for C++ applications. +%if %{?ENABLE_RLOC} +%package relocation +Summary: Relocation for %{name} +Requires: %{name} = %{version}-%{release} +BuildRequires: native-turbo-tools + +%description relocation +This package contains relocations for %{name}. +%endif + %prep %autosetup -p1 @@ -56,6 +68,20 @@ sed -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ export LD_LIBRARY_PATH=`pwd`/.libs %make_build +%if %{?ENABLE_RLOC} +mkdir rloc && \ + (cd rloc && ln -s ../configure || exit 1 +%configure --enable-cxx LDFLAGS=-Wl,--emit-relocs +sed -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e 's|-lstdc++ -lm|-lstdc++|' \ + -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -i libtool +export LD_LIBRARY_PATH=`pwd`/.libs +%make_build +objreloc $(readlink -f .libs/libgmp.so) +) +%endif + %install export LD_LIBRARY_PATH=`pwd`/.libs %make_install @@ -65,6 +91,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib{gmp,mp,gmpxx}.la /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} ln -sf libgmpxx.so.4 $RPM_BUILD_ROOT%{_libdir}/libgmpxx.so +%if %{?ENABLE_RLOC} +mkdir -p ${RPM_BUILD_ROOT}/usr/lib/relocation/%{_libdir} +install -pD $RPM_BUILD_DIR/%{name}-%{version}/rloc/.libs/*.relocation ${RPM_BUILD_ROOT}/usr/lib/relocation/%{_libdir} +%endif + basearch=%{_arch} %ifarch %{ix86} basearch=i386 @@ -72,7 +103,7 @@ basearch=i386 %check export LD_LIBRARY_PATH=`pwd`/.libs -%make_build check +#%make_build check %files %{!?_licensedir:%global license %%doc} @@ -93,7 +124,16 @@ export LD_LIBRARY_PATH=`pwd`/.libs %{_libdir}/libgmpxx.so.* %{_libdir}/pkgconfig/gmpxx.pc +%if %{?ENABLE_RLOC} +%files relocation +%defattr(400,root,root,-) +%attr(400, root, root) /usr/lib/relocation%{_libdir}/*.relocation +%endif + %changelog +* Tue Sep 11 2023 taoyuxiang - 1:6.3.0-3 +- add sub rpm coreutils-relocation + * Sat Aug 05 2023 cf-zhao 1:6.3.0-2 - Support build with clang -- Gitee From d72d4672a45d5b93fcc26a643bf35425b1dc1a2a Mon Sep 17 00:00:00 2001 From: nicholastao Date: Mon, 11 Sep 2023 12:48:31 +0000 Subject: [PATCH 2/8] enable make_build check Signed-off-by: nicholastao --- gmp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmp.spec b/gmp.spec index 5fb79f7..c3196da 100644 --- a/gmp.spec +++ b/gmp.spec @@ -103,7 +103,7 @@ basearch=i386 %check export LD_LIBRARY_PATH=`pwd`/.libs -#%make_build check +%make_build check %files %{!?_licensedir:%global license %%doc} -- Gitee From 3b4c8b96e2ed0f1b42e2e4dd8d57281ad6062b89 Mon Sep 17 00:00:00 2001 From: nicholastao Date: Tue, 12 Sep 2023 02:36:07 +0000 Subject: [PATCH 3/8] fix date Signed-off-by: nicholastao --- gmp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmp.spec b/gmp.spec index c3196da..5c7867d 100644 --- a/gmp.spec +++ b/gmp.spec @@ -131,7 +131,7 @@ export LD_LIBRARY_PATH=`pwd`/.libs %endif %changelog -* Tue Sep 11 2023 taoyuxiang - 1:6.3.0-3 +* Tue Sep 12 2023 taoyuxiang 1:6.3.0-3 - add sub rpm coreutils-relocation * Sat Aug 05 2023 cf-zhao 1:6.3.0-2 -- Gitee From 519decd6e97a04ebe71292c6240ac3ab45ab4ecd Mon Sep 17 00:00:00 2001 From: nicholastao Date: Tue, 12 Sep 2023 02:36:25 +0000 Subject: [PATCH 4/8] fix date Signed-off-by: nicholastao -- Gitee From 71257986d2644ec01d56882596f183b8b1dc218c Mon Sep 17 00:00:00 2001 From: nicholastao Date: Tue, 12 Sep 2023 02:37:02 +0000 Subject: [PATCH 5/8] fix date Signed-off-by: nicholastao -- Gitee From b3b4d4cec598c6e155a1590f939f75b5e08fd840 Mon Sep 17 00:00:00 2001 From: nicholastao Date: Tue, 12 Sep 2023 02:39:51 +0000 Subject: [PATCH 6/8] fix date Signed-off-by: nicholastao -- Gitee From 673e8178426591fa4aaa48b3007efefc1cdb5913 Mon Sep 17 00:00:00 2001 From: nicholastao Date: Tue, 12 Sep 2023 02:40:58 +0000 Subject: [PATCH 7/8] fix date Signed-off-by: nicholastao -- Gitee From 21075d3078d37b54e79f87c57320f358f62dd9c7 Mon Sep 17 00:00:00 2001 From: nicholastao Date: Tue, 12 Sep 2023 02:41:22 +0000 Subject: [PATCH 8/8] fix date Signed-off-by: nicholastao -- Gitee