summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2012-10-02 10:23:44 +0000
committerMichael Palimaka <kensington@gentoo.org>2012-10-02 10:23:44 +0000
commit7554b29be26259f57b9ea8ec95747497b0e4ef2d (patch)
tree2c160855db0544abf4088e7bdb91c25a47064b33 /dev-util
parentx86 stable, see bug 434802 (diff)
downloadgentoo-2-7554b29be26259f57b9ea8ec95747497b0e4ef2d.tar.gz
gentoo-2-7554b29be26259f57b9ea8ec95747497b0e4ef2d.tar.bz2
gentoo-2-7554b29be26259f57b9ea8ec95747497b0e4ef2d.zip
Disable TestUpload test since it requires network access, wrt bug #436188.
(Portage version: 2.1.11.23/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cmake/ChangeLog8
-rw-r--r--dev-util/cmake/cmake-2.8.9-r1.ebuild177
-rw-r--r--dev-util/cmake/files/cmake-2.8.9-tests.patch81
3 files changed, 265 insertions, 1 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index e3e22168caad..03a19496eaa6 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,12 @@
# 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.225 2012/10/01 11:28:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.226 2012/10/02 10:23:44 kensington Exp $
+
+*cmake-2.8.9-r1 (02 Oct 2012)
+
+ 02 Oct 2012; Michael Palimaka <kensington@gentoo.org> +cmake-2.8.9-r1.ebuild,
+ +files/cmake-2.8.9-tests.patch:
+ Disable TestUpload test since it requires network access, wrt bug #436188.
01 Oct 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.8-r3.ebuild,
-files/cmake-2.8.8-more-no_host_paths.patch,
diff --git a/dev-util/cmake/cmake-2.8.9-r1.ebuild b/dev-util/cmake/cmake-2.8.9-r1.ebuild
new file mode 100644
index 000000000000..d69e77d20e99
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.9-r1.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.9-r1.ebuild,v 1.1 2012/10/02 10:23:44 kensington 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 ~amd64-fbsd ~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
+ virtual/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"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+ "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.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.7-FindBLAS.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
+ "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+ "${FILESDIR}"/${PN}-2.8.9-tests.patch
+ "${FILESDIR}"/${PN}-2.8.9-more-no_host_paths.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 script isn't exactly /bin/sh compatible
+ ${CONFIG_SHELL:-sh} ./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.9-tests.patch b/dev-util/cmake/files/cmake-2.8.9-tests.patch
new file mode 100644
index 000000000000..251a87fa9804
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.9-tests.patch
@@ -0,0 +1,81 @@
+Removes the following tests:
+
+- DeployQt4, which tries to break sandbox and ignores prefix
+- CTest.updatecvs, which fails to commit as root
+- TestUpload, which requires network access
+
+--- Tests/CMakeLists.txt
++++ Tests/CMakeLists.txt
+@@ -273,23 +273,6 @@
+ )
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+
+- # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+- # this test also depends on the existence of the standard qtiff plugin
+- if(QT4_WORKS AND QT_QTSQL_FOUND)
+- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+- --build-and-test
+- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+- "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+- --build-generator ${CMAKE_TEST_GENERATOR}
+- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+- --build-project Qt4Deploy
+- --build-options
+- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+- endif()
+-
+ endif()
+ endif()
+
+@@ -1582,30 +1565,6 @@
+ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+ ENDIF(Subversion_FOUND)
+
+- # Test CTest Update with CVS
+- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PACKAGE(CVS QUIET)
+- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
+- SET(CVS_FOUND ${CVS_EXECUTABLE})
+- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+- SET(CTEST_TEST_UPDATE_CVS 0)
+- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+- IF(CTEST_TEST_UPDATE_CVS)
+- SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
+- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+- )
+- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+- ENDIF(CTEST_TEST_UPDATE_CVS)
+-
+ # Test CTest Update with BZR
+ FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
+ MARK_AS_ADVANCED(BZR_EXECUTABLE)
+@@ -1701,17 +1660,6 @@
+ FAIL_REGULAR_EXPRESSION "SegFault")
+
+ CONFIGURE_FILE(
+- "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
+- "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
+- @ONLY ESCAPE_QUOTES)
+- ADD_TEST(CTestTestUpload ${CMAKE_CTEST_COMMAND}
+- -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
+- --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
+- )
+- SET_TESTS_PROPERTIES(CTestTestUpload PROPERTIES
+- PASS_REGULAR_EXPRESSION "Upload\\.xml")
+-
+- CONFIGURE_FILE(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
+ @ONLY ESCAPE_QUOTES)