Felix Geyer
11 years ago
parent
dc514a9dfa
commit
c8df114fc5
@ -1,29 +0,0 @@
|
|||||||
From: Modestas Vainius <modax@debian.org>
|
|
||||||
Subject: amd64/ppc64 kernels might be running on 32bit system
|
|
||||||
Origin: vendor
|
|
||||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718290
|
|
||||||
|
|
||||||
On biarch architecture, CMAKE_SYSTEM_PROCESSOR might be a 64bit one while the
|
|
||||||
system 32bit one. Take this into consideration while looking for Java library
|
|
||||||
directory.
|
|
||||||
|
|
||||||
--- a/Modules/FindJNI.cmake
|
|
||||||
+++ b/Modules/FindJNI.cmake
|
|
||||||
@@ -33,7 +33,7 @@ macro(java_append_library_directories _v
|
|
||||||
# 1.6.0_18 + icedtea patches. However, it would be much better to base the
|
|
||||||
# guess on the first part of the GNU config.guess platform triplet.
|
|
||||||
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
|
||||||
- set(_java_libarch "amd64")
|
|
||||||
+ set(_java_libarch "amd64" "i386")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
|
|
||||||
set(_java_libarch "i386")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
|
|
||||||
@@ -46,7 +46,7 @@ macro(java_append_library_directories _v
|
|
||||||
# endianess of the underlying system.
|
|
||||||
set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
|
|
||||||
- set(_java_libarch "ppc64")
|
|
||||||
+ set(_java_libarch "ppc64" "ppc")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
|
|
||||||
set(_java_libarch "ppc")
|
|
||||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
From: Mathieu Malaterre <malat@debian.org>
|
|
||||||
Subject: Typo in PHP find module
|
|
||||||
Forwarded: yes
|
|
||||||
Origin: other
|
|
||||||
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722475
|
|
||||||
Reviewed-by: Modestas Vainius <modax@debian.org>
|
|
||||||
|
|
||||||
There is a missing CACHE keyword which make the set() command produce improper
|
|
||||||
result in FindPHP4
|
|
||||||
|
|
||||||
--- a/Modules/FindPHP4.cmake
|
|
||||||
+++ b/Modules/FindPHP4.cmake
|
|
||||||
@@ -40,7 +40,7 @@ if(PHP4_FOUND_INCLUDE_PATH)
|
|
||||||
foreach(php4_path Zend main TSRM)
|
|
||||||
set(php4_paths ${php4_paths} "${PHP4_FOUND_INCLUDE_PATH}/${php4_path}")
|
|
||||||
endforeach()
|
|
||||||
- set(PHP4_INCLUDE_PATH "${php4_paths}" INTERNAL "PHP4 include paths")
|
|
||||||
+ set(PHP4_INCLUDE_PATH "${php4_paths}" CACHE INTERNAL "PHP4 include paths")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
find_program(PHP4_EXECUTABLE NAMES php4 php )
|
|
||||||
@ -1,120 +0,0 @@
|
|||||||
Description: Update FindRuby.cmake to also support Ruby 2.0 and 2.1.
|
|
||||||
The most significant change since Ruby 1.9 is the changed path of
|
|
||||||
config.h, from RbConfig::CONFIG['rubyhdrdir'] to
|
|
||||||
RbConfig::CONFIG['rubyarchhdrdir'].
|
|
||||||
Author: Bas Couwenberg <sebastic@xs4all.nl>
|
|
||||||
Forwarded: https://github.com/Kitware/CMake/pull/92
|
|
||||||
Bug-Debian: https://bugs.debian.org/739826
|
|
||||||
Applied-Upstream: https://github.com/Kitware/CMake/commit/165f6430d957173a0c3fda48265d8ed761700e20
|
|
||||||
--- a/Modules/FindRuby.cmake
|
|
||||||
+++ b/Modules/FindRuby.cmake
|
|
||||||
@@ -1,20 +1,32 @@
|
|
||||||
-# - Find Ruby
|
|
||||||
-# This module finds if Ruby is installed and determines where the include files
|
|
||||||
-# and libraries are. Ruby 1.8 and 1.9 are supported.
|
|
||||||
+#.rst:
|
|
||||||
+# FindRuby
|
|
||||||
+# --------
|
|
||||||
+#
|
|
||||||
+# Find Ruby
|
|
||||||
+#
|
|
||||||
+# This module finds if Ruby is installed and determines where the
|
|
||||||
+# include files and libraries are. Ruby 1.8, 1.9, 2.0 and 2.1 are
|
|
||||||
+# supported.
|
|
||||||
#
|
|
||||||
# The minimum required version of Ruby can be specified using the
|
|
||||||
-# standard syntax, e.g. find_package(Ruby 1.8)
|
|
||||||
+# standard syntax, e.g. find_package(Ruby 1.8)
|
|
||||||
#
|
|
||||||
-# It also determines what the name of the library is. This
|
|
||||||
-# code sets the following variables:
|
|
||||||
+# It also determines what the name of the library is. This code sets
|
|
||||||
+# the following variables:
|
|
||||||
#
|
|
||||||
-# RUBY_EXECUTABLE = full path to the ruby binary
|
|
||||||
-# RUBY_INCLUDE_DIRS = include dirs to be used when using the ruby library
|
|
||||||
-# RUBY_LIBRARY = full path to the ruby library
|
|
||||||
-# RUBY_VERSION = the version of ruby which was found, e.g. "1.8.7"
|
|
||||||
-# RUBY_FOUND = set to true if ruby ws found successfully
|
|
||||||
+# ::
|
|
||||||
#
|
|
||||||
-# RUBY_INCLUDE_PATH = same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it
|
|
||||||
+# RUBY_EXECUTABLE = full path to the ruby binary
|
|
||||||
+# RUBY_INCLUDE_DIRS = include dirs to be used when using the ruby library
|
|
||||||
+# RUBY_LIBRARY = full path to the ruby library
|
|
||||||
+# RUBY_VERSION = the version of ruby which was found, e.g. "1.8.7"
|
|
||||||
+# RUBY_FOUND = set to true if ruby ws found successfully
|
|
||||||
+#
|
|
||||||
+#
|
|
||||||
+#
|
|
||||||
+# ::
|
|
||||||
+#
|
|
||||||
+# RUBY_INCLUDE_PATH = same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it
|
|
||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2004-2009 Kitware, Inc.
|
|
||||||
@@ -56,6 +68,8 @@ else()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT Ruby_FIND_VERSION_EXACT)
|
|
||||||
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
|
|
||||||
+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
|
|
||||||
list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
|
|
||||||
|
|
||||||
# if we want a version below 1.9, also look for ruby 1.8
|
|
||||||
@@ -94,6 +108,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
|
||||||
_RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
|
|
||||||
_RUBY_CONFIG_VAR("arch" RUBY_ARCH)
|
|
||||||
_RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
|
|
||||||
+ _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR)
|
|
||||||
_RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
|
|
||||||
_RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
|
|
||||||
|
|
||||||
@@ -115,7 +130,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
|
||||||
set(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE)
|
|
||||||
set(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE)
|
|
||||||
set(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE)
|
|
||||||
- set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9)" FORCE)
|
|
||||||
+ set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9+)" FORCE)
|
|
||||||
+ set(RUBY_ARCHHDR_DIR ${RUBY_ARCHHDR_DIR} CACHE PATH "The Ruby arch header dir (2.0+)" FORCE)
|
|
||||||
set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
|
|
||||||
set(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE)
|
|
||||||
set(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE)
|
|
||||||
@@ -128,6 +144,7 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
|
|
||||||
RUBY_ARCH_DIR
|
|
||||||
RUBY_ARCH
|
|
||||||
RUBY_HDR_DIR
|
|
||||||
+ RUBY_ARCHHDR_DIR
|
|
||||||
RUBY_POSSIBLE_LIB_DIR
|
|
||||||
RUBY_RUBY_LIB_DIR
|
|
||||||
RUBY_SITEARCH_DIR
|
|
||||||
@@ -149,10 +166,20 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_
|
|
||||||
set(RUBY_VERSION_MINOR 8)
|
|
||||||
set(RUBY_VERSION_PATCH 0)
|
|
||||||
# check whether we found 1.9.x
|
|
||||||
- if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9" OR RUBY_HDR_DIR)
|
|
||||||
+ if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
|
|
||||||
set(RUBY_VERSION_MAJOR 1)
|
|
||||||
set(RUBY_VERSION_MINOR 9)
|
|
||||||
endif()
|
|
||||||
+ # check whether we found 2.0.x
|
|
||||||
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?0")
|
|
||||||
+ set(RUBY_VERSION_MAJOR 2)
|
|
||||||
+ set(RUBY_VERSION_MINOR 0)
|
|
||||||
+ endif()
|
|
||||||
+ # check whether we found 2.1.x
|
|
||||||
+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?1")
|
|
||||||
+ set(RUBY_VERSION_MAJOR 2)
|
|
||||||
+ set(RUBY_VERSION_MINOR 1)
|
|
||||||
+ endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(RUBY_VERSION_MAJOR)
|
|
||||||
@@ -178,6 +205,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" G
|
|
||||||
HINTS
|
|
||||||
${RUBY_HDR_DIR}/${RUBY_ARCH}
|
|
||||||
${RUBY_ARCH_DIR}
|
|
||||||
+ ${RUBY_ARCHHDR_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
From bc49d820a276243324003bc34d92a69194938adf Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Daniele E. Domenichelli" <daniele.domenichelli@iit.it>
|
|
||||||
Date: Mon, 9 Dec 2013 19:33:42 +0100
|
|
||||||
Subject: [PATCH] FindFreetype: Detect version string with Freetype 2.5
|
|
||||||
|
|
||||||
---
|
|
||||||
Modules/FindFreetype.cmake | 10 ++++++++--
|
|
||||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
|
|
||||||
index 9520f7d..1f12ba6 100644
|
|
||||||
--- a/Modules/FindFreetype.cmake
|
|
||||||
+++ b/Modules/FindFreetype.cmake
|
|
||||||
@@ -103,8 +103,14 @@ if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
|
|
||||||
endif()
|
|
||||||
set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
|
|
||||||
|
|
||||||
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
|
||||||
- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
|
|
||||||
+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
|
||||||
+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
|
|
||||||
+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
|
|
||||||
+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
|
|
||||||
+endif()
|
|
||||||
+
|
|
||||||
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
|
|
||||||
+ file(STRINGS "${FREETYPE_H}" freetype_version_str
|
|
||||||
REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
|
|
||||||
|
|
||||||
unset(FREETYPE_VERSION_STRING)
|
|
||||||
--
|
|
||||||
1.7.10.4
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
Description: Fix FindFreetype after headers location breakage.
|
|
||||||
Make sure to find freetype headers in their new location (without an
|
|
||||||
extra freetype/ directory).
|
|
||||||
Author: Cyril Brulebois <kibi@debian.org>
|
|
||||||
Bug-Debian: http://bugs.debian.org/731089
|
|
||||||
|
|
||||||
--- a/Modules/FindFreetype.cmake
|
|
||||||
+++ b/Modules/FindFreetype.cmake
|
|
||||||
@@ -56,7 +56,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build
|
|
||||||
PATH_SUFFIXES include/freetype2 include
|
|
||||||
)
|
|
||||||
|
|
||||||
-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
|
|
||||||
+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
|
|
||||||
HINTS
|
|
||||||
ENV FREETYPE_DIR
|
|
||||||
PATHS
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
From: John Stamp <jstamp@users.sourceforge.net>
|
|
||||||
Subject: Install to multiarch libdir when CMAKE_SYSTEM_NAME != Linux
|
|
||||||
Date: Tue, 14 Aug 2012 22:27:05 -0700
|
|
||||||
Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684956#5
|
|
||||||
Last-Update: 2012-08-18
|
|
||||||
Bug: http://bugs.debian.org/684956
|
|
||||||
|
|
||||||
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
|
|
||||||
index 0302e4b..4dc2d68 100644
|
|
||||||
--- a/Modules/GNUInstallDirs.cmake
|
|
||||||
+++ b/Modules/GNUInstallDirs.cmake
|
|
||||||
@@ -78,7 +78,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
|
|
||||||
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
|
|
||||||
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
|
|
||||||
# See http://wiki.debian.org/Multiarch
|
|
||||||
- if(CMAKE_SYSTEM_NAME MATCHES "Linux"
|
|
||||||
+ if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
|
|
||||||
AND NOT CMAKE_CROSSCOMPILING)
|
|
||||||
if (EXISTS "/etc/debian_version") # is this a debian system ?
|
|
||||||
if(CMAKE_LIBRARY_ARCHITECTURE)
|
|
||||||
@ -1,15 +1,9 @@
|
|||||||
FindBoost_add_-lpthread_#563479.diff
|
FindBoost_add_-lpthread_#563479.diff
|
||||||
multiarch_findgtk2_fix.diff
|
multiarch_findgtk2_fix.diff
|
||||||
install_to_multiarch_libdir_on_kfreebsd_hurd.diff
|
|
||||||
qt_import_dir_variable.diff
|
qt_import_dir_variable.diff
|
||||||
FindPHP4_fix_typo.diff
|
|
||||||
FindJNI_amd64_ppc_biarch.diff
|
|
||||||
fix-ftbfs-on-kfreebsd.patch
|
fix-ftbfs-on-kfreebsd.patch
|
||||||
fix-FindFreetype.diff
|
|
||||||
FindRuby_support_Ruby_2.diff
|
|
||||||
FindJNI.cmake.mips.patch
|
FindJNI.cmake.mips.patch
|
||||||
fix-FindImageMagick-1.diff
|
fix-FindImageMagick-1.diff
|
||||||
fix-FindImageMagick-2.diff
|
fix-FindImageMagick-2.diff
|
||||||
fix-FindFreetype-version.diff
|
|
||||||
fix-hdf5-hl.patch
|
fix-hdf5-hl.patch
|
||||||
FindJNI_ppc64le.diff
|
FindJNI_ppc64le.diff
|
||||||
|
|||||||
Loading…
Reference in new issue