Skip to contentSkip to conversation

cmake: bump version to 3.6.0

PATCH New Vicente Olivert Riera 4 participants 5 messages Jul 14, 2016 – Jul 23, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmake: bump version to 3.6.0

---
 package/cmake/0001-rename_cmake_rootfile.patch | 28 ++++++++++++++++----------
 package/cmake/cmake.hash                       |  4 ++--
 package/cmake/cmake.mk                         |  4 ++--
 3 files changed, 21 insertions(+), 15 deletions(-)
package/cmake/0001-rename_cmake_rootfile.patch +17 -11
index 915b7e3..e76f9cd 100644
@@ -5,19 +5,25 @@ files are removed at build time via the target-finalize rule.
 This buildroot-specific patch makes sure ctest looks also for
 "Modules/CMake.cmake.ctest" before complaining
 
+[Vincent: tweak patch for 3.6.0]
+
 Signed-off-by: Davide Viti <[email protected]>
+Signed-off-by: Vicente Olivert Riera <[email protected]>
 
---- cmake-3.0.2/Source/cmake.cxx~	2014-09-11 15:24:01.000000000 +0200
-+++ cmake-3.0.2/Source/cmake.cxx	2014-11-25 15:48:04.461033690 +0100
-@@ -957,7 +957,10 @@
-      "Path to cpack program executable.", cmCacheManager::INTERNAL);
+diff -rup a/Source/cmake.cxx b/Source/cmake.cxx
+--- a/Source/cmake.cxx	2016-07-07 15:47:27.000000000 +0100
++++ b/Source/cmake.cxx	2016-07-14 10:14:59.914265515 +0100
+@@ -771,7 +771,12 @@ int cmake::AddCMakePaths()
+                       "Path to cpack program executable.", cmState::INTERNAL);
  #endif
