dev-util/cmake: Added FindPkgConfig variable dereference fix
authorLars Wendler <polynomial-c@gentoo.org>
Fri, 28 Aug 2015 09:24:06 +0000 (11:24 +0200)
committerLars Wendler <polynomial-c@gentoo.org>
Fri, 28 Aug 2015 09:29:16 +0000 (11:29 +0200)
to 3.2.x branch as well. Did some whitespace/quoting fixes
in the 3.3.1-r1 ebuild.

Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
dev-util/cmake/cmake-3.2.3-r1.ebuild [new file with mode: 0644]
dev-util/cmake/cmake-3.3.1-r1.ebuild

diff --git a/dev-util/cmake/cmake-3.2.3-r1.ebuild b/dev-util/cmake/cmake-3.2.3-r1.ebuild
new file mode 100644 (file)
index 0000000..0b02576
--- /dev/null
@@ -0,0 +1,196 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz
+       http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+       >=app-arch/libarchive-2.8.0:=
+       >=dev-libs/expat-2.0.1
+       >=net-misc/curl-7.20.0-r1[ssl]
+       sys-libs/zlib
+       virtual/pkgconfig
+       emacs? ( virtual/emacs )
+       ncurses? ( sys-libs/ncurses:0= )
+       qt4? (
+               dev-qt/qtcore:4
+               dev-qt/qtgui:4
+       )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
+       )
+       system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+       doc? ( dev-python/sphinx )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+       # prefix
+       "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+       "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+       "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+       # handle gentoo packaging in find modules
+       "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+       "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+       "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+       "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+
+       # respect python eclasses
+       "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+       "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+
+       # upstream backports
+       "${FILESDIR}"/${PN}-3.2.3-musl-missing-include.patch
+       "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.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:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+               par_arg="--parallel=${par_arg}"
+       else
+               par_arg="--parallel=1"
+       fi
+
+       # execinfo.h on Solaris isn't quite what it is on Darwin
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+       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 and SelectLibraryConfigurations tests
+       # these are altered thanks to our eclass
+       sed -i -e 's:#IGNORE ::g' \
+               "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+               || die
+
+       pushd "${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.
+       #    BundleUtilities: bundle creation broken
+       #    CTest.updatecvs: which fails to commit as root
+       #    Fortran: requires fortran
+       #    Qt4Deploy, which tries to break sandbox and ignores prefix
+       #    TestUpload, which requires network access
+       "${BUILD_DIR}"/bin/ctest ${ctestargs} \
+               -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+               || die "Tests failed"
+
+       popd > /dev/null
+}
+
+src_prepare() {
+       cmake-utils_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() {
+       local mycmakeargs=(
+               -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+               -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+               -DCMAKE_DOC_DIR=/share/doc/${PF}
+               -DCMAKE_MAN_DIR=/share/man
+               -DCMAKE_DATA_DIR=/share/${PN}
+               -DSPHINX_MAN=$(usex doc)
+               -DSPHINX_HTML=$(usex doc)
+               $(cmake-utils_use_build ncurses CursesDialog)
+       )
+
+       if use qt4 || use qt5 ; then
+               mycmakeargs+=(
+                       -DBUILD_QtDialog=ON
+                       $(cmake-utils_use_find_package qt5 Qt5Widgets)
+               )
+       fi
+
+       cmake-utils_src_configure
+}
+
+src_compile() {
+       cmake-utils_src_compile
+       use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+       VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       if use emacs; then
+               elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+       fi
+
+       insinto /usr/share/vim/vimfiles/syntax
+       doins Auxiliary/cmake-syntax.vim
+
+       insinto /usr/share/vim/vimfiles/indent
+       doins Auxiliary/cmake-indent.vim
+
+       insinto /usr/share/vim/vimfiles/ftdetect
+       doins "${FILESDIR}/${PN}.vim"
+
+       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+       rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}
index a2cda8a8f489dc4850ffec61847d2e885c7aac98..69601e92d3f1a9aee522565839c806fd5a25e244 100644 (file)
@@ -64,8 +64,8 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
        "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
 
-       #upstream fixes (can usually be removed with a version bump)
-       "${DISTDIR}/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
+       # upstream fixes (can usually be removed with a version bump)
+       "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch
 )
 
 cmake_src_bootstrap() {