From 128936d7dd17b5cc48c1fc33b2b396c56effb70c Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 13 Apr 2010 09:21:45 +0000 Subject: Revision bump from overlay. Fix boost issues and bundled libform. Remove old. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-util/cmake/ChangeLog | 10 +- dev-util/cmake/Manifest | 17 ++- dev-util/cmake/cmake-2.8.0-r3.ebuild | 157 ----------------------- dev-util/cmake/cmake-2.8.1-r1.ebuild | 157 +++++++++++++++++++++++ dev-util/cmake/files/cmake-2.8.1-FindBoost.patch | 14 ++ dev-util/cmake/files/cmake-2.8.1-libform.patch | 50 ++++++++ 6 files changed, 244 insertions(+), 161 deletions(-) delete mode 100644 dev-util/cmake/cmake-2.8.0-r3.ebuild create mode 100644 dev-util/cmake/cmake-2.8.1-r1.ebuild create mode 100644 dev-util/cmake/files/cmake-2.8.1-FindBoost.patch create mode 100644 dev-util/cmake/files/cmake-2.8.1-libform.patch (limited to 'dev-util') diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 9b3939ce3980..b806383c1b07 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.132 2010/03/17 20:10:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.133 2010/04/13 09:21:44 scarabeus Exp $ + +*cmake-2.8.1-r1 (13 Apr 2010) + + 13 Apr 2010; Tomáš Chvátal + -cmake-2.8.0-r3.ebuild, +cmake-2.8.1-r1.ebuild, + +files/cmake-2.8.1-FindBoost.patch, +files/cmake-2.8.1-libform.patch: + Revision bump from overlay. Fix boost issues and bundled libform. Remove + old. 17 Mar 2010; Fabian Groffen cmake-2.8.1.ebuild, +files/cmake-2.8.1-more-no_host_paths.patch: diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 828ac6afeafb..f7d31a4da3c9 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 AUX cmake-2.6.0-interix.patch 1657 RMD160 fe2e9675da5b66c041d8ae5f1c667cf605494674 SHA1 d21fa5346a939411d579ab308005f7867f012975 SHA256 944401813cd66fdefc68935778fc3fe2328f17a2f00d559dac8add63bb37faf7 AUX cmake-2.6.3-darwin-bundle.patch 952 RMD160 157295c7080e3fa5a1414c6f7efba4877049c5e7 SHA1 595740c64fd64e93763d7b1f59d341f9f8117482 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca @@ -7,16 +10,24 @@ AUX cmake-2.6.4-FindBoost.patch 1094 RMD160 58cbed09bcb5fadf166cf64481f9605b5882 AUX cmake-2.8.0-darwin-default-install_name.patch 911 RMD160 6261482ff3f989ce455ea87cd5c540385420149b SHA1 6c473a538204826210f62fabdfafb2f5f19087bb SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d AUX cmake-2.8.0-darwin-no-app-with-qt.patch 2983 RMD160 088b54f0c1fd7d43867c0479deee0caada3a5fcd SHA1 1737e954c7bbb55f007226c48feac596ac290c45 SHA256 f678cb03ee646a231eedda894e8965bf7bc83b693b249e1ecd4590e933323224 AUX cmake-2.8.0-more-no_host_paths.patch 2981 RMD160 4a6de86385e6bc0c42d49c4860300d590077cc81 SHA1 f13b33f5f8724590ff5edd57486c079fffd08f4b SHA256 e3b6a554239ee0cfc2dcac5298b702d9eca4b403f5839db9bb6ad3f42cfd6d81 +AUX cmake-2.8.1-FindBoost.patch 714 RMD160 8f7d2be9cc63289a3e4f79b43f4b8baa6d980810 SHA1 37925b584dc471148f756bd41158740704dbec37 SHA256 f110d2387c362c518480d804bf1ce9f4881af67755cafd41bb639b09a8afca88 +AUX cmake-2.8.1-libform.patch 1818 RMD160 ca954dfe966cd73836ef9e01ffe8f0eda85f2f91 SHA1 8f8e9a0002b4a95cea7dcfc36c2df16c47008bec SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 AUX cmake-2.8.1-more-no_host_paths.patch 2981 RMD160 fea9f1d96d8c29f55e424389fb4f2471dfe514d8 SHA1 90fdc2ad69aeb54530d1faf4867e40c233caf084 SHA256 0c3fbe76684851ee444be92a99f91e5a5e8dfef02d7426722e10025aeca03412 AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb AUX cmake-FindPythonInterp.patch 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0 AUX cmake-FindPythonLibs.patch 546 RMD160 429021001f1b464d8321703052890a34141a34ec SHA1 e5d62feab16058f123e1399e0504a50f50ee5a88 SHA256 86a5e78ff4e62cf8987401255197f7ba4ae70d00c257df3048372c5dcc035bdd AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 DIST cmake-2.6.4.tar.gz 3285371 RMD160 e4217067537f76e52317514cb5bb0cf38733d16a SHA1 c7e295683e061c2ed19773a1f0444972f75db092 SHA256 9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2 -DIST cmake-2.8.0.tar.gz 3553247 RMD160 27e80a14b4970d85b12aaf18fbe738c02dc0620f SHA1 c35cb0d787c53aee768b154f05b68d3a20eccb3d SHA256 847d615ecadb97f2cd05964cad6b019b68a952cad0db1e8c05222dfc599f476d DIST cmake-2.8.1.tar.gz 3605611 RMD160 38b0876597def32a535d5305fb8f706ff29beabe SHA1 fb93c8766a3bd71f2a824291717700c118d29be5 SHA256 4b65b819c00874c34196640411f6f9e877abf23733ba0ef68f73b4fafd3b3022 EBUILD cmake-2.6.4-r3.ebuild 3476 RMD160 e20f6f85b5291ced7e3ee53ff933a0da704b8f14 SHA1 72bb72aeea2261d1c5c5642018234803c35c32c5 SHA256 1c4a2f60dffb72d1134932b580e46d07a7784420a0c786f204d4b71dbfd928f0 -EBUILD cmake-2.8.0-r3.ebuild 4069 RMD160 12022d46022fd372c4937470fc379cdfbaa7d78e SHA1 fb128c65975b50818e735d47c22898322ea22d86 SHA256 f56856bfe9020a96409daf183cecee58281a0873deaef0c879bbb9d196c48a1d +EBUILD cmake-2.8.1-r1.ebuild 4047 RMD160 5d68604c2c9ffb76ef400058a61f73ab6de73643 SHA1 b36f343d961b0b030e142b63fb5c4b7f60ed7830 SHA256 c8cb7c23043afddaa9ae646eba211d226ab8f1bb8f9b56be69167acb6383251f EBUILD cmake-2.8.1.ebuild 4060 RMD160 9b0fc37214b5368b83fe922736deb17838fe9557 SHA1 19927fd33f4671558cfd4086b3e83a0d71ef7c7c SHA256 713f767eb2017664b46b4c215f04516b1eaf17e932c8b5f8d988ccfdfaf619ee -MISC ChangeLog 20556 RMD160 5022d1ef9a4b8932b5b714fba6ea728c65077fff SHA1 e93ccb893fabc65279892178feb39852381286b5 SHA256 64676bc182f047ddea013e636cb37c0d6be1e29d609f9a7ee1fa7e7fc76e8f31 +MISC ChangeLog 20849 RMD160 f8f07f81a59bcd58cb814dd290679bff6a9ebaa0 SHA1 5e4176be721b86d117adab76d997bee4779884e7 SHA256 da456053179314d1076e595c93ee261673b7a1df00758dcb741f1fba3d22146e MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvEN6gACgkQHB6c3gNBRYcL1ACfUiJE9mVuxs6Lx0aknm8bJWMB +IGcAnRv7cc5cSa+MI8KVBcWG7jKiLUlN +=2/de +-----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.8.0-r3.ebuild b/dev-util/cmake/cmake-2.8.0-r3.ebuild deleted file mode 100644 index 0020e090f984..000000000000 --- a/dev-util/cmake/cmake-2.8.0-r3.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0-r3.ebuild,v 1.1 2010/03/17 12:07:00 scarabeus Exp $ - -EAPI="2" - -inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils - -MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses qt4 vim-syntax" - -DEPEND=" - >=net-misc/curl-7.20.0-r1[ssl] - >=dev-libs/expat-2.0.1 - sys-libs/zlib - ncurses? ( sys-libs/ncurses ) - qt4? ( x11-libs/qt-gui:4 ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -S="${WORKDIR}/${MY_P}" - -CMAKE_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-FindPythonLibs.patch - "${FILESDIR}"/${PN}-FindPythonInterp.patch - "${FILESDIR}"/${PN}-2.6.0-interix.patch - "${FILESDIR}"/${P}-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${P}-darwin-default-install_name.patch - "${FILESDIR}"/${P}-darwin-no-app-with-qt.patch -) - -src_prepare() { - base_src_prepare - - use prefix || EPREFIX= - - # Add gcc libs to the default link paths - sed -i \ - -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" -} - -src_configure() { - if [[ "$(gcc-major-version)" -eq "3" ]] ; then - append-flags "-fno-stack-protector" - fi - - bootstrap=0 - has_version ">=dev-util/cmake-2.6.1" || bootstrap=1 - if [[ ${bootstrap} = 0 ]]; then - # Required version of CMake found, now test if it works - cmake --version &> /dev/null || bootstrap=1 - fi - - if [[ ${bootstrap} = 1 ]]; then - local qt_arg par_arg - tc-export CC CXX LD - - if use qt4; then - qt_arg="--qt-gui" - else - qt_arg="--no-qt-gui" - fi - - echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - ./bootstrap \ - --system-libs \ - --prefix="${EPREFIX}"/usr \ - --docdir=/share/doc/${PF} \ - --datadir=/share/${PN} \ - --mandir=/share/man \ - "$qt_arg" \ - "$par_arg" || die "./bootstrap failed" - else - # this is way much faster so we should prefer it if some cmake is - # around. - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - $(cmake-utils_use_build ncurses CursesDialog) - $(cmake-utils_use_build qt4 QtDialog) - ) - cmake-utils_src_configure - fi -} - -src_compile() { - cmake-utils_src_compile - if use emacs; then - elisp-compile Docs/cmake-mode.el || die "elisp compile failed" - fi -} - -src_test() { - emake test || die "Tests failed" -} - -src_install() { - cmake-utils_src_install - if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins Docs/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Docs/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${VIMFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-2.8.1-r1.ebuild b/dev-util/cmake/cmake-2.8.1-r1.ebuild new file mode 100644 index 000000000000..eba8400356da --- /dev/null +++ b/dev-util/cmake/cmake-2.8.1-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +EAPI="3" + +inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils + +MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="http://www.cmake.org/" +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" + +LICENSE="CMake" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="emacs ncurses qt4 vim-syntax" + +DEPEND=" + >=net-misc/curl-7.20.0-r1[ssl] + >=dev-libs/expat-2.0.1 + sys-libs/zlib + ncurses? ( sys-libs/ncurses ) + qt4? ( x11-libs/qt-gui:4 ) +" +RDEPEND="${DEPEND} + emacs? ( virtual/emacs ) + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + ) +" + +SITEFILE="50${PN}-gentoo.el" +VIMFILE="${PN}.vim" + +S="${WORKDIR}/${MY_P}" + +CMAKE_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-FindPythonLibs.patch + "${FILESDIR}"/${PN}-FindPythonInterp.patch + "${FILESDIR}"/${PN}-2.6.0-interix.patch + "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch + "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch + "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch + "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch + "${FILESDIR}"/${PN}-2.8.0-darwin-no-app-with-qt.patch + "${FILESDIR}"/${PN}-2.8.1-more-no_host_paths.patch + "${FILESDIR}"/${PN}-2.8.1-FindBoost.patch + "${FILESDIR}"/${PN}-2.8.1-libform.patch +) + +src_prepare() { + base_src_prepare + + # Add gcc libs to the default link paths + sed -i \ + -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" +} + +src_configure() { + if [[ "$(gcc-major-version)" -eq "3" ]] ; then + append-flags "-fno-stack-protector" + fi + + bootstrap=0 + has_version ">=dev-util/cmake-2.6.1" || bootstrap=1 + if [[ ${bootstrap} = 0 ]]; then + # Required version of CMake found, now test if it works + cmake --version &> /dev/null || bootstrap=1 + fi + + if [[ ${bootstrap} = 1 ]]; then + local qt_arg par_arg + tc-export CC CXX LD + + if use qt4; then + qt_arg="--qt-gui" + else + qt_arg="--no-qt-gui" + fi + + echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null + if [ $? -eq 0 ]; then + par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+') + par_arg="--parallel=${par_arg}" + else + par_arg="--parallel=1" + fi + + ./bootstrap \ + --system-libs \ + --prefix="${EPREFIX}"/usr \ + --docdir=/share/doc/${PF} \ + --datadir=/share/${PN} \ + --mandir=/share/man \ + "$qt_arg" \ + "$par_arg" || die "./bootstrap failed" + else + # this is way much faster so we should prefer it if some cmake is + # around. + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + $(cmake-utils_use_build ncurses CursesDialog) + $(cmake-utils_use_build qt4 QtDialog) + ) + cmake-utils_src_configure + fi +} + +src_compile() { + cmake-utils_src_compile + if use emacs; then + elisp-compile Docs/cmake-mode.el || die "elisp compile failed" + fi +} + +src_test() { + emake test || die "Tests failed" +} + +src_install() { + cmake-utils_src_install + if use emacs; then + elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins Docs/cmake-syntax.vim + + insinto /usr/share/vim/vimfiles/indent + doins Docs/cmake-indent.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${VIMFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch new file mode 100644 index 000000000000..56fb152d663a --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch @@ -0,0 +1,14 @@ +diff -u -r cmake-2.8.1.orig/Modules/FindBoost.cmake cmake-2.8.1/Modules/FindBoost.cmake +--- cmake-2.8.1.orig/Modules/FindBoost.cmake 2010-03-16 21:29:29.000000000 +0100 ++++ cmake-2.8.1/Modules/FindBoost.cmake 2010-04-04 19:52:50.000000000 +0200 +@@ -70,7 +70,9 @@ + # omit the 3rd version number from include paths if it is 0 although not all + # binary Boost releases do so. + # +-# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0") ++SET(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" ++ "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" ++ "1.43" "1.42.0" "1.42") + # + # ===================================== ============= ======================== + # diff --git a/dev-util/cmake/files/cmake-2.8.1-libform.patch b/dev-util/cmake/files/cmake-2.8.1-libform.patch new file mode 100644 index 000000000000..87c724776e50 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.1-libform.patch @@ -0,0 +1,50 @@ +diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt +--- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100 ++++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200 +@@ -314,9 +314,6 @@ + ELSE (UNIX) + SET(BUILD_CursesDialog 0) + ENDIF (UNIX) +- IF(BUILD_CursesDialog) +- ADD_SUBDIRECTORY(Source/CursesDialog/form) +- ENDIF(BUILD_CursesDialog) + ENDMACRO (CMAKE_BUILD_UTILITIES) + + +diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt +--- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100 ++++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200 +@@ -25,13 +25,18 @@ + CursesDialog/ccmake + ) + +-INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form +- ${CMake_BINARY_DIR}/Source/CursesDialog/form) + INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH}) + + + ADD_EXECUTABLE(ccmake ${CURSES_SRCS} ) + TARGET_LINK_LIBRARIES(ccmake CMakeLib) +-TARGET_LINK_LIBRARIES(ccmake cmForm) ++TARGET_LINK_LIBRARIES(ccmake form) ++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) ++IF(CURSES_EXTRA_LIBRARY) ++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) ++ENDIF(CURSES_EXTRA_LIBRARY) ++ + + INSTALL_TARGETS(/bin ccmake) ++ ++ +diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h +--- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100 ++++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200 +@@ -15,8 +15,6 @@ + #define _MSE_INT_H + #endif + +-#include +- + #if defined(__hpux) + # define _BOOL_DEFINED + # include -- cgit v1.2.3-65-gdbad