From 134e171bfce59d9ea887489051b76229659c20fe Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Mon, 14 Mar 2022 02:33:06 -0500 Subject: [PATCH] [packaging] Use '--force-reinstall' with PIP_OPTIONS for distro builds For RHEL and Debian distro builds, the use of the pip option '--force-reinstall' allows for any conflicts to be resolved properly, allowing the builds to succeed. Also remove PYTHON_LAYOUT from override_dh_auto_configure as not used in Python 3 builds. --- packaging/debian/rules | 2 +- packaging/rhel/xrootd.spec.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/debian/rules b/packaging/debian/rules index 7f7e6cc64cf..b0cb8d803fe 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -6,7 +6,7 @@ export PYBUILD_NAME=xrootd dh $@ --builddirectory=build --destdir=deb_packages --with python3 override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYTHON_LAYOUT=deb -DCMAKE_SKIP_INSTALL_RPATH=ON -DXRDCLHTTP_SUBMODULE=TRUE + dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPIP_OPTIONS="--verbose --force-reinstall" -DCMAKE_SKIP_INSTALL_RPATH=ON -DXRDCLHTTP_SUBMODULE=TRUE override_dh_install: install -D -m 644 packaging/common/client.conf deb_packages/etc/xrootd/client.conf diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in index 8ceb6fff8ba..70ff09e10ef 100644 --- a/packaging/rhel/xrootd.spec.in +++ b/packaging/rhel/xrootd.spec.in @@ -565,6 +565,7 @@ cmake \ %if %{python3only} -DXRD_PYTHON_REQ_VERSION=%{python3_pkgversion} \ %endif + -DPIP_OPTIONS="--verbose --force-reinstall" \ -DUSER_VERSION=v%{version} \ ../