126 Commits

Author SHA1 Message Date
Modestas Vainius
46f54f9bc9 Fix multiarch regex to support arm*
... and (hopefully) all other possible linux architectures. Quadtriplet support
is included even if it is rare.

Patch multiarch_basic_support.diff updated.
2011-06-11 23:11:48 +03:00
Modestas Vainius
7bd05267e2 Adapt multiarch_findgtk2_fix.diff for new multiarch impl. 2011-06-09 01:17:41 +03:00
Modestas Vainius
392f6fb9bc Add multiarch implementation from upstream.
Implemented in patch multiarch_basic_support.diff, taken from upstream bug
backwards compatible with previous releases and in addition, it implements
multiarch support for find_package().
2011-06-09 01:12:42 +03:00
Modestas Vainius
db159fb2cc Revert "Fix find_library() to find libraries in multiarch library paths."
This effectively reverts commit 3220ba5539ea5095540d8bbf297ee568ce3e8b40 and
adds appropriate debian/changelog modifications.
2011-06-09 00:40:55 +03:00
Modestas Vainius
d387f1b70e Make FindGTK2.cmake work with Debian multiarch.
Implemented in the patch multiarch_findgtk2_fix.diff.
(LP: #751940)
2011-06-08 00:11:29 +03:00
Modestas Vainius
3220ba5539 Fix find_library() to find libraries in multiarch library paths.
While the patch is not a good fix (hackish by nature, no cross-compilation
support etc.), it should do the job in majority of cases. Also require dpkg-dev
>= 1.16 at both build time (Build-Depends) and runtime (cmake Depends) because
the patch needs dpkg-architecture -qDEB_HOST_MULTIARCH. (Closes: #618932)

Implemented in multiarch_library_directory_hack.diff.
2011-06-08 00:08:18 +03:00
Modestas Vainius
f28541d7ef Generate colour Makefiles if $TERM is 'screen-256color-bce'.
Thanks to Davide Mancusi for the patch (screen-256color-bce.diff).
(Closes: #627853)
2011-05-30 23:44:34 +03:00
Modestas Vainius
7b26c06e09 Backport patch to fix test order (broken in 2.8.4).
Add backport_test_order_fix.diff to restore conpatibility with earlier versions
with respect to the test run order. (Closes: #615054)
2011-02-25 19:12:17 +02:00
Modestas Vainius
f920624239 Fix year in the fix_manpages.patch. It's 2011 :) 2011-02-19 20:25:55 +02:00
Modestas Vainius
66984ac0dd Add more spelling fixes to fixup_manpages.diff patch.
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cmake prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cpack prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/ctest prefered preferred
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakepolicies.1.gz prefered preferred
I: cmake-curses-gui: spelling-error-in-binary ./usr/bin/ccmake prefered preferred
I: cmake-qt-gui: spelling-error-in-binary ./usr/bin/cmake-gui prefered preferred
2011-02-19 20:04:22 +02:00
Kai Wasserbäch
327cbf5bbf Added Forwarded information. 2011-01-16 18:46:16 +01:00
Kai Wasserbäch
cdd8ec7b95 debian/patches/FindBoost_add_-lpthread_#563479.diff: Added. (Closes: #563479) 2011-01-16 18:33:22 +01:00
Kai Wasserbäch
c17a90bf49 Dropped obsolete patch: FindPython_fix_#569321_and_#580503.diff 2011-01-16 11:49:34 +01:00
Kai Wasserbäch
ed365f7923 Dropped obsolete patch: FindTCL_fix_#600245.diff 2011-01-16 11:44:22 +01:00
Kai Wasserbäch
192311b428 Dropped obsolete patche: backport_fix_asm_support.diff 2011-01-16 11:42:17 +01:00
Kai Wasserbäch
7bca51398e Reverting the last two commits.
This reverts commit d63a84bd7ba2495d5cf970987535e276402287ff and
65f2b045e38123599ce9637f756189d64924b550. This is in accordance with
what Brad King answered to #600889 (not a CMake bug).
2011-01-12 15:16:17 +01:00
Kai Wasserbäch
65f2b045e3 Added Forwarded: field. 2011-01-10 22:34:28 +01:00
Kai Wasserbäch
d63a84bd7b debian/patches/FindVTK_fix_#600889.diff: Added. (Closes: #600889) 2011-01-10 22:17:40 +01:00
Modestas Vainius
9643b76229 Backport a patch from 2.8.4 to fix ASM support.
Thanks to Leon Nardella for heads up. (Closes: #608510, LP: #695335)
2011-01-02 12:44:52 +02:00
Kai Wasserbäch
e13c2dbf96 Added Applied-Upstream header.
FindTCL.cmake patch is now applied upstream:
<http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d95913e2>
2010-12-09 18:24:37 +01:00
Kai Wasserbäch
154d9b5b2f Added Forwarded DEP-3 header to FindTCL_fix_#600245.diff. 2010-11-27 10:52:07 +01:00
Kai Wasserbäch
f56a1e051a debian/patches/FindTCL_fix_#600245.diff: Added. (Closes: #600245)
The FIND_LIBRARY() statement for TCL used the TK variables and vice versa.
This patch reverses that into the right usage.
2010-11-27 10:42:49 +01:00
Modestas Vainius
3f23321ee1 Add fixup_manpages.diff patch to fix small issues with cmake mangpages.
Found by lintian:

W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 10029: warning [p 158, 13.5i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz informations information
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz dependant dependent
2010-11-13 02:41:24 +02:00
Modestas Vainius
b2c2f1d509 Adapt FindPython_fix_#569321_and_#580503.diff patch to upstream changes.
Upstream added support for python 2.7.
2010-11-13 02:40:10 +02:00
Modestas Vainius
0ac23dc6b7 Drop patches which were merged upstream.
- debian/patches/hurd_platform.diff;
- FindGTK2_pangommconfig.diff;
- FindJNI_fix_libarch_determination.diff;
- cpack_installed_size.diff;
- add_libarchive_script.patch - better version merged upstream;
- fix-CTestTestFailedSubmit-xmlrpc.diff;
- fix_spelling_errors.patch.
2010-11-13 02:38:29 +02:00
Kai Wasserbäch
d56f651767 FindJNI_fix_libarch_determination.diff was applied upstream (cmake-next). 2010-07-30 18:45:59 +02:00
Kai Wasserbäch
d5e9a298c2 FindGTK2_pangommconfig.diff was forwarded upstream. 2010-07-30 18:44:18 +02:00
Kai Wasserbäch
34fb6e8e38 cpack_installed_size.diff was applied upstream (cmake-next). 2010-07-30 18:41:49 +02:00
Kai Wasserbäch
32b777e281 add_libarchive_script.patch was applied upstream (cmake-next). 2010-07-30 18:38:24 +02:00
Kai Wasserbäch
04f8211130 hurd_platform.diff was applied upstream (cmake-next). 2010-07-30 18:36:42 +02:00
Kai Wasserbäch
e39f23fb1d debian/patches/fix_spelling_errors.patch: Added Applied-Upstream header. 2010-07-13 16:52:01 +02:00
Kai Wasserbäch
a0f2851e04 Fix spelling mistakes in CMake and its documentation.
Lintian showed a lot of spelling mistakes in the binaries and the
auto-generated documentation.

Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-07-02 17:00:00 +02:00
Modestas Vainius
4f3be47179 Build with CTEST_USE_XMLRPC to reenable XMLRPC support in CTest.
Also add fix-CTestTestFailedSubmit-xmlrpc.diff patch to fix a (wrongly) failing
test in that case.
2010-07-02 04:38:13 +03:00
Modestas Vainius
7e9387624b Refresh add_libarchive_script.patch, add DEP-3 header. 2010-07-02 03:14:19 +03:00
Kai Wasserbäch
9a050335e1 Add Findlibarchive.cmake to allow building with system's libarchive.
Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-07-01 19:47:09 +02:00
Modestas Vainius
93078db9bb Update patches for new upstream release.
- kFreeBSD_Hurd_fixes.diff - remove, merged upstream;
2010-06-28 22:58:42 +03:00
Kai Wasserbäch
be1647b463 Updated header of debian/patches/FindPython_fix_#569321_and_#580503.diff. 2010-06-07 21:29:05 +02:00
Kai Wasserbäch
9b5a41a7c2 Incorporate ideas from Modestas into the Python patch.
Modestas had a few very good ideas on how to improve the patch I've
introduced with a previous commit. This patch incorporates them.

Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-06-07 16:50:46 +02:00
Kai Wasserbäch
08958f98ad Expand debian/patches/FindPython_fix_#580503.diff to cover #569321 too.
Actually a very small change: just also check if there is a specific
version requested, otherwise proceed as with the previous patch.

Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-06-03 17:39:18 +02:00
Kai Wasserbäch
6ae03be2f1 debian/patches/FindPython_fix_#580503.diff: Added. (Closes: #580503)
The patch was additionally tested by Jakub Wilk.

Signed-off-by: Kai Wasserbäch <debian@carbon-project.org>
2010-06-03 15:24:54 +02:00
Modestas Vainius
507469c7bf FindJNI patch: avoid using trick bits of cmake IF() command syntax.
This should fix FindJNI on architectures which do not need special
CMAKE_SYSTEM_PROCESSOR handling (e.g. ia64).
2010-05-29 02:48:05 +03:00
Modestas Vainius
86797b8024 Add cpack_installed_size.diff to fix generation of Installed-Size field for deb packages.
Thanks to Simone Rossetto for heads up and initial patch.
2010-05-17 01:24:15 +03:00
Modestas Vainius
9b4acc149d Further improve FinJNI.cmake. This should fix some inconsistencies on s390. 2010-05-17 01:24:10 +03:00
Modestas Vainius
f87fbec650 Rename (to kFreeBSD_Hurd_fixes.diff) and improve kFreeBSD_fixes.diff to fix FTBFS on GNU/Hurd as well. 2010-05-05 11:49:19 +03:00
Modestas Vainius
5dc3acd737 Add FindGTK2_pangommconfig.diff patch.
Look for Pangomm Config include directory in FindGTK2.cmake (Closes: #579718).
Thanks to Sune Vuorela for the patch.
2010-05-05 11:30:23 +03:00
Modestas Vainius
351ff1be0f Improve FindJNI_fix_libarch_determination.diff patch. 2010-05-05 11:14:56 +03:00
Modestas Vainius
e9e236776c Rewrite _java_libarch determination code in FindJNI.cmake (based on new code in OpenJDK 1.6.0_18).
This should fix invalid _java_libarch detection on mipsel and armel (patch
FindJNI_fix_libarch_determination.diff).
2010-05-01 23:06:26 +03:00
Modestas Vainius
9a1918d166 Add kFreeBSD_fixes.diff patch to fix FTBFS on kfreebsd-*
Fixes failure of the CTestTestTimeout test. kFreeBSD has the same userland as
Linux. This change is necessary to enable kwsysProcessKill() to kill child
processes on kFreeBSD. The bug was detected by CTestTestTimeout test.
2010-03-18 01:44:56 +02:00
Modestas Vainius
27b3dd912d Update debian/patches.
- drop bootstraptest_increase_timeout.diff - merged upstream;
- hurd_platform.diff - adapt to upstream changes.
2010-03-17 14:16:01 +02:00
Modestas Vainius
35ca1848e4 Update bootstraptest_increase_timeout.diff with upstream version.
My previous patch didn't work.
2009-11-23 19:46:44 +02:00