From b224eeaee0d13e2328ad486c0aa1bafaa8437d3c Mon Sep 17 00:00:00 2001 From: Markus Boehme Date: Thu, 14 Sep 2023 14:45:41 +0000 Subject: [PATCH] packages: use force_disable_rpath macro instead of open coding it The `force_disable_rpath` macro was released with the Bottlerocket SDK v0.34.0 and expands to the rpath hack. Switch over all packages open coding it to actually make use of the macro. Note that the util-linux and libacl packages use both the rpath hack and `--disable-rpath` in the invocation of the `configure` script. For those `--disable-rpath` does not actually prevent inclusion of an rpath into the actual executables. This commit only mechanically changes over to the use of the macro, and leaves fixing the incomplete handling of the option in those packages to another day. Signed-off-by: Markus Boehme --- packages/iptables/iptables.spec | 3 +-- packages/libacl/libacl.spec | 3 +-- packages/libattr/libattr.spec | 3 +-- packages/libaudit/libaudit.spec | 4 +--- packages/libdbus/libdbus.spec | 3 +-- packages/libnl/libnl.spec | 3 +-- packages/libpcre/libpcre.spec | 3 +-- packages/libseccomp/libseccomp.spec | 4 +--- packages/liburcu/liburcu.spec | 4 +--- packages/open-vm-tools/open-vm-tools.spec | 4 +--- packages/procps/procps.spec | 3 +-- packages/util-linux/util-linux.spec | 3 +-- packages/wicked/wicked.spec | 4 +--- 13 files changed, 13 insertions(+), 31 deletions(-) diff --git a/packages/iptables/iptables.spec b/packages/iptables/iptables.spec index e9ae9a4524d..8b6b4ad3bc0 100644 --- 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 index 39a44444515..6d52562d749 100644 --- 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 index 2db7a4db6db..29a8a572677 100644 --- 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 index 9e05651c686..689d4fc3ade 100644 --- 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 index 020d3b630a2..0de302fc7d0 100644 --- 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 index e6f3e5094ea..785e1cacd27 100644 --- 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 index 0b79d0dc45d..78782f8c97f 100644 --- 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 index f05cb375ca0..ef850fd19be 100644 --- 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 index 09e3a57a42f..6accd25c5b7 100644 --- 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 index b9b4fdbf821..2071a668340 100644 --- 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 index 7e77200b9c1..f8a0adf7a9c 100644 --- 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 index 51792f5d604..0df85b5feaf 100644 --- 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 index 0874990e63d..c6257bd6b7f 100644 --- 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