| Message ID | 1424638604-8244-1-git-send-email-fabio.porcedda@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Fabio Porcedda, On Sun, 22 Feb 2015 21:56:44 +0100, Fabio Porcedda wrote: > Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> > --- > package/cmake/cmake.hash | 2 +- > package/cmake/cmake.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to next, thanks! Thomas
Dear Fabio Porcedda, On Sun, 22 Feb 2015 21:56:44 +0100, Fabio Porcedda wrote: > Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> > --- > package/cmake/cmake.hash | 2 +- > package/cmake/cmake.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) This update breaks badly in the autobuilders, see: http://autobuild.buildroot.org/?reason=host-cmake-3.1.3 Apparently, there is a conflict between the host installed lzma, and the built-in lzma library of CMake. Can you have a look ? Thanks, Thomas
On Wed, Mar 4, 2015 at 11:59 AM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Dear Fabio Porcedda, > > On Sun, 22 Feb 2015 21:56:44 +0100, Fabio Porcedda wrote: >> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> >> --- >> package/cmake/cmake.hash | 2 +- >> package/cmake/cmake.mk | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) > > This update breaks badly in the autobuilders, see: > > http://autobuild.buildroot.org/?reason=host-cmake-3.1.3 > > Apparently, there is a conflict between the host installed lzma, and > the built-in lzma library of CMake. > > Can you have a look ? I've already a patch for this- I will send it. BR
On Wed, Mar 4, 2015 at 12:01 PM, Fabio Porcedda <fabio.porcedda@gmail.com> wrote: > On Wed, Mar 4, 2015 at 11:59 AM, Thomas Petazzoni > <thomas.petazzoni@free-electrons.com> wrote: >> Dear Fabio Porcedda, >> >> On Sun, 22 Feb 2015 21:56:44 +0100, Fabio Porcedda wrote: >>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> >>> --- >>> package/cmake/cmake.hash | 2 +- >>> package/cmake/cmake.mk | 2 +- >>> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> This update breaks badly in the autobuilders, see: >> >> http://autobuild.buildroot.org/?reason=host-cmake-3.1.3 >> >> Apparently, there is a conflict between the host installed lzma, and >> the built-in lzma library of CMake. >> >> Can you have a look ? > > I've already a patch for this- > > I will send it. Sent: http://patchwork.ozlabs.org/patch/446194/ BR
diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 1b6b658..76e03d3 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2b210f7d867a1e716c1895357ebe63c7b9ae61fdb5f2d300ab2f01795f085b35 cmake-3.1.2.tar.gz +sha256 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 cmake-3.1.3.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index f283a09..8c64b58 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,7 +5,7 @@ ################################################################################ CMAKE_VERSION_MAJOR = 3.1 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> --- package/cmake/cmake.hash | 2 +- package/cmake/cmake.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)