Adding patch for language selective openmp support testing, http://public.kitware.com/Bug/view.php?id=11910 ; approved by tampakrap

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 281 insertions, 2 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index cb7ca91722e7..a9c575811f39 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.185 2012/01/30 22:28:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.186 2012/02/06 13:52:50 jlec Exp $
+
+*cmake-2.8.7-r3 (06 Feb 2012)
+
+  06 Feb 2012; Justin Lecher <jlec@gentoo.org> +cmake-2.8.7-r3.ebuild,
+  +files/cmake-2.8.7-FindOpenMP.patch:
+  Adding patch for language selective openmp support testing,
+  http://public.kitware.com/Bug/view.php?id=11910 ; approved by tampakrap
 
 *cmake-2.8.7-r2 (30 Jan 2012)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index f76ba0627fc0..bff0040aeccd 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00
 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
@@ -16,6 +19,7 @@ AUX cmake-2.8.6-FindBLAS-2.patch 1119 RMD160 e7b3976c2ef7c0358e9b1b90e567e4ef1d4
 AUX cmake-2.8.6-FindLAPACK-2.patch 1158 RMD160 2fb17c71e08e930ed9a71f59a4316c35749159b2 SHA1 6e4b552ea1d9a6a464089935a50ed1152b2323d1 SHA256 2caacc85c393d9ad09f2c92d0595480d1e02b8db6285aa35f270858075465425
 AUX cmake-2.8.6-testsvn17.patch 1033 RMD160 2fa56bf0177607c88c2e2960b2839b2df8820f2e SHA1 20b1003e391c44d8854105efa8592ac9b7ab6f2c SHA256 6d90df7a5472eeb8be81a70ee4a5f5850bb9d469ef9390af930ba7d6d528183b
 AUX cmake-2.8.7-FindBoost-python.patch 5334 RMD160 eca921c1f0b0a335a108ac1e4af92cd14ab2d59f SHA1 c30778b6a0842a09a0ac848127323d7bbba0e99b SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68
+AUX cmake-2.8.7-FindOpenMP.patch 3265 RMD160 d37d4c56b1a15e33fa62931f5332cf4d78005b8c SHA1 e78974bb5390952cc351ea88dca45dc098803480 SHA256 0bd38ba40fc6dcc1ab462c6e27e4f3a3dca6451881ba46c1ff87b1af3b200c40
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc
 DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878 SHA1 7c2cbd42d27e26580cd4923892197b84b2a90675 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e
@@ -24,5 +28,13 @@ EBUILD cmake-2.8.4-r1.ebuild 4510 RMD160 64efe5aa8c2b68908940ccf922d4754fc1a40d0
 EBUILD cmake-2.8.6-r4.ebuild 4915 RMD160 b817bf8e64793283b5a5dc35d26a177e73556683 SHA1 7fb8d87771d09ddf37d38f5478d1eb900be6c6e1 SHA256 9fee01dba430251621545d750b21ec99e3d34d1141557c1190efed2f4b293326
 EBUILD cmake-2.8.7-r1.ebuild 4789 RMD160 78e7ed0125f90b20757ea5915bf21d99eafc5a25 SHA1 8b9d6b4772856464ec846bb8cb9dcc95574f00f6 SHA256 d75c810da5d5ce0a8e919657846d00f5d43156ce0e1ddb5e2d51c92ea7c33db1
 EBUILD cmake-2.8.7-r2.ebuild 4844 RMD160 947b497d9dc07f88ce385c06c5af4b936ad5912d SHA1 87784105bfd44dfcef12b3dfe293d57564a48a59 SHA256 80540f7c5a663abea761d853c6a806bca9eeaf85da19f2120013965e862476e9
