Skip to content

Commit

Permalink
[rpm] Add PIP_OPTIONS --force-reinstall for distro builds
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewfeickert committed Mar 14, 2022
1 parent fd6681a commit be61e49
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion packaging/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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" -DPYTHON_LAYOUT=deb -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
Expand Down
1 change: 1 addition & 0 deletions packaging/rhel/xrootd.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ cmake \
%endif
%if %{python3only}
-DXRD_PYTHON_REQ_VERSION=%{python3_pkgversion} \
-DPIP_OPTIONS="--verbose --force-reinstall" \
%endif
-DUSER_VERSION=v%{version} \
../
Expand Down

0 comments on commit be61e49

Please sign in to comment.