]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: pass %{python3_version} to cmake
authorKefu Chai <kchai@redhat.com>
Thu, 4 Apr 2019 04:07:25 +0000 (12:07 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 11 Jun 2019 15:44:22 +0000 (23:44 +0800)
to force cmake to use the python3 and python3 modules for building
python3 bindings

on the debian side, it's okay to continue using "-DWITH_PYTHON3=ON", as

- cmake does normalize "ON" to 3
- debian's cmake extension lives on /usr/lib/python3/dist-packages/
  not in a specific /usr/lib/python3.x/dist-packages directory

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7681a38ce51743a19ec5679d49b362f04e271ddb)

Conflicts:
ceph.spec.in: trivial resolution

ceph.spec.in

index aa3c47abec11a2d0f55aba2e2e36716fafaa4094..d8aba39145199bbe384a18244f9a9f7834df9b1d 100644 (file)
@@ -833,7 +833,7 @@ cmake .. \
     -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
     -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
     -DWITH_MANPAGE=ON \
-    -DWITH_PYTHON3=ON \
+    -DWITH_PYTHON3=%{python3_version} \
     -DWITH_SYSTEMD=ON \
 %if 0%{?rhel} && ! 0%{?centos}
     -DWITH_SUBMAN=ON \