ohnobinki_overlay Changeset - a11d47a6cf00

Changeset - a11d47a6cf00

Parent rev.

Child rev.

[Not reviewed]

default

6 2 8

Nathan Brink (binki) - 14 years ago 2011-01-11 00:03:51
ohnobinki@ohnopublishing.net

dev-util/cmake: Bump cmake with my lib32 patch to cmake-2.8.3-r1, following gentoo-x86's changes.

(Portage version: 2.2.0_alpha11-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

15 files changed with 279 insertions and 271 deletions:

dev-util/cmake/ChangeLog

dev-util/cmake/Manifest

dev-util/cmake/cmake-2.8.3-r1.ebuild

dev-util/cmake/files/cmake-2.6.0-interix.patch

dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch

108

dev-util/cmake/files/cmake-2.8.1-mpi.patch

dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch

dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch

dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch

dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch

dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch

dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch

109

dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch

dev-util/cmake/files/cmake-FindPythonInterp.patch

dev-util/cmake/files/cmake-FindPythonLibs.patch

0 comments (0 inline, 0 general)

dev-util/cmake/ChangeLog

➞

Show inline comments

@@ @@ -2,6 +2,20 @@ @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.144 2010/09/11 15:13:49 armin76 Exp $
 Jan 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
   -files/cmake-2.6.0-interix.patch, -cmake-2.8.1-r3.ebuild,
   -files/cmake-2.8.1-more-no_host_paths.patch, -files/cmake-2.8.1-mpi.patch,
   +cmake-2.8.3-r1.ebuild, +files/cmake-2.8.3-FindLibArchive.patch,
   +files/cmake-2.8.3-FindPythonInterp.patch,
   +files/cmake-2.8.3-FindPythonLibs.patch,
   +files/cmake-2.8.3-buffer_overflow.patch,
   +files/cmake-2.8.3-fix_assembler_test.patch,
   +files/cmake-2.8.3-more-no_host_paths.patch,
   +files/cmake-2.8.3-ruby_libname.patch,
   -files/cmake-FindPythonInterp.patch, -files/cmake-FindPythonLibs.patch:
   Bump cmake with my lib32 patch to cmake-2.8.3-r1, following gentoo-x86's
   changes.
 Jan 2011; Nathan Brink <ohnobinki@gentoo.org> -cmake-2.6.4-r3.ebuild:
   Drop cmake-2.6.4-r3 as official portage tree dropped cmake-2.6.

dev-util/cmake/Manifest

➞

Show inline comments

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 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
 AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead147bc1e2ae41f429 SHA1 5458b92849292d9e8ca3003654a94e339cb4a48c SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439
 AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371a0b2e11d252b96c9 SHA1 6f88171a816c1157ddcf3c3d5c3e3ec080471883 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7
@@ @@ -8,14 +10,34 @@ AUX cmake-2.8.0-darwin-default-install_n @@
 AUX cmake-2.8.0-darwin-no-app-with-qt.patch 2983 RMD160 088b54f0c1fd7d43867c0479deee0caada3a5fcd SHA1 1737e954c7bbb55f007226c48feac596ac290c45 SHA256 f678cb03ee646a231eedda894e8965bf7bc83b693b249e1ecd4590e933323224
 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-2.8.1-mpi.patch 857 RMD160 d41e4dd445b1a79d0a82619a8ad7371e80d937a8 SHA1 0192124d023953d35cb5fb0da148c914525099e6 SHA256 64092fbf637bfe625cf58abe93844aab2e75ba22a00e5ffdb05188961b7f51d7
 AUX cmake-2.8.1-portage-multilib-lib32.patch 7242 RMD160 47738f73dfe42b9a2996b44bd860537881274616 SHA1 ef49749595ac38ac7d3c69c1494db0b52cab65e5 SHA256 732024767399d379a4626dc51b063d8cdd12dfcfa69f8f0b31d8be303e540d4c
 AUX cmake-2.8.3-FindLibArchive.patch 651 RMD160 ccff38785a20e66b3fbd7ea95c46b05052d7e4de SHA1 8c3ba96c7f4bd901a9089e7af315f22c78eb1d6c SHA256 521bc573c94f4a62c949caf0690902f1290d35969f68870967aa699caff60364
 AUX cmake-2.8.3-FindPythonInterp.patch 550 RMD160 c02295ce79f97cd6be16f90e3c89ad6deed09b4a SHA1 f8a67cd872b90a6dd77626bfd766f788b0775655 SHA256 96ebc2ae19a4d366ef4ed57db44ebd3baa6fb652d8bf5ea6867f64f972d7134e
 AUX cmake-2.8.3-FindPythonLibs.patch 550 RMD160 b060930247da3d716fa9592d2d68ddec7d9c488f SHA1 4040bc3749b5f0e12ed07eb765d8863988352814 SHA256 fa6dcfad7c110c5ac264606aa7716c1d6078242802ee9fafc34e9a725cefd755
 AUX cmake-2.8.3-buffer_overflow.patch 525 RMD160 ba871f7c1892e7efaef69dd6b8e2012009f6b4fa SHA1 687019517947113c6d4933e911516d115df9e6d9 SHA256 a55fa858bea5ce6f696b6eb0385c8028e6c4e329f4c44d66d6008da56ca684a2
 AUX cmake-2.8.3-fix_assembler_test.patch 968 RMD160 b2469fea53858b882a6850838bb23db8428ccff4 SHA1 d76592ae0ce5ec1252e3f66642cd84c9f367f0a6 SHA256 59db2b7de7afcbfbf0cee0ef3a1561b1ff5943c7ad9a9b4e7265476f7a40ddfe
 AUX cmake-2.8.3-more-no_host_paths.patch 3052 RMD160 fb11585292980d19a2810a7ce5741c94aa7391a3 SHA1 3980e7b522ebe934fbf0625221cc5b42e2e19716 SHA256 55165d67bad9def6b349bf67d02ede28a2fc291d28a2a5296897e25980ce623c
 AUX cmake-2.8.3-ruby_libname.patch 558 RMD160 b701ba52d7e13e69f25914ab661dcf9e7c7a606e SHA1 df61342fdae8b659ecb06fde85247f2c736501da SHA256 8205e354d78827b2a4cf67fb9d88fee39696398db07d1fa4f8d33c2bbeda3748
 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.8.1.tar.gz 3605611 RMD160 38b0876597def32a535d5305fb8f706ff29beabe SHA1 fb93c8766a3bd71f2a824291717700c118d29be5 SHA256 4b65b819c00874c34196640411f6f9e877abf23733ba0ef68f73b4fafd3b3022
 EBUILD cmake-2.8.1-r3.ebuild 4348 RMD160 8e61214bfc873906474474ea4e4b32c57b835a79 SHA1 66bf8f5962fb7237972b8aaf3f4963588fbc0294 SHA256 bb36cee8c233507bf17e2f094946ceaf530bc51244570d86b04351fac9398999
 MISC ChangeLog 23489 RMD160 d1b7a30ad5db935501c7d08f9289422bcb038775 SHA1 e08473e87523c5c1bc9daddc81c47e8846c9f7f4 SHA256 fa7463c64d928bd53345e4154f56011129b24793c761b44e9ce3c20c24cd3199
 DIST cmake-2.8.3.tar.gz 5436543 RMD160 8bcba88ad884e22bbadf4c594a5f3b0bdbf2e12c SHA1 e9bfbec47b3939be6f83ffa8006884285c687dc2 SHA256 689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288
 EBUILD cmake-2.8.3-r1.ebuild 4118 RMD160 b84726dfca7379fe5f50e2a579ff4e5737b28ff5 SHA1 4e85de9f8f5a672a93b2c3661e3d6f2b48e74c87 SHA256 be97f0915140b617891995930f5c2f9a8e034b4672885b2b7b75384fbce3a400
 MISC ChangeLog 24196 RMD160 5455ecdbc9b3266325e972334eb0ae46d48d7c71 SHA1 4ea048120cea931e3d1bec9885de7da643ed0536 SHA256 0192a6f11a705f298e238b7112d21dc8790dacfff634e2d6b33f772c42930610
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJNK+S2AAoJEHQ6UuhrqBBQg3wP/i0RcPatg3nTePsegg2sMKxy
 ET0JnnDBAyzazk5DhMvw6qlL0/jNSlY3gLfTPR/pNhIaysI0FcGW+XWQHe5dqiDM
 bngZSm+Bedo9r8+p7dk9smzI3UPWsITqUH9OVfJXnZPo7Q8e6bqq5fZ4Wfibg80B
 xzPuFuDtLa+EhBWAvjRcTwQKJknkSunCxe7MFDLmvl7NfPrQNez1VjFXoiZDlC5N
 BCr2KQIo/y8xkQ2KdYG+6fOc46l8akaGDqE3Z+Z6zFJjQ29on/dzwoHlXnx0kr94
 xh93qzM3AySYICNdW8T89oDa3wZXx5PKf42iTYfWC5j/ASBHByjDA6cEffP0mt8v
 gvvJRxqCwrxKIhxLOJtvxzCMaKaiZeTW+tthUs1e7WWfDV5471A/9xST4PFTuO7O
 u9K4ZTyGX3p3Wo5PQ7gG+VkimNvTO1UiRTKuwSPhzopIZD0X2pOhkH8Rw/W83Duy
 ORCcVP9wp0o+vgf8AyIWISLE+ccazOiJeGiTdScoJDzOv3CmDOubRscj4CPbmIIH
 eydqXjtK2o9Kuz0bdRE9AVpqDtYk1eestX9Tfsv5EdSqndsvfWYFLp/leE3HnI9X
 aPQp6R2IL5J4o1u8TZihk9R2mCSW5WsO/ojyCOSbP+FpYCkN0YJzzfuVZP+Az9Mv
 vOhjvX0M+Y+xHGJHNzyH
 =Rb9H
 -----END PGP SIGNATURE-----

dev-util/cmake/cmake-2.8.3-r1.ebuild

➞

Show inline comments

-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
@@ @@ -18,6 +18,7 @@ SLOT="0" @@
 IUSE="emacs ncurses qt4 vim-syntax"
 DEPEND="
 	>=app-arch/libarchive-2.8.0
 	>=net-misc/curl-7.20.0-r1[ssl]
 	>=dev-libs/expat-2.0.1
 	sys-libs/zlib
@@ @@ -39,92 +40,77 @@ VIMFILE="${PN}.vim" @@
 S="${WORKDIR}/${MY_P}"
 CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 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
 	"${FILESDIR}"/${PN}-2.8.1-mpi.patch
 	"${FILESDIR}"/${PN}-2.8.3-FindLibArchive.patch
 	"${FILESDIR}"/${PN}-2.8.3-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-2.8.3-FindPythonInterp.patch
 	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
 	"${FILESDIR}"/${PN}-2.8.3-buffer_overflow.patch
 	"${FILESDIR}"/${PN}-2.8.3-fix_assembler_test.patch
 	"${FILESDIR}"/${PN}-2.8.1-portage-multilib-lib32.patch
+)
 _src_bootstrap() {
 	  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
 	tc-export CC CXX LD
 	./bootstrap \
 		--prefix="${T}/cmakestrap/" \
 		${par_arg} \
 		|| die "Bootstrap failed"
+}
 src_prepare() {
 	base_src_prepare
 	# disable bootstrap cmake and make run, we use eclass for that
 	sed -i \
 		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
 		bootstrap || die "sed failed"
 	# Add gcc libs to the default link paths
 	sed -i \
 		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib|g" \
+		-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_bootstrap
+}
 src_configure() {
 	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
 		append-flags "-fno-stack-protector"
 	fi
 	# make things work with gentoo java setup
 	# in case java-config cannot be run, the variable just becomes unset
 	# per bug #315229
 	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
 	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
 	use test && bootstrap=1 #315223
 	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
 	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
+}
 src_compile() {
@@ @@ -146,13 +132,13 @@ src_install() { @@
 	fi
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
 		doins Docs/cmake-syntax.vim
+		doins Docs/cmake-syntax.vim || die
 		insinto /usr/share/vim/vimfiles/indent
 		doins Docs/cmake-indent.vim
+		doins Docs/cmake-indent.vim || die
 		insinto /usr/share/vim/vimfiles/ftdetect
 		doins "${FILESDIR}/${VIMFILE}"
+		doins "${FILESDIR}/${VIMFILE}" || die
 	fi
+}

dev-util/cmake/files/cmake-2.6.0-interix.patch

➞

Show inline comments

deleted file

dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch

➞

Show inline comments

deleted file

dev-util/cmake/files/cmake-2.8.1-mpi.patch

➞

Show inline comments

deleted file

dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch

➞

Show inline comments

@@ new file 100644 @@
 diff -ruN cmake-2.8.3.orig/Modules/FindLibArchive.cmake cmake-2.8.3/Modules/FindLibArchive.cmake
 --- cmake-2.8.3.orig/Modules/FindLibArchive.cmake	2010-11-04 02:58:27.000000000 +0700
 +++ cmake-2.8.3/Modules/FindLibArchive.cmake	2010-11-05 17:40:53.712001939 +0700
@@ -50,7 +50,7 @@
  # Handle the QUIETLY and REQUIRED arguments and set LIBARCHIVE_FOUND
  # to TRUE if all listed variables are TRUE.
 -include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake")
 +include("${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake")
  find_package_handle_standard_args(LibArchive DEFAULT_MSG
    LibArchive_LIBRARY LibArchive_INCLUDE_DIR
+   )

dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch

➞

Show inline comments

@@ new file 100644 @@
 --- Modules/FindPythonInterp.cmake
 +++ Modules/FindPythonInterp.cmake
@@ -20,7 +20,7 @@
  #  License text for the above reference.)
  FIND_PROGRAM(PYTHON_EXECUTABLE
 -  NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
 +  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
    PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]

dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch

➞

Show inline comments

@@ new file 100644 @@
 --- Modules/FindPythonLibs.cmake
 +++ Modules/FindPythonLibs.cmake
@@ -27,7 +27,9 @@
  # Search for the python framework on Apple.
  CMAKE_FIND_FRAMEWORKS(Python)
 -FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
 +EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
 +  OUTPUT_VARIABLE _PYTHON_VERSION)
 +FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION})
    STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
    IF(WIN32)
      FIND_LIBRARY(PYTHON_DEBUG_LIBRARY

dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch

➞

Show inline comments

@@ new file 100644 @@
 diff -urN cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx cmake-2.8.3//Source/kwsys/SystemInformation.cxx
 --- cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx	2010-12-25 16:56:42.609163498 +0100
 +++ cmake-2.8.3//Source/kwsys/SystemInformation.cxx	2010-12-25 17:25:18.002163499 +0100
@@ -152,7 +152,7 @@
  public:
  #define VENDOR_STRING_LENGTH    (12 + 1)
 -#define CHIPNAME_STRING_LENGTH    (48 + 1)
 +#define CHIPNAME_STRING_LENGTH    (68 + 1)
  #define SERIALNUMBER_STRING_LENGTH  (29 + 1)
    typedef struct tagID

dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch

➞

Show inline comments

@@ new file 100644 @@
 diff -urN cmake-2.8.3.orig/Tests/Assembler/CMakeLists.txt cmake-2.8.3/Tests/Assembler/CMakeLists.txt
 --- cmake-2.8.3.orig/Tests/Assembler/CMakeLists.txt	2010-12-25 16:56:42.646163500 +0100
 +++ cmake-2.8.3/Tests/Assembler/CMakeLists.txt	2010-12-25 20:18:17.156163502 +0100
@@ -11,8 +11,11 @@
      enable_language(ASM-ATT OPTIONAL)
      if(CMAKE_ASM-ATT_COMPILER_WORKS)
        message(STATUS "Trying to enable ASM-ATT for Linux/x86 - succeeded")
 -      # this assembler file was created using gcc -S main.c
 -      set(SRCS main-linux-x86-gas.s)
 +      # generate assembler file
 +	  execute_process(COMMAND ${CMAKE_C_COMPILER} -S
 +			  "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o
 +			  "${CMAKE_CURRENT_BINARY_DIR}/main-linux-x86-gas.s")
 +	  set(SRCS ${CMAKE_CURRENT_BINARY_DIR}/main-linux-x86-gas.s)
      endif(CMAKE_ASM-ATT_COMPILER_WORKS)
    endif(CMAKE_SYSTEM MATCHES Linux OR CMAKE_SYSTEM MATCHES FreeBSD)
  endif(NOT SRCS AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$")

dev-util/cmake/files/cmake-2.8.3-more-no_host_paths.patch

➞

Show inline comments

@@ new file 100644 @@
 Set some proper paths to make cmake find our tools.
 Original patch by Heiko Przybyl
 The ebuild now adds an extra / at the end of $EPREFIX so that it is
 never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
 correct)
 --- cmake-2.8.3/Modules/Platform/Darwin.cmake
 +++ cmake-2.8.3/Modules/Platform/Darwin.cmake
@@ -217,19 +217,23 @@
 -# default to searching for frameworks first
 -SET(CMAKE_FIND_FRAMEWORK FIRST)
 +# default to searching for frameworks last
 +SET(CMAKE_FIND_FRAMEWORK LAST)
  # set up the default search directories for frameworks
  SET(CMAKE_SYSTEM_FRAMEWORK_PATH
 +  @GENTOO_PORTAGE_EPREFIX@Frameworks
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib
    ~/Library/Frameworks
    /Library/Frameworks
    /Network/Library/Frameworks
    /System/Library/Frameworks)
 -# default to searching for application bundles first
 -SET(CMAKE_FIND_APPBUNDLE FIRST)
 +# default to searching for application bundles last
 +SET(CMAKE_FIND_APPBUNDLE LAST)
  # set up the default search directories for application bundles
  SET(CMAKE_SYSTEM_APPBUNDLE_PATH
 +  @GENTOO_PORTAGE_EPREFIX@Applications
 +  @GENTOO_PORTAGE_EPREFIX@usr/bin
    ~/Applications
    /Applications
    /Developer/Applications)
 diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
 --- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
 +++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
@@ -33,6 +33,7 @@
  # search types.
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
 +  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
    /usr/local /usr /
    # CMake install location
@@ -44,43 +45,39 @@
  # List common include file locations not under the common prefixes.
  LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
 -  # Windows API on Cygwin
 -  /usr/include/w32api
+-
 -  # X11
 -  /usr/X11R6/include /usr/include/X11
+-
 -  # Other
 -  /usr/pkg/include
 -  /opt/csw/include /opt/include
 -  /usr/openwin/include
 +  @GENTOO_PORTAGE_EPREFIX@usr/include
+   )
  LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
 -  # Windows API on Cygwin
 -  /usr/lib/w32api
+-
 -  # X11
 -  /usr/X11R6/lib /usr/lib/X11
+-
 -  # Other
 -  /usr/pkg/lib
 -  /opt/csw/lib /opt/lib
 -  /usr/openwin/lib
 +  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
 +  @GENTOO_PORTAGE_GCCLIBDIR@
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib64
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib32
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib
 +  @GENTOO_PORTAGE_EPREFIX@lib
+   )
  LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
 +  @GENTOO_PORTAGE_EPREFIX@usr/bin
 +  @GENTOO_PORTAGE_EPREFIX@bin
+   )
  LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 +  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
 +  @GENTOO_PORTAGE_GCCLIBDIR@
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib64
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib32
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib
 +  @GENTOO_PORTAGE_EPREFIX@lib
    /lib /usr/lib /usr/lib32 /usr/lib64
+   )
  LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
 +  @GENTOO_PORTAGE_EPREFIX@usr/include
    /usr/include
+   )
  LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
 +  @GENTOO_PORTAGE_EPREFIX@usr/include
    /usr/include
+   )

dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch

➞

Show inline comments

@@ new file 100644 @@
 diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake
 --- cmake-2.8.3.orig//Modules/FindRuby.cmake	2010-12-25 16:56:42.597163498 +0100
 +++ cmake-2.8.3//Modules/FindRuby.cmake	2010-12-25 16:57:55.207163499 +0100
@@ -180,7 +180,7 @@
  # Determine the list of possible names for the ruby library
 -SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
 +SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
  IF(WIN32)
     SET( _RUBY_MSVC_RUNTIME "" )

dev-util/cmake/files/cmake-FindPythonInterp.patch

➞

Show inline comments

deleted file

dev-util/cmake/files/cmake-FindPythonLibs.patch

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)