Merge pull request bottlerocket-os#3461 from markusboehme/improvement…

…/use-force-disable-rpath-macro packages: use force_disable_rpath macro instead of open coding it
stmcginnis · Sep 18, 2023 · 601e263 · 601e263
2 parents c9af43a + b224eea
commit 601e263
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 31 deletions.
diff --git a/packages/iptables/iptables.spec b/packages/iptables/iptables.spec
@@ -44,8 +44,7 @@ Requires: %{name}
   --disable-nfsynproxy \
   --disable-static \
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/libacl/libacl.spec b/packages/libacl/libacl.spec
@@ -27,8 +27,7 @@ Requires: %{name}
   --disable-nls \
   --disable-rpath \
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/libattr/libattr.spec b/packages/libattr/libattr.spec
@@ -22,8 +22,7 @@ Requires: %{name}
 
 %build
 %cross_configure
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/libaudit/libaudit.spec b/packages/libaudit/libaudit.spec
@@ -48,9 +48,7 @@ autoreconf -fi
   --without-python \
   --without-python3 \
 
-# "fix" rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/libdbus/libdbus.spec b/packages/libdbus/libdbus.spec
@@ -35,8 +35,7 @@ Requires: %{name}
   --disable-systemd \
   --with-xml=expat \
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/libnl/libnl.spec b/packages/libnl/libnl.spec
@@ -29,8 +29,7 @@ autoreconf -fi
   --enable-static \
   --disable-cli \
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/libpcre/libpcre.spec b/packages/libpcre/libpcre.spec
@@ -39,8 +39,7 @@ Requires: %{name}
   --disable-pcre2test-libedit \
   --disable-pcre2test-libreadline \
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/libseccomp/libseccomp.spec b/packages/libseccomp/libseccomp.spec
@@ -23,9 +23,7 @@ Requires: %{name}
 %build
 %cross_configure
 
-# "fix" rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/liburcu/liburcu.spec b/packages/liburcu/liburcu.spec
@@ -24,9 +24,7 @@ Requires: %{name}
 %build
 %cross_configure --disable-static
 
-# "fix" rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/open-vm-tools/open-vm-tools.spec b/packages/open-vm-tools/open-vm-tools.spec
@@ -63,9 +63,7 @@ autoreconf -fi
   --without-xmlsec1 \
   --without-xmlsecurity \
 
-# "fix" rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/procps/procps.spec b/packages/procps/procps.spec
@@ -33,8 +33,7 @@ Requires: %{name}
   --without-ncurses \
   --without-systemd \
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/util-linux/util-linux.spec b/packages/util-linux/util-linux.spec
@@ -130,8 +130,7 @@ cp Documentation/licenses/COPYING.* .
   --without-udev \
   --without-utempter \
 
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build
 

diff --git a/packages/wicked/wicked.spec b/packages/wicked/wicked.spec
@@ -84,9 +84,7 @@ autoreconf -fi
   --with-dbus-configdir=%{_cross_datadir}/dbus-1/system.d \
   --without-dbus-servicedir \
 
-# "fix" rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%force_disable_rpath
 
 %make_build