commit: 51c32bc73cde578ebf2e2fe367aed69290a1108c Author: Daniel M. Weeks <dan <AT> danweeks <DOT> net> AuthorDate: Thu Jul 9 04:30:30 2020 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Thu Jul 9 17:31:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c32bc7
sys-cluster/rdma-core: Fix default RUNDIR Build system logic relies on user (ebuild) setting CMAKE_INSTALL_RUNDIR *not* CMAKE_INSTALL_FULL_RUNDIR. A default CMAKE_INSTALL_RUNDIR will always be appended to prefix. Closes: https://bugs.gentoo.org/731808 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Daniel M. Weeks <dan <AT> danweeks.net> Closes: https://github.com/gentoo/gentoo/pull/16643 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> .../rdma-core/{rdma-core-26.0-r1.ebuild => rdma-core-26.0-r2.ebuild} | 2 +- .../rdma-core/{rdma-core-26.1.ebuild => rdma-core-26.1-r1.ebuild} | 2 +- .../rdma-core/{rdma-core-27.0-r1.ebuild => rdma-core-27.0-r2.ebuild} | 2 +- .../rdma-core/{rdma-core-28.0.ebuild => rdma-core-28.0-r1.ebuild} | 2 +- .../rdma-core/{rdma-core-29.0.ebuild => rdma-core-29.0-r1.ebuild} | 2 +- .../rdma-core/{rdma-core-30.0.ebuild => rdma-core-30.0-r1.ebuild} | 2 +- sys-cluster/rdma-core/rdma-core-9999.ebuild | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-26.0-r2.ebuild similarity index 98% rename from sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild rename to sys-cluster/rdma-core/rdma-core-26.0-r2.ebuild index 39c6e4a73b1..74779b99fe8 100644 --- a/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild +++ b/sys-cluster/rdma-core/rdma-core-26.0-r2.ebuild @@ -66,7 +66,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_FULL_RUNDIR=/run + -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" diff --git a/sys-cluster/rdma-core/rdma-core-26.1.ebuild b/sys-cluster/rdma-core/rdma-core-26.1-r1.ebuild similarity index 98% rename from sys-cluster/rdma-core/rdma-core-26.1.ebuild rename to sys-cluster/rdma-core/rdma-core-26.1-r1.ebuild index 39537f768f1..19ce4ff4082 100644 --- a/sys-cluster/rdma-core/rdma-core-26.1.ebuild +++ b/sys-cluster/rdma-core/rdma-core-26.1-r1.ebuild @@ -66,7 +66,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_FULL_RUNDIR=/run + -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" diff --git a/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-27.0-r2.ebuild similarity index 98% rename from sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild rename to sys-cluster/rdma-core/rdma-core-27.0-r2.ebuild index f8ee8760f4e..7f6e171699e 100644 --- a/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild +++ b/sys-cluster/rdma-core/rdma-core-27.0-r2.ebuild @@ -66,7 +66,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_FULL_RUNDIR=/run + -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" diff --git a/sys-cluster/rdma-core/rdma-core-28.0.ebuild b/sys-cluster/rdma-core/rdma-core-28.0-r1.ebuild similarity index 98% rename from sys-cluster/rdma-core/rdma-core-28.0.ebuild rename to sys-cluster/rdma-core/rdma-core-28.0-r1.ebuild index f476dc0f72b..895bd252e6e 100644 --- a/sys-cluster/rdma-core/rdma-core-28.0.ebuild +++ b/sys-cluster/rdma-core/rdma-core-28.0-r1.ebuild @@ -66,7 +66,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_FULL_RUNDIR=/run + -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" diff --git a/sys-cluster/rdma-core/rdma-core-29.0.ebuild b/sys-cluster/rdma-core/rdma-core-29.0-r1.ebuild similarity index 98% rename from sys-cluster/rdma-core/rdma-core-29.0.ebuild rename to sys-cluster/rdma-core/rdma-core-29.0-r1.ebuild index b5518fdad7d..9a120345c30 100644 --- a/sys-cluster/rdma-core/rdma-core-29.0.ebuild +++ b/sys-cluster/rdma-core/rdma-core-29.0-r1.ebuild @@ -66,7 +66,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_FULL_RUNDIR=/run + -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" diff --git a/sys-cluster/rdma-core/rdma-core-30.0.ebuild b/sys-cluster/rdma-core/rdma-core-30.0-r1.ebuild similarity index 98% rename from sys-cluster/rdma-core/rdma-core-30.0.ebuild rename to sys-cluster/rdma-core/rdma-core-30.0-r1.ebuild index 66af444d786..9bcb28a2f0b 100644 --- a/sys-cluster/rdma-core/rdma-core-30.0.ebuild +++ b/sys-cluster/rdma-core/rdma-core-30.0-r1.ebuild @@ -66,7 +66,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_FULL_RUNDIR=/run + -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild index a8c381b3869..fae3876a639 100644 --- a/sys-cluster/rdma-core/rdma-core-9999.ebuild +++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild @@ -64,7 +64,7 @@ pkg_setup() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_FULL_RUNDIR=/run + -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