-   if(!cmSystemTools::FileExists(
--       (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str()))
-+       (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str()) &&
-+     !cmSystemTools::FileExists(
-+       (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str())
+   if (!cmSystemTools::FileExists(
+-        (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) {
++        (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) &&
++	!cmSystemTools::FileExists(
++	  (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str()
++        )
 +     )
-     {
++  {
      // couldn't find modules
-     cmSystemTools::Error("Could not find CMAKE_ROOT !!!\n"
+     cmSystemTools::Error(
+       "Could not find CMAKE_ROOT !!!\n"
package/cmake/cmake.hash +2 -2
index e40d4ea..7cd1133 100644
@@ -1,2 +1,2 @@
-# From http://www.cmake.org/files/v3.5/cmake-3.5.2-SHA-256.txt
-sha256	92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a	cmake-3.5.2.tar.gz
+# From http://www.cmake.org/files/v3.6/cmake-3.6.0-SHA-256.txt
+sha256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670  cmake-3.6.0.tar.gz
package/cmake/cmake.mk +2 -2
index 7a80c1b..25eafe8 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.5
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
+CMAKE_VERSION_MAJOR = 3.6
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
Signature · 1 line
2.7.3
#1 lore raw

PATCH 1/1 cmake: bump version to 3.6.0

Hello,

package/cmake/0001-rename_cmake_rootfile.patch files are removed at build time via the target-finalize rule. · line 8

Quoted 9 lines · Vicente Olivert Riera
package/cmake/0001-rename_cmake_rootfile.patch +1 -0
index 915b7e3..e76f9cd 100644
@@ -5,19 +5,25 @@ files are removed at build time via the target-finalize rule.
 This buildroot-specific patch makes sure ctest looks also for
 "Modules/CMake.cmake.ctest" before complaining
 
+[Vincent: tweak patch for 3.6.0]

This normally goes...

package/cmake/0001-rename_cmake_rootfile.patch files are removed at build time via the target-finalize rule. · line 10

Quoted 2 lines
package/cmake/0001-rename_cmake_rootfile.patch +1 -0
+
 Signed-off-by: Davide Viti <[email protected]>

.... here.

So I've changed that and applied.

package/cmake/0001-rename_cmake_rootfile.patch files are removed at build time via the target-finalize rule. · line 11

Quoted 1 line
package/cmake/0001-rename_cmake_rootfile.patch +1 -0
+Signed-off-by: Vicente Olivert Riera <[email protected]>

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 cmake: bump version to 3.6.0

In reply to Vicente Olivert Riera

Vicente, All,

On 2016-07-14 11:06 +0100, Vicente Olivert Riera spake thusly:

Quoted 2 lines

---

[--SNIP--]

package/cmake/cmake.mk line 8

Quoted 12 lines
package/cmake/cmake.mk +2 -2
index 7a80c1b..25eafe8 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.5
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
+CMAKE_VERSION_MAJOR = 3.6
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0

This is causing a lot of build failures:

    http://autobuild.buildroot.org/?reason=host-cmake-3.6.0

There are various tyes of failures:

- incorrect openssl used:

http://autobuild.buildroot.org/results/193/193e88df98230554e304a8c550e5ded97e3a4177

-- Found OpenSSL: /home/buildroot/build/instance-1/output/host/usr/xtensa-buildroot-lin ux-uclibc/sysroot/usr/lib/libssl.so;/home/buildroot/build/instance-1/output/host/usr/xt ensa-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.so (found version "1.0.2h")

Clearly, this is finding the target openssl when we are building the host-cmake. That's wrong.

- a weird error while configuring its bundled libcurl:

http://autobuild.buildroot.org/results/f8c/f8c335440e3132ee7e01fadd03c4d18e0de767ba

-- Check size of curl_off_t
-- Check size of curl_off_t - failed
-- Check size of socklen_t
-- Check size of socklen_t - failed
CMake Error at Utilities/cmcurl/CMakeLists.txt:1042 (message):
Check for sizeof socklen_t failed, see CMakeFiles/CMakerror.log

If cmake insists on having curl+ssl support (what for, for g*d's sake?) we should add a host-libcurl and make host-cmake depend on it and on host-openssl.

- another weird build issue:

http://autobuild.buildroot.org/results/89f/89fd8085da9cacf612a6aea585eb1ad6941f146b

/home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:
Assembler messages:
/home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:761: Error: incorrect register %rdx' used with l' suffix /home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:765: Error: incorrect register %rcx' used with l' suffix Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/build.make:950: recipe for target 'Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/multi.c.o' failed

This one looks like again like it is confusing host and target, and using the wrong compiler and/or assembler.

- yet again another weird build issue:

http://autobuild.buildroot.org/results/85f/85f5e9329047c9d40f7fd35c645835d83a5fcef3/

/home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:
Assembler messages: /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1167: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1167: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' make[4]: *** [Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/ftp.c.o] Error 1
make[4]: *** Waiting for unfinished jobs....

Regards,
Yann E. MORIN.

Quoted 10 lines
package/cmake/cmake.mk +0 -0
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
Signature · 6 lines
2.7.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 cmake: bump version to 3.6.0

Hello Yann,

I would say revert this for now since there are many things to fix. This way we avoid all the build failures.

Regards,

Vincent.

Quoted 91 lines · Yann E. MORIN

Vicente, All,

On 2016-07-14 11:06 +0100, Vicente Olivert Riera spake thusly:

Quoted 2 lines

---

[--SNIP--]

package/cmake/cmake.mk line 8

Quoted 12 lines
package/cmake/cmake.mk +2 -2
index 7a80c1b..25eafe8 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.5
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
+CMAKE_VERSION_MAJOR = 3.6
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0

This is causing a lot of build failures:

    http://autobuild.buildroot.org/?reason=host-cmake-3.6.0

There are various tyes of failures:

- incorrect openssl used:

http://autobuild.buildroot.org/results/193/193e88df98230554e304a8c550e5ded97e3a4177

-- Found OpenSSL: /home/buildroot/build/instance-1/output/host/usr/xtensa-buildroot-lin ux-uclibc/sysroot/usr/lib/libssl.so;/home/buildroot/build/instance-1/output/host/usr/xt ensa-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.so (found version "1.0.2h")

Clearly, this is finding the target openssl when we are building the host-cmake. That's wrong.

- a weird error while configuring its bundled libcurl:

http://autobuild.buildroot.org/results/f8c/f8c335440e3132ee7e01fadd03c4d18e0de767ba

-- Check size of curl_off_t
-- Check size of curl_off_t - failed
-- Check size of socklen_t
-- Check size of socklen_t - failed
CMake Error at Utilities/cmcurl/CMakeLists.txt:1042 (message):
Check for sizeof socklen_t failed, see CMakeFiles/CMakerror.log

If cmake insists on having curl+ssl support (what for, for g*d's sake?) we should add a host-libcurl and make host-cmake depend on it and on host-openssl.

- another weird build issue:

http://autobuild.buildroot.org/results/89f/89fd8085da9cacf612a6aea585eb1ad6941f146b

/home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:
Assembler messages:
/home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:761: Error: incorrect register %rdx' used with l' suffix /home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:765: Error: incorrect register %rcx' used with l' suffix Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/build.make:950: recipe for target 'Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/multi.c.o' failed

This one looks like again like it is confusing host and target, and using the wrong compiler and/or assembler.

- yet again another weird build issue:

http://autobuild.buildroot.org/results/85f/85f5e9329047c9d40f7fd35c645835d83a5fcef3/

/home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:
Assembler messages: /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1167: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1167: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' make[4]: *** [Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/ftp.c.o] Error 1
make[4]: *** Waiting for unfinished jobs....

Regards,
Yann E. MORIN.

Quoted 10 lines
package/cmake/cmake.mk +0 -0
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
Signature · 6 lines
2.7.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
#4 lore raw

PATCH 1/1 cmake: bump version to 3.6.0

Quoted 2 lines · Vicente Olivert Riera
Quoted 2 lines

This is causing a lot of build failures:

    http://autobuild.buildroot.org/?reason=host-cmake-3.6.0

*Puts CMake developer hat on.*

When things like this happen, please file an issue. We just did 3.6.1 this week and it appears that we'll also need a 3.6.2 for some of these issues; they could have been fixed in 3.6.1 if we had known about them on the 14th.

Quoted 4 lines
Quoted 4 lines

There are various tyes of failures:

- incorrect openssl used:

Quoted 8 lines
Quoted 8 lines

http://autobuild.buildroot.org/results/193/193e88df98230554e304a8c550e5ded97e3a4177

-- Found OpenSSL: /home/buildroot/build/instance-1/output/host/usr/xtensa-buildroot-lin ux-uclibc/sysroot/usr/lib/libssl.so;/home/buildroot/build/instance-1/output/host/usr/xt ensa-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.so (found version "1.0.2h")

Clearly, this is finding the target openssl when we are building the host-cmake. That's wrong.

Indeed. Please file an issue over here:

https://gitlab.kitware.com/cmake/cmake/issues

so that this can be tracked.

Quoted 11 lines
Quoted 11 lines

- a weird error while configuring its bundled libcurl:

http://autobuild.buildroot.org/results/f8c/f8c335440e3132ee7e01fadd03c4d18e0de767ba

-- Check size of curl_off_t
-- Check size of curl_off_t - failed
-- Check size of socklen_t
-- Check size of socklen_t - failed
CMake Error at Utilities/cmcurl/CMakeLists.txt:1042 (message):
Check for sizeof socklen_t failed, see CMakeFiles/CMakerror.log

Quoted 3 lines
Quoted 3 lines

If cmake insists on having curl+ssl support (what for, for g*d's sake?) we should add a host-libcurl and make host-cmake depend on it and on host-openssl.

Because otherwise file(DOWNLOAD) cannot fetch files over HTTPS (a common enough occurence these days). That said, I'm not sure why it's *required* from a CMake standpoint (but it may cause "unknown protocol https" during the build of other projects). This is probably due to something related to the openssl issue above.

Quoted 4 lines
Quoted 4 lines

- another weird build issue:

    http://autobuild.buildroot.org/results/89f/89fd8085da9cacf612a6aea585eb1ad6941f146b
Quoted 8 lines
Quoted 8 lines

/home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:
Assembler messages:
/home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:761: Error: incorrect register %rdx' used with l' suffix /home/buildroot/build/instance-1/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/multi.c:765: Error: incorrect register %rcx' used with l' suffix Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/build.make:950: recipe for target 'Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/multi.c.o' failed

This one looks like again like it is confusing host and target, and using the wrong compiler and/or assembler.

Please file an issue.

Quoted 4 lines
Quoted 4 lines

- yet again another weird build issue:

    http://autobuild.buildroot.org/results/85f/85f5e9329047c9d40f7fd35c645835d83a5fcef3/
Quoted 9 lines
Quoted 9 lines

/home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:
Assembler messages: /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1167: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1167: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' /home/buildroot/autobuild/run/instance-2/output/build/host-cmake-3.6.0/Utilities/cmcurl/lib/ftp.c:1258: Error: junk at end of line, first unrecognized character is %' make[4]: *** [Utilities/cmcurl/lib/CMakeFiles/cmcurl.dir/ftp.c.o] Error 1
make[4]: *** Waiting for unfinished jobs....

Looks similar to the above one? We did update curl for 3.6 I believe.

Thanks,

--Ben