[patch] cmake-prefix.patch

cmake-prefix.patch (text/plain), 4.43 KB, created by Benda Xu on 2019-01-27 00:55:32 UTC

commit 0aa09ef86003b5cfb551514191573e3fa2f1bb33
Author: Benda Xu <[e-mail]>
Date:   Sun Jan 27 08:44:15 2019 +0800

    dev-util/cmake: remove host directories in Platform/UnixPaths.cmake
    
      Although needed in prefix-rpath, the host directories cause bugs for
      prefix-standalone and introduce duplications for gx86.
    
      gx86 duplication example:
    
    ...
    list(APPEND CMAKE_SYSTEM_PREFIX_PATH
      # Standard
      /usr/local /usr /
      /usr/local /usr /
    ...
    
    Package-Manager: Portage-2.3.52, Repoman-2.3.12
    Signed-off-by: Benda Xu <[e-mail]>

diff --git a/dev-util/cmake/cmake-3.13.3.ebuild b/dev-util/cmake/cmake-3.13.3.ebuild
index 758e6f4742db..cd11933588ad 100644
--- a/dev-util/cmake/cmake-3.13.3.ebuild
+++ b/dev-util/cmake/cmake-3.13.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils prefix
 
 MY_P="${P/_/-}"
 
@@ -141,9 +141,11 @@ src_prepare() {
 
 	# Add gcc libs to the default link paths
 	sed -i \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
 		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
 		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
 		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
 	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
 		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 		cmake_src_bootstrap
diff --git a/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch
index f4e9a27597cf..bb60aaf35196 100644
--- a/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch
@@ -19,10 +19,10 @@ Updated by Lars Wendler (cmake-3.9.0_rc2)
  Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++-----
  2 files changed, 32 insertions(+), 9 deletions(-)
 
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index 727baa6e1..543d9e034 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
+Index: cmake-3.13.3/Modules/Platform/Darwin.cmake
+===================================================================
+--- cmake-3.13.3.orig/Modules/Platform/Darwin.cmake
++++ cmake-3.13.3/Modules/Platform/Darwin.cmake
 @@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
  set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
  set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
@@ -62,18 +62,20 @@ index 727baa6e1..543d9e034 100644
    "~/Applications"
    "/Applications"
    "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 5687653cf..be7695898 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -23,6 +23,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+Index: cmake-3.13.3/Modules/Platform/UnixPaths.cmake
+===================================================================
+--- cmake-3.13.3.orig/Modules/Platform/UnixPaths.cmake
++++ cmake-3.13.3/Modules/Platform/UnixPaths.cmake
+@@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DI
  # search types.
  list(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
+-  /usr/local /usr /
 +  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
-   /usr/local /usr /
++  @GENTOO_HOST@/usr/local /usr /
  
    # CMake install location
+   "${_CMAKE_INSTALL_DIR}"
 @@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
  
  # List common include file locations not under the common prefixes.
@@ -109,18 +111,17 @@ index 5687653cf..be7695898 100644
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib32
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib
 +  @GENTOO_PORTAGE_EPREFIX@lib
-+  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
++  @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
    )
  
  list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
 +  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
++  @GENTOO_HOST@/usr/include
    )
  list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
 +  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
++  @GENTOO_HOST@/usr/include
    )
- 
--- 
-2.13.1
-
+ list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES