[arch-commits] Commit in root/trunk (PKGBUILD fix_relative_paths.patch)

[Konstantin Gizdov]

    Date: Wednesday, March 4, 2020 @ 10:15:59
  Author: kgizdov
Revision: 589912

simplify patch

Modified:
  root/trunk/PKGBUILD
  root/trunk/fix_relative_paths.patch

--------------------------+
 PKGBUILD                 |    4 ++--
 fix_relative_paths.patch |   38 ++++++++------------------------------
 2 files changed, 10 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-04 10:15:54 UTC (rev 589911)
+++ PKGBUILD	2020-03-04 10:15:59 UTC (rev 589912)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.20.00
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -83,7 +83,7 @@
             '9d8280ae1e850dcb2d49bb917412d0056871cee99cd631168e264d9a85a97b4e'
             '4e5546039dbf7bb90c6c1ae49f20f6025cde87573457bfec3266602d4fa06818'
             '1cb2654f22b5f1de7f8621434c76266968db77a1f300de857e47d0f4ad5da217'
-            '06a4830be8ea98f47dcee1b1630dab91573fc0fa12d8c340c881a65e1a393b31')
+            'd5b135fb4d6329277e33d612f8b81b1ca60681cca96196e33ab776f3018a2fa8')
 
 get_pyver () {
     python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'

Modified: fix_relative_paths.patch
===================================================================
--- fix_relative_paths.patch	2020-03-04 10:15:54 UTC (rev 589911)
+++ fix_relative_paths.patch	2020-03-04 10:15:59 UTC (rev 589912)
@@ -1,38 +1,32 @@
 diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
-index 41a9cffc78..be963296d2 100644
+index 41a9cffc78..1c70ce8e39 100644
 --- a/cmake/modules/RootConfiguration.cmake
 +++ b/cmake/modules/RootConfiguration.cmake
-@@ -678,22 +678,36 @@ file(RELATIVE_PATH ROOT_CMAKE_TO_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "$
+@@ -678,22 +678,30 @@ file(RELATIVE_PATH ROOT_CMAKE_TO_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "$
  file(RELATIVE_PATH ROOT_CMAKE_TO_LIB_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}")
  file(RELATIVE_PATH ROOT_CMAKE_TO_BIN_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_BINDIR}")
  
 +# '_' prefixed variables are used to construct the paths,
 +# while the normal variants evaluate to full paths at runtime
-+set(_ROOT_INCLUDE_DIR_SETUP "
-+# ROOT configured for the install with relative paths, so use these
-+get_filename_component(_ROOT_INCLUDE_DIRS \"\${_thisdir}/${ROOT_CMAKE_TO_INCLUDE_DIR}\" REALPATH)
-+")
  set(ROOT_INCLUDE_DIR_SETUP "
  # ROOT configured for the install with relative paths, so use these
 -get_filename_component(ROOT_INCLUDE_DIRS \"\${_thisdir}/${ROOT_CMAKE_TO_INCLUDE_DIR}\" ABSOLUTE)
++get_filename_component(_ROOT_INCLUDE_DIRS \"\${_thisdir}/${ROOT_CMAKE_TO_INCLUDE_DIR}\" REALPATH)
++# resolve relative paths to absolute system paths
 +get_filename_component(ROOT_INCLUDE_DIRS \"\${_ROOT_INCLUDE_DIRS}\" REALPATH)
-+")
-+set(_ROOT_LIBRARY_DIR_SETUP "
-+# ROOT configured for the install with relative paths, so use these
-+get_filename_component(_ROOT_LIBRARY_DIR \"\${_thisdir}/${ROOT_CMAKE_TO_LIB_DIR}\" REALPATH)
  ")
  set(ROOT_LIBRARY_DIR_SETUP "
  # ROOT configured for the install with relative paths, so use these
 -get_filename_component(ROOT_LIBRARY_DIR \"\${_thisdir}/${ROOT_CMAKE_TO_LIB_DIR}\" ABSOLUTE)
++get_filename_component(_ROOT_LIBRARY_DIR \"\${_thisdir}/${ROOT_CMAKE_TO_LIB_DIR}\" REALPATH)
++# resolve relative paths to absolute system paths
 +get_filename_component(ROOT_LIBRARY_DIR \"\${_ROOT_LIBRARY_DIR}\" REALPATH)
-+")
-+set(_ROOT_BINDIR_SETUP "
-+# ROOT configured for the install with relative paths, so use these
-+get_filename_component(_ROOT_BINDIR \"\${_thisdir}/${ROOT_CMAKE_TO_BIN_DIR}\" REALPATH)
  ")
  set(ROOT_BINDIR_SETUP "
  # ROOT configured for the install with relative paths, so use these
 -get_filename_component(ROOT_BINDIR \"\${_thisdir}/${ROOT_CMAKE_TO_BIN_DIR}\" ABSOLUTE)
++get_filename_component(_ROOT_BINDIR \"\${_thisdir}/${ROOT_CMAKE_TO_BIN_DIR}\" REALPATH)
++# resolve relative paths to absolute system paths
 +get_filename_component(ROOT_BINDIR \"\${_ROOT_BINDIR}\" REALPATH)
  ")
  # Deprecated value ROOT_BINARY_DIR
@@ -43,19 +37,3 @@
  ")
  
  # used by ROOTConfig.cmake from the build directory
-diff --git a/cmake/scripts/ROOTConfig.cmake.in b/cmake/scripts/ROOTConfig.cmake.in
-index c0c31484b6..7faab0ef2b 100644
---- a/cmake/scripts/ROOTConfig.cmake.in
-+++ b/cmake/scripts/ROOTConfig.cmake.in
-@@ -57,8 +57,11 @@ get_filename_component(_thisdir "${CMAKE_CURRENT_LIST_FILE}" PATH)
- # Configure the path to the ROOT headers, using a relative path if possible.
- # This is only known at CMake time, so we expand a CMake supplied variable.
- #
-+ at _ROOT_INCLUDE_DIR_SETUP@
- @ROOT_INCLUDE_DIR_SETUP@
-+ at _ROOT_LIBRARY_DIR_SETUP@
- @ROOT_LIBRARY_DIR_SETUP@
-+ at _ROOT_BINDIR_SETUP@
- @ROOT_BINDIR_SETUP@
- @ROOT_BINARY_DIR_SETUP@
-