[arch-commits] Commit in cmake/repos (14 files)
Felix Yan
fyan at archlinux.org
Fri Nov 20 09:45:56 UTC 2015
Date: Friday, November 20, 2015 @ 10:45:56
Author: fyan
Revision: 251688
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cmake/repos/extra-i686/PKGBUILD
(from rev 251687, cmake/trunk/PKGBUILD)
cmake/repos/extra-i686/cmake.install
(from rev 251687, cmake/trunk/cmake.install)
cmake/repos/extra-i686/fix-c-c++-default-dialect-detection.patch
(from rev 251687, cmake/trunk/fix-c-c++-default-dialect-detection.patch)
cmake/repos/extra-i686/rebuild.list
(from rev 251687, cmake/trunk/rebuild.list)
cmake/repos/extra-x86_64/PKGBUILD
(from rev 251687, cmake/trunk/PKGBUILD)
cmake/repos/extra-x86_64/cmake.install
(from rev 251687, cmake/trunk/cmake.install)
cmake/repos/extra-x86_64/fix-c-c++-default-dialect-detection.patch
(from rev 251687, cmake/trunk/fix-c-c++-default-dialect-detection.patch)
cmake/repos/extra-x86_64/rebuild.list
(from rev 251687, cmake/trunk/rebuild.list)
Deleted:
cmake/repos/extra-i686/PKGBUILD
cmake/repos/extra-i686/cmake.install
cmake/repos/extra-i686/rebuild.list
cmake/repos/extra-x86_64/PKGBUILD
cmake/repos/extra-x86_64/cmake.install
cmake/repos/extra-x86_64/rebuild.list
--------------------------------------------------------+
/PKGBUILD | 126 +++++++++++++++
/cmake.install | 24 ++
/rebuild.list | 8
extra-i686/PKGBUILD | 59 -------
extra-i686/cmake.install | 12 -
extra-i686/fix-c-c++-default-dialect-detection.patch | 39 ++++
extra-i686/rebuild.list | 5
extra-x86_64/PKGBUILD | 59 -------
extra-x86_64/cmake.install | 12 -
extra-x86_64/fix-c-c++-default-dialect-detection.patch | 39 ++++
extra-x86_64/rebuild.list | 5
11 files changed, 236 insertions(+), 152 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-11-20 09:44:48 UTC (rev 251687)
+++ extra-i686/PKGBUILD 2015-11-20 09:45:56 UTC (rev 251688)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=3.4.0
-pkgrel=1
-pkgdesc='A cross-platform open-source make system'
-arch=('i686' 'x86_64')
-url="http://www.cmake.org/"
-license=('custom')
-depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
-makedepends=('qt5-base' 'python-sphinx' 'emacs')
-optdepends=('qt5-base: cmake-gui'
- 'libxkbcommon-x11: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cd3034e0a44256a0917e254167217fc8')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --sphinx-man \
- --system-libs \
- --qt-gui \
- --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- vimpath="${pkgdir}/usr/share/vim/vimfiles"
- install -d "${vimpath}"/{help,indent,syntax}
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
- "${vimpath}"/help/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
- "${vimpath}"/indent/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
- "${vimpath}"/syntax/
-
- install -d "${pkgdir}"/usr/share/emacs/site-lisp/
- emacs -batch -f batch-byte-compile \
- "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
- ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
- "${pkgdir}"/usr/share/emacs/site-lisp/
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/extra-i686/PKGBUILD (from rev 251687, cmake/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.4.0
+pkgrel=2
+pkgdesc='A cross-platform open-source make system'
+arch=('i686' 'x86_64')
+url="http://www.cmake.org/"
+license=('custom')
+depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui'
+ 'libxkbcommon-x11: cmake-gui')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+ fix-c-c++-default-dialect-detection.patch)
+md5sums=('cd3034e0a44256a0917e254167217fc8'
+ 'a2c3f0abf120a6dc8e142aa23dba1520')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # FS#47113
+ patch -p1 -i ../fix-c-c++-default-dialect-detection.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./bootstrap --prefix=/usr \
+ --mandir=/share/man \
+ --docdir=/share/doc/cmake \
+ --sphinx-man \
+ --system-libs \
+ --qt-gui \
+ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ vimpath="${pkgdir}/usr/share/vim/vimfiles"
+ install -d "${vimpath}"/{help,indent,syntax}
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
+ "${vimpath}"/help/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
+ "${vimpath}"/indent/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
+ "${vimpath}"/syntax/
+
+ install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+ emacs -batch -f batch-byte-compile \
+ "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
+ "${pkgdir}"/usr/share/emacs/site-lisp/
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-i686/cmake.install
===================================================================
--- extra-i686/cmake.install 2015-11-20 09:44:48 UTC (rev 251687)
+++ extra-i686/cmake.install 2015-11-20 09:45:56 UTC (rev 251688)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cmake/repos/extra-i686/cmake.install (from rev 251687, cmake/trunk/cmake.install)
===================================================================
--- extra-i686/cmake.install (rev 0)
+++ extra-i686/cmake.install 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cmake/repos/extra-i686/fix-c-c++-default-dialect-detection.patch (from rev 251687, cmake/trunk/fix-c-c++-default-dialect-detection.patch)
===================================================================
--- extra-i686/fix-c-c++-default-dialect-detection.patch (rev 0)
+++ extra-i686/fix-c-c++-default-dialect-detection.patch 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,39 @@
+From: Setze Post <cmake at sietze.uk>
+Date: Tue, 17 Nov 2015 16:59:05 +0000 (-0500)
+Subject: Make C and C++ default dialect detection robust to advanced optimizations
+X-Git-Url: https://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=716a09b9
+
+Make C and C++ default dialect detection robust to advanced optimizations
+
+In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect
+for the compiler, 2015-09-15) we added an "INFO:..." string to the
+compiler id detection binary. The value can be optimized out of the
+compiler id binary unless we force it to be included by making the
+program behavior depend on it at runtime. Add references to the value
+as we do for the other info strings already.
+---
+
+diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
+index b224007..63f8787 100644
+--- a/Modules/CMakeCCompilerId.c.in
++++ b/Modules/CMakeCCompilerId.c.in
+@@ -55,6 +55,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+ require += info_simulate_version[argc];
+ #endif
++ require += info_language_dialect_default[argc];
+ (void)argv;
+ return require;
+ }
+diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
+index d467507..61cd790 100644
+--- a/Modules/CMakeCXXCompilerId.cpp.in
++++ b/Modules/CMakeCXXCompilerId.cpp.in
+@@ -49,6 +49,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+ require += info_simulate_version[argc];
+ #endif
++ require += info_language_dialect_default[argc];
+ (void)argv;
+ return require;
+ }
Deleted: extra-i686/rebuild.list
===================================================================
--- extra-i686/rebuild.list 2015-11-20 09:44:48 UTC (rev 251687)
+++ extra-i686/rebuild.list 2015-11-20 09:45:56 UTC (rev 251688)
@@ -1,5 +0,0 @@
-quazip
-glm
-gluon
-sfml
-wt
Copied: cmake/repos/extra-i686/rebuild.list (from rev 251687, cmake/trunk/rebuild.list)
===================================================================
--- extra-i686/rebuild.list (rev 0)
+++ extra-i686/rebuild.list 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,4 @@
+quazip
+gluon
+sfml
+wt
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-11-20 09:44:48 UTC (rev 251687)
+++ extra-x86_64/PKGBUILD 2015-11-20 09:45:56 UTC (rev 251688)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=3.4.0
-pkgrel=1
-pkgdesc='A cross-platform open-source make system'
-arch=('i686' 'x86_64')
-url="http://www.cmake.org/"
-license=('custom')
-depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
-makedepends=('qt5-base' 'python-sphinx' 'emacs')
-optdepends=('qt5-base: cmake-gui'
- 'libxkbcommon-x11: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('cd3034e0a44256a0917e254167217fc8')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --sphinx-man \
- --system-libs \
- --qt-gui \
- --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- vimpath="${pkgdir}/usr/share/vim/vimfiles"
- install -d "${vimpath}"/{help,indent,syntax}
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
- "${vimpath}"/help/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
- "${vimpath}"/indent/
- ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
- "${vimpath}"/syntax/
-
- install -d "${pkgdir}"/usr/share/emacs/site-lisp/
- emacs -batch -f batch-byte-compile \
- "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
- ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
- "${pkgdir}"/usr/share/emacs/site-lisp/
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/extra-x86_64/PKGBUILD (from rev 251687, cmake/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=3.4.0
+pkgrel=2
+pkgdesc='A cross-platform open-source make system'
+arch=('i686' 'x86_64')
+url="http://www.cmake.org/"
+license=('custom')
+depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui'
+ 'libxkbcommon-x11: cmake-gui')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz"
+ fix-c-c++-default-dialect-detection.patch)
+md5sums=('cd3034e0a44256a0917e254167217fc8'
+ 'a2c3f0abf120a6dc8e142aa23dba1520')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # FS#47113
+ patch -p1 -i ../fix-c-c++-default-dialect-detection.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./bootstrap --prefix=/usr \
+ --mandir=/share/man \
+ --docdir=/share/doc/cmake \
+ --sphinx-man \
+ --system-libs \
+ --qt-gui \
+ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ vimpath="${pkgdir}/usr/share/vim/vimfiles"
+ install -d "${vimpath}"/{help,indent,syntax}
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \
+ "${vimpath}"/help/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \
+ "${vimpath}"/indent/
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \
+ "${vimpath}"/syntax/
+
+ install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+ emacs -batch -f batch-byte-compile \
+ "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el
+ ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \
+ "${pkgdir}"/usr/share/emacs/site-lisp/
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-x86_64/cmake.install
===================================================================
--- extra-x86_64/cmake.install 2015-11-20 09:44:48 UTC (rev 251687)
+++ extra-x86_64/cmake.install 2015-11-20 09:45:56 UTC (rev 251688)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cmake/repos/extra-x86_64/cmake.install (from rev 251687, cmake/trunk/cmake.install)
===================================================================
--- extra-x86_64/cmake.install (rev 0)
+++ extra-x86_64/cmake.install 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: cmake/repos/extra-x86_64/fix-c-c++-default-dialect-detection.patch (from rev 251687, cmake/trunk/fix-c-c++-default-dialect-detection.patch)
===================================================================
--- extra-x86_64/fix-c-c++-default-dialect-detection.patch (rev 0)
+++ extra-x86_64/fix-c-c++-default-dialect-detection.patch 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,39 @@
+From: Setze Post <cmake at sietze.uk>
+Date: Tue, 17 Nov 2015 16:59:05 +0000 (-0500)
+Subject: Make C and C++ default dialect detection robust to advanced optimizations
+X-Git-Url: https://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=716a09b9
+
+Make C and C++ default dialect detection robust to advanced optimizations
+
+In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect
+for the compiler, 2015-09-15) we added an "INFO:..." string to the
+compiler id detection binary. The value can be optimized out of the
+compiler id binary unless we force it to be included by making the
+program behavior depend on it at runtime. Add references to the value
+as we do for the other info strings already.
+---
+
+diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
+index b224007..63f8787 100644
+--- a/Modules/CMakeCCompilerId.c.in
++++ b/Modules/CMakeCCompilerId.c.in
+@@ -55,6 +55,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+ require += info_simulate_version[argc];
+ #endif
++ require += info_language_dialect_default[argc];
+ (void)argv;
+ return require;
+ }
+diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
+index d467507..61cd790 100644
+--- a/Modules/CMakeCXXCompilerId.cpp.in
++++ b/Modules/CMakeCXXCompilerId.cpp.in
+@@ -49,6 +49,7 @@ int main(int argc, char* argv[])
+ #ifdef SIMULATE_VERSION_MAJOR
+ require += info_simulate_version[argc];
+ #endif
++ require += info_language_dialect_default[argc];
+ (void)argv;
+ return require;
+ }
Deleted: extra-x86_64/rebuild.list
===================================================================
--- extra-x86_64/rebuild.list 2015-11-20 09:44:48 UTC (rev 251687)
+++ extra-x86_64/rebuild.list 2015-11-20 09:45:56 UTC (rev 251688)
@@ -1,5 +0,0 @@
-quazip
-glm
-gluon
-sfml
-wt
Copied: cmake/repos/extra-x86_64/rebuild.list (from rev 251687, cmake/trunk/rebuild.list)
===================================================================
--- extra-x86_64/rebuild.list (rev 0)
+++ extra-x86_64/rebuild.list 2015-11-20 09:45:56 UTC (rev 251688)
@@ -0,0 +1,4 @@
+quazip
+gluon
+sfml
+wt
More information about the arch-commits
mailing list