-MISC ChangeLog 29671 RMD160 224b89856b862a9aa4278aa0b779949d08cbe193 SHA1 ec99bfe442333100cc9e39ebbf1e64151a7313e2 SHA256 674a43a406a0d876c3539d1d42bded78b8d6a519c602778b00b0957b3a2d3b5c
+EBUILD cmake-2.8.7-r3.ebuild 4883 RMD160 9ff5d938fa0a1bbfe3a25dbc480d8d05700b77c1 SHA1 407497914318ae223746fa2ae2d9ff6330679198 SHA256 af301c62aa45bb754aee62bcfa46bc27ed07c609d258f04d5f103cdc01fe038c
+MISC ChangeLog 29944 RMD160 7c88175c490ed7c4c0d906111f03f523467d7697 SHA1 7d8085aeb7991aa5aae281639537f6d38ae4f450 SHA256 b5450643202b0143bc89fb2e6455fa43783b6582f8f2e97e05090ab42328a230
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk8v2zcACgkQgAnW8HDreRZyzQCfWPvCsTuqPItTaj8bivA61//O
+NpQAn07s7Y6jQ+4OpUzHwETv61Q5AXQy
+=LeS0
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.7-r3.ebuild b/dev-util/cmake/cmake-2.8.7-r3.ebuild
new file mode 100644
index 000000000000..e3399194c221
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.7-r3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r3.ebuild,v 1.1 2012/02/06 13:52:50 jlec Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+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="
+	>=app-arch/libarchive-2.8.0
+	>=net-misc/curl-7.20.0-r1[ssl]
+	>=dev-libs/expat-2.0.1
+	dev-util/pkgconfig
+	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_BINARY="${S}/Bootstrap.cmk/cmake"
+
+# Fixme:
+# Boost patchset is foobared and should respect eselect / slotting
+PATCHES=(
+	"${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.1-libform.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
+	"${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
+	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindOpenMP.patch
+)
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	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"
+}
+
+cmake_src_test() {
+	# fix OutDir test
+	# this is altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+	#        as it was never intended to be used this way.
+	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E BootstrapTest SimpleCOnly_sdcc \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	einfo "Fixing java access violations ..."
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# disable running of cmake in boostrap command
+	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_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	# 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)
+
+	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() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		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.7-FindOpenMP.patch b/dev-util/cmake/files/cmake-2.8.7-FindOpenMP.patch
new file mode 100644
index 000000000000..70e85d856cd2
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.7-FindOpenMP.patch
@@ -0,0 +1,83 @@
+http://public.kitware.com/Bug/view.php?id=11910
+--- Modules/FindOpenMP.cmake	2011-03-01 17:34:59.000000000 +0900
++++ Modules/FindOpenMP.cmake	2011-03-01 17:35:26.000000000 +0900
+@@ -72,41 +72,53 @@
+ endif(DEFINED OpenMP_C_FLAGS AND DEFINED OpenMP_CXX_FLAGS)
+ 
+ # check c compiler
+-foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
+-  set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+-  set(CMAKE_REQUIRED_FLAGS "${FLAG}")
+-  unset(OpenMP_FLAG_DETECTED CACHE)
+-  message(STATUS "Try OpenMP C flag = [${FLAG}]")
+-  check_c_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
+-  set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
+-  if(OpenMP_FLAG_DETECTED)
+-    set(OpenMP_C_FLAGS_INTERNAL "${FLAG}")
+-    break()
+-  endif(OpenMP_FLAG_DETECTED) 
+-endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
++IF (CMAKE_C_COMPILER)
++  foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
++    set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
++    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
++    unset(OpenMP_FLAG_DETECTED CACHE)
++    message(STATUS "Try OpenMP C flag = [${FLAG}]")
++    check_c_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
++    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
++    if(OpenMP_FLAG_DETECTED)
++      set(OpenMP_C_FLAGS_INTERNAL "${FLAG}")
++      break()
++    endif(OpenMP_FLAG_DETECTED) 
++  endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
++ENDIF (CMAKE_C_COMPILER)
+ 
+ # check cxx compiler
+-foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
+-  set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+-  set(CMAKE_REQUIRED_FLAGS "${FLAG}")
+-  unset(OpenMP_FLAG_DETECTED CACHE)
+-  message(STATUS "Try OpenMP CXX flag = [${FLAG}]")
+-  check_cxx_source_compiles("${OpenMP_C_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
+-  set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
+-  if(OpenMP_FLAG_DETECTED)
+-    set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}")
+-    break()
+-  endif(OpenMP_FLAG_DETECTED)
+-endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
++IF (CMAKE_CXX_COMPILER)
++  foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
++    set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
++    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
++    unset(OpenMP_FLAG_DETECTED CACHE)
++    message(STATUS "Try OpenMP CXX flag = [${FLAG}]")
++    check_cxx_source_compiles("${OpenMP_CXX_TEST_SOURCE}" OpenMP_FLAG_DETECTED)
++    set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
++    if(OpenMP_FLAG_DETECTED)
++      set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}")
++      break()
++    endif(OpenMP_FLAG_DETECTED)
++  endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
++ENDIF (CMAKE_CXX_COMPILER)
+ 
+ set(OpenMP_C_FLAGS "${OpenMP_C_FLAGS_INTERNAL}"
+   CACHE STRING "C compiler flags for OpenMP parallization")
+ 
+ set(OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS_INTERNAL}"
+   CACHE STRING "C++ compiler flags for OpenMP parallization")
++
+ # handle the standard arguments for find_package
+-find_package_handle_standard_args(OpenMP DEFAULT_MSG 
+-  OpenMP_C_FLAGS OpenMP_CXX_FLAGS )
++IF (CMAKE_C_COMPILER)
++  find_package_handle_standard_args(OpenMP DEFAULT_MSG 
++    OpenMP_C_FLAGS )
++ENDIF (CMAKE_C_COMPILER)
++
++IF (CMAKE_CXX_COMPILER)
++  find_package_handle_standard_args(OpenMP DEFAULT_MSG 
++    OpenMP_CXX_FLAGS )
++ENDIF (CMAKE_CXX_COMPILER)
+ 
+ mark_as_advanced(
+   OpenMP_C_FLAGS