diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-devtools/cmake/cmake | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake')
7 files changed, 286 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch b/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch new file mode 100644 index 0000000000..3e26d58267 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From: Riku Voipio <riku.voipio@linaro.org> | ||
2 | Date: Fri, 21 Dec 2012 11:20:02 +0000 (+0200) | ||
3 | Subject: KWIML: Teach ABI.h about Aarch64 | ||
4 | X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=34916522 | ||
5 | |||
6 | KWIML: Teach ABI.h about Aarch64 | ||
7 | |||
8 | The __aarch64__ defines Aarch64, while __AARCH64EB__ defines bigendian | ||
9 | and __AARCH64EL__ little endian. Only little endian tested, no big | ||
10 | endian toolchain exists yet. | ||
11 | |||
12 | Signed-off-by: Riku Voipio <riku.voipio@linaro.org> | ||
13 | |||
14 | Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | --- | ||
18 | |||
19 | diff --git a/ABI.h.in b/ABI.h.in | ||
20 | index f93ddba..7f4772a 100644 | ||
21 | --- a/Utilities/KWIML/ABI.h.in | ||
22 | +++ b/Utilities/KWIML/ABI.h.in | ||
23 | @@ -418,6 +418,14 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined. | ||
24 | #elif defined(__vax__) | ||
25 | # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG | ||
26 | |||
27 | +/* Aarch64 */ | ||
28 | +#elif defined(__aarch64__) | ||
29 | +# if !defined(__AARCH64EB__) | ||
30 | +# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE | ||
31 | +# else | ||
32 | +# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG | ||
33 | +# endif | ||
34 | + | ||
35 | /* Unknown CPU */ | ||
36 | #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN) | ||
37 | # error "Byte order of target CPU unknown." | ||
diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch b/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch new file mode 100644 index 0000000000..2b68eae6c2 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From: KWSys Robot <kwrobot@kitware.com> | ||
2 | Date: Fri, 21 Dec 2012 13:29:37 +0000 (-0500) | ||
3 | Subject: KWSys 2012-12-21 (8ce09af5) | ||
4 | X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=567e7d94 | ||
5 | |||
6 | KWSys 2012-12-21 (8ce09af5) | ||
7 | |||
8 | Extract upstream KWSys using the following shell commands. | ||
9 | |||
10 | $ git archive --prefix=upstream-kwsys/ 8ce09af5 | tar x | ||
11 | $ git shortlog --no-merges --abbrev=8 --format='%h %s' 933eb822..8ce09af5 | ||
12 | Riku Voipio (1): | ||
13 | 8ce09af5 CPU: Add Aarch64 support | ||
14 | |||
15 | Change-Id: I4bd0a97abaa0f958e2679afe2d4ad4bcc37434a0 | ||
16 | |||
17 | Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE | ||
18 | |||
19 | Upstream-Status: Backport | ||
20 | --- | ||
21 | |||
22 | diff --git a/CPU.h.in b/CPU.h.in | ||
23 | index ecd29d1..2e1a584 100644 | ||
24 | --- a/Source/kwsys/CPU.h.in | ||
25 | +++ b/Source/kwsys/CPU.h.in | ||
26 | @@ -98,6 +98,14 @@ | ||
27 | #elif defined(__SYSC_ZARCH__) | ||
28 | # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG | ||
29 | |||
30 | +/* Aarch64 */ | ||
31 | +#elif defined(__aarch64__) | ||
32 | +# if !defined(__AARCH64EB__) | ||
33 | +# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE | ||
34 | +# else | ||
35 | +# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG | ||
36 | +# endif | ||
37 | + | ||
38 | /* Unknown CPU */ | ||
39 | #else | ||
40 | # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID 0 | ||
diff --git a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch new file mode 100644 index 0000000000..1b523c057b --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From: Julian Ospald <hasufell@gentoo.org> | ||
2 | Date: Sun Dec 8 13:38:06 UTC 2013 | ||
3 | Subject: fix check for freetype-2.5.1 | ||
4 | |||
5 | Upstream-Status: Submitted http://www.cmake.org/Bug/view.php?id=14601 | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | |||
9 | --- old/Modules/FindFreetype.cmake | ||
10 | +++ new/Modules/FindFreetype.cmake | ||
11 | @@ -64,6 +64,19 @@ | ||
12 | PATH_SUFFIXES include/freetype2 include | ||
13 | ) | ||
14 | |||
15 | +if(NOT FREETYPE_INCLUDE_DIR_freetype2) | ||
16 | + find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h | ||
17 | + HINTS | ||
18 | + ENV FREETYPE_DIR | ||
19 | + PATHS | ||
20 | + /usr/X11R6 | ||
21 | + /usr/local/X11R6 | ||
22 | + /usr/local/X11 | ||
23 | + /usr/freeware | ||
24 | + PATH_SUFFIXES include/freetype2 include | ||
25 | + ) | ||
26 | +endif() | ||
27 | + | ||
28 | find_library(FREETYPE_LIBRARY | ||
29 | NAMES freetype libfreetype freetype219 | ||
30 | HINTS | ||
31 | @@ -82,8 +95,14 @@ | ||
32 | endif() | ||
33 | set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") | ||
34 | |||
35 | -if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") | ||
36 | - file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str | ||
37 | +if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") | ||
38 | + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") | ||
39 | +elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") | ||
40 | + set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") | ||
41 | +endif() | ||
42 | + | ||
43 | +if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) | ||
44 | + file(STRINGS "${FREETYPE_H}" freetype_version_str | ||
45 | REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") | ||
46 | |||
47 | unset(FREETYPE_VERSION_STRING) | ||
diff --git a/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch b/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch new file mode 100644 index 0000000000..bf3671259e --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Disable use of ext2fs/ext2_fs.h by cmake's internal libarchive copy | ||
2 | |||
3 | We don't want to add a dependency on e2fsprogs-native for cmake-native, | ||
4 | and we don't use CPack so just disable this functionality. | ||
5 | |||
6 | Upstream-Status: Inappropriate [config] | ||
7 | |||
8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
9 | |||
10 | --- a/Utilities/cmlibarchive/CMakeLists.txt | ||
11 | +++ b/Utilities/cmlibarchive/CMakeLists.txt | ||
12 | @@ -237,12 +237,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) | ||
13 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) | ||
14 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) | ||
15 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) | ||
16 | -LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H) | ||
17 | - | ||
18 | -CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h> | ||
19 | -#include <ext2fs/ext2_fs.h> | ||
20 | -int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS) | ||
21 | - | ||
22 | +SET(HAVE_EXT2FS_EXT2_FS_H 0) | ||
23 | +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) | ||
24 | LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) | ||
25 | LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) | ||
26 | LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) | ||
diff --git a/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch b/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch new file mode 100644 index 0000000000..0c059f12ed --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/dont-run-cross-binaries.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | cmake: don't run cross-binaries on host machine | ||
2 | |||
3 | When doing the cross build we obviously cannot run those binaries on | ||
4 | host since they can be binary incompatible. | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | |||
10 | Index: cmake-2.8.10.1/CMakeLists.txt | ||
11 | =================================================================== | ||
12 | --- cmake-2.8.10.1.orig/CMakeLists.txt | ||
13 | +++ cmake-2.8.10.1/CMakeLists.txt | ||
14 | @@ -588,7 +588,8 @@ mark_as_advanced(CMAKE_STRICT) | ||
15 | |||
16 | # build the remaining subdirectories | ||
17 | add_subdirectory(Source) | ||
18 | -add_subdirectory(Utilities) | ||
19 | +# Come on! Running the cross-binaries on host is not a good idea. | ||
20 | +#add_subdirectory(Utilities) | ||
21 | add_subdirectory(Tests) | ||
22 | |||
23 | if(BUILD_TESTING) | ||
diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch new file mode 100644 index 0000000000..fd39f3f9e7 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | Fail silently if system Qt installation is broken | ||
2 | |||
3 | Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the | ||
4 | following error if the system Qt installation is broken: | ||
5 | |||
6 | CMake Error at Modules/FindQt4.cmake:1028 (set_property): | ||
7 | set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet | ||
8 | been created. | ||
9 | Call Stack (most recent call first): | ||
10 | Tests/RunCMake/CMakeLists.txt:79 (find_package) | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
15 | |||
16 | --- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 +0100 | ||
17 | +++ cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 +0100 | ||
18 | @@ -1025,21 +1025,22 @@ | ||
19 | set(_configs) | ||
20 | endmacro() | ||
21 | |||
22 | - | ||
23 | - # Set QT_xyz_LIBRARY variable and add | ||
24 | - # library include path to QT_INCLUDES | ||
25 | - _QT4_ADJUST_LIB_VARS(QtCore) | ||
26 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
27 | - INTERFACE_INCLUDE_DIRECTORIES | ||
28 | - "${QT_MKSPECS_DIR}/default" | ||
29 | - ${QT_INCLUDE_DIR} | ||
30 | - ) | ||
31 | - set_property(TARGET Qt4::QtCore PROPERTY | ||
32 | - INTERFACE_QT_MAJOR_VERSION 4 | ||
33 | - ) | ||
34 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
35 | - COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION | ||
36 | - ) | ||
37 | + if(QT_QTCORE_FOUND) | ||
38 | + # Set QT_xyz_LIBRARY variable and add | ||
39 | + # library include path to QT_INCLUDES | ||
40 | + _QT4_ADJUST_LIB_VARS(QtCore) | ||
41 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
42 | + INTERFACE_INCLUDE_DIRECTORIES | ||
43 | + "${QT_MKSPECS_DIR}/default" | ||
44 | + ${QT_INCLUDE_DIR} | ||
45 | + ) | ||
46 | + set_property(TARGET Qt4::QtCore PROPERTY | ||
47 | + INTERFACE_QT_MAJOR_VERSION 4 | ||
48 | + ) | ||
49 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
50 | + COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION | ||
51 | + ) | ||
52 | + endif() | ||
53 | |||
54 | foreach(QT_MODULE ${QT_MODULES}) | ||
55 | _QT4_ADJUST_LIB_VARS(${QT_MODULE}) | ||
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch new file mode 100644 index 0000000000..0e311f70e3 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | cmake: support OpenEmbedded Qt4 tool binary names | ||
2 | |||
3 | The FindQt4 module looks for Qt4 binaries to be able to gather the | ||
4 | paths used for compilation and also to be using during other processes | ||
5 | (translation update, translation binary generating and like) however | ||
6 | OpenEmbedded has renamed those to allow old QMake to be used in | ||
7 | parallel with the current one. This patch adds support for the | ||
8 | OpenEmbedded specific binary names. | ||
9 | |||
10 | Upstream-Status: Inappropriate [embedded specific] | ||
11 | |||
12 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
13 | |||
14 | Index: cmake-2.8.11/Modules/FindQt4.cmake | ||
15 | =================================================================== | ||
16 | --- cmake-2.8.11.orig/Modules/FindQt4.cmake | ||
17 | +++ cmake-2.8.11/Modules/FindQt4.cmake | ||
18 | @@ -569,7 +569,7 @@ endfunction() | ||
19 | |||
20 | set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) | ||
21 | |||
22 | -set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) | ||
23 | +set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac) | ||
24 | _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) | ||
25 | |||
26 | if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
27 | @@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
28 | ) | ||
29 | |||
30 | find_program(QT_RCC_EXECUTABLE | ||
31 | - NAMES rcc | ||
32 | + NAMES rcc4 rcc | ||
33 | PATHS ${QT_BINARY_DIR} | ||
34 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
35 | ) | ||
36 | |||
37 | find_program(QT_DBUSCPP2XML_EXECUTABLE | ||
38 | - NAMES qdbuscpp2xml | ||
39 | + NAMES qdbuscpp2xml4 qdbuscpp2xml | ||
40 | PATHS ${QT_BINARY_DIR} | ||
41 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
42 | ) | ||
43 | |||
44 | find_program(QT_DBUSXML2CPP_EXECUTABLE | ||
45 | - NAMES qdbusxml2cpp | ||
46 | + NAMES qdbusxml2cp4 qdbusxml2cpp | ||
47 | PATHS ${QT_BINARY_DIR} | ||
48 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
49 | ) | ||
50 | @@ -1187,7 +1187,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) | ||
51 | ) | ||
52 | |||
53 | find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE | ||
54 | - NAMES qcollectiongenerator-qt4 qcollectiongenerator | ||
55 | + NAMES qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4 | ||
56 | PATHS ${QT_BINARY_DIR} | ||
57 | NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH | ||
58 | ) | ||