X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ceph-python.patch;fp=ceph-python.patch;h=54fae5dc9904f4c06f48c03753b642c88c60ca70;hb=f8bb146f7c117e8794d8327e6dda7c3a420f50e0;hp=2a3971ef79720d008e0b39b1362de77a5157fc1b;hpb=d5cae1aab9ce1e95c9e0131193543572580f6bb2;p=packages%2Fceph.git

diff --git a/ceph-python.patch b/ceph-python.patch
index 2a3971e..54fae5d 100644
--- a/ceph-python.patch
+++ b/ceph-python.patch
@@ -1,14 +1,29 @@
---- ceph-12.2.13/cmake/modules/Distutils.cmake.orig	2020-01-30 21:52:36.000000000 +0100
-+++ ceph-12.2.13/cmake/modules/Distutils.cmake	2020-05-29 22:15:43.919231143 +0200
-@@ -17,10 +17,7 @@
+--- ceph-16.2.7/cmake/modules/Distutils.cmake~	2021-12-07 17:15:49.000000000 +0100
++++ ceph-16.2.7/cmake/modules/Distutils.cmake	2022-02-12 11:15:17.620439748 +0100
+@@ -19,12 +19,10 @@
    install(CODE "
      set(options --prefix=${CMAKE_INSTALL_PREFIX})
      if(DEFINED ENV{DESTDIR})
 -      if(EXISTS /etc/debian_version)
 -        list(APPEND options --install-layout=deb)
+-      endif()
+       list(APPEND options
+         --root=\$ENV{DESTDIR}
+-        --single-version-externally-managed)
++        --single-version-externally-managed
++	--optimize=2)
+     endif()
+     if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
+       list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
+@@ -109,10 +107,7 @@
+ 
+     set(options --prefix=${CMAKE_INSTALL_PREFIX})
+     if(DEFINED ENV{DESTDIR})
+-      if(EXISTS /etc/debian_version)
+-        list(APPEND options --install-layout=deb)
 -      endif()
 -      list(APPEND options --root=\$ENV{DESTDIR})
 +      list(APPEND options --root=\$ENV{DESTDIR} --optimize=2)
-       if(NOT \"${DU_INSTALL_SCRIPT}\" STREQUAL \"\")
-         list(APPEND options --install-script=${DU_INSTALL_SCRIPT})
-       endif()
+     else()
+       list(APPEND options --root=/)
+     endif()