X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=blobdiff_plain;f=cmake-libx32.patch;h=e8a7f7238c588e0044d6d54051f2b1c716443659;hp=116a26d35670bec2cfdc75894d99136b00ef8e2f;hb=3a7a72c08743220611c149a4b3654d1c5039d6d6;hpb=24512f707280b64415f525f6d1ad0adb2378e610

diff --git a/cmake-libx32.patch b/cmake-libx32.patch
index 116a26d..e8a7f72 100644
--- a/cmake-libx32.patch
+++ b/cmake-libx32.patch
@@ -17,8 +17,8 @@ diff -urN cmake-3.1.3/Modules/FindOpenAL.cmake cmake-3.1.3.x32/Modules/FindOpenA
    NAMES OpenAL al openal OpenAL32
    HINTS
      ENV OPENALDIR
--  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
-+  PATH_SUFFIXES libx32 lib64 lib libs64 libs libs/Win32 libs/Win64
+-  PATH_SUFFIXES lib64 lib libs64 libs ${_OpenAL_ARCH_DIR}
++  PATH_SUFFIXES libx32 lib64 lib libs64 libs ${_OpenAL_ARCH_DIR}
    PATHS
    ~/Library/Frameworks
    /Library/Frameworks
@@ -39,15 +39,17 @@ diff -urN cmake-3.1.3/Modules/FindPkgConfig.cmake cmake-3.1.3.x32/Modules/FindPk
 diff -urN cmake-3.1.3/Modules/FindZLIB.cmake cmake-3.1.3.x32/Modules/FindZLIB.cmake
 --- cmake-3.1.3/Modules/FindZLIB.cmake	2015-02-11 16:17:39.000000000 +0000
 +++ cmake-3.1.3.x32/Modules/FindZLIB.cmake	2015-03-05 21:07:55.935140350 +0000
-@@ -79,7 +79,7 @@
- # Try each search configuration.
- foreach(search ${_ZLIB_SEARCHES})
-   find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
--  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES libx32)
- endforeach()
+@@ -85,8 +85,8 @@
+ # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
+ if(NOT ZLIB_LIBRARY)
+   foreach(search ${_ZLIB_SEARCHES})
+-    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
+-    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
++    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES libx32)
++    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES libx32)
+   endforeach()
  
- mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
 diff -urN cmake-3.1.3/Modules/GetPrerequisites.cmake cmake-3.1.3.x32/Modules/GetPrerequisites.cmake
 --- cmake-3.1.3/Modules/GetPrerequisites.cmake	2015-02-11 16:17:39.000000000 +0000
 +++ cmake-3.1.3.x32/Modules/GetPrerequisites.cmake	2015-03-05 21:18:03.455135952 +0000
@@ -87,15 +89,15 @@ diff -urN cmake-3.1.3/Modules/KDE3Macros.cmake cmake-3.1.3.x32/Modules/KDE3Macro
              /usr/X11R6/include
 --- cmake-3.2.2/Modules/CPackRPM.cmake~	2015-04-13 19:09:00.000000000 +0200
 +++ cmake-3.2.2/Modules/CPackRPM.cmake	2015-05-24 16:00:57.195091040 +0200
-@@ -979,7 +979,7 @@
- endif()
+@@ -607,7 +607,7 @@
+   endif()
  
- if (NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
--  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
-+  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/libx32 /usr/include)
-   if (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
-     message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
-     list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
+   if(NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
+-    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/include)
++    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/lib64 /usr/libx32 /usr/include)
+     if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
+       message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+       list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
 --- cmake-3.2.2/Modules/FindDevIL.cmake~	2015-04-13 19:09:00.000000000 +0200
 +++ cmake-3.2.2/Modules/FindDevIL.cmake	2015-05-24 16:02:11.395903299 +0200
 @@ -56,7 +56,7 @@