From e8008af226e1e87bfe3aacebdacc45a4b0b409d2eedacdc9b9fa72b7e08de637 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 11 Apr 2017 07:44:05 +0000 Subject: [PATCH] Accepting request 487174 from home:mathletic:branches:devel:tools:building update to 3.8.0 OBS-URL: https://build.opensuse.org/request/show/487174 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=286 --- cmake-3.7.2-SHA-256.txt | 11 --- cmake-3.7.2-SHA-256.txt.asc | 16 ---- cmake-3.7.2.tar.gz | 3 - cmake-3.8.0-SHA-256.txt | 11 +++ cmake-3.8.0-SHA-256.txt.asc | 16 ++++ cmake-3.8.0.tar.gz | 3 + cmake-gui.changes | 6 ++ cmake-gui.spec | 10 ++- cmake.changes | 13 +++ cmake.spec | 16 ++-- reproducible.patch | 167 ------------------------------------ reproducible2.patch | 37 -------- system-libs.patch | 14 +-- 13 files changed, 68 insertions(+), 255 deletions(-) delete mode 100644 cmake-3.7.2-SHA-256.txt delete mode 100644 cmake-3.7.2-SHA-256.txt.asc delete mode 100644 cmake-3.7.2.tar.gz create mode 100644 cmake-3.8.0-SHA-256.txt create mode 100644 cmake-3.8.0-SHA-256.txt.asc create mode 100644 cmake-3.8.0.tar.gz delete mode 100644 reproducible.patch delete mode 100644 reproducible2.patch diff --git a/cmake-3.7.2-SHA-256.txt b/cmake-3.7.2-SHA-256.txt deleted file mode 100644 index 4d2c94a..0000000 --- a/cmake-3.7.2-SHA-256.txt +++ /dev/null @@ -1,11 +0,0 @@ -2d5e2fbdcf01f03c5660823d89e75343cd3f9ba918bc2ca8759e58d5f168614c cmake-3.7.2-Darwin-x86_64.dmg -0175e97748052dfc15ebd3c0aa65286e5ec20ca22ed606ce88940e699496b03c cmake-3.7.2-Darwin-x86_64.tar.gz -2e250d9a23764a9c54262c1ddc275b02666b81e2cbe05459d15906825655874b cmake-3.7.2-Linux-x86_64.sh -0e6ec35d4fa9bf79800118916b51928b6471d5725ff36f1d0de5ebb34dcd5406 cmake-3.7.2-Linux-x86_64.tar.gz -ec44575ff59523d78389565e29ebd58b9b6c10748d94d9b2ff7f4f27a61935a4 cmake-3.7.2-win32-x86.msi -ec5e299d412e0272e01d4de5bf07718f42c96361f83d51cc39f91bf49cc3e5c3 cmake-3.7.2-win32-x86.zip -8b0cbfc6be83e31a058c8ef282fe204862809ffcd8788bc19a8f0eb457f71187 cmake-3.7.2-win64-x64.msi -def3bb81dfd922ce1ea2a0647645eefb60e128d520c8ca707c5996c331bc8b48 cmake-3.7.2-win64-x64.zip -704ed35cad2e999da1cc465170264f2556ec7bf095d24d2788d8d5ed82f12a05 cmake-3.7.2.tar.Z -dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 cmake-3.7.2.tar.gz -36672d4fdf01957ab41635689a501bbe280d5cd4475e2736b631d1510cae528c cmake-3.7.2.zip diff --git a/cmake-3.7.2-SHA-256.txt.asc b/cmake-3.7.2-SHA-256.txt.asc deleted file mode 100644 index 950e149..0000000 --- a/cmake-3.7.2-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlh474YACgkQLSzvEDSS -FoQ3bQ//VfMo3sgI+rds0ah1lEVCEwPw2HmlU6MbH6jUdoxV84paJPZ/YWjEHgPx -+DtmZrC8Al7s0lN/9xHyipEWD+ALXbRijx+/9oM0JoSYmiFH5I+0msas6LshmwDx -AzeEYZ9IT31Wwdja9rfG0QpqwOIbf3Y3RxxjdDFWOwrKG6kc+X+kLmaLXmyrHSAO -XsFqhyDU+EzU1Lig3Cnj7dQOWG2qyBwP4T9GrlOHuMg2MCxDszqKApYrLceg7g2U -b6jcaXfR3k5RFYZ/PsuIdczLUWOmIWlCl4N9HN1HguwityJunzd1HkGSVGHV95KG -xiCLYtsXtk+FNFDKCebSunl8NWrA7yUPlpayx1mnledZN20gCbwLOS+pEKH1OR+s -hbwiwJIb5i900+dJJHBqbPiNIscvGUaAQhP2w1MXBTwhbp5ajFmVfahkvipCFrOB -sCbMk4+Ft/cW8csGWTfj9zwtDMK2Y/T1IShg8suywdYOUSP57V2vr90ryKO+Uxfl -NOMba22Ec4Wi/ZdocT4NlKMiUDpdH/9JgpZ134TqH7FR1Q8VMqlJeRFb7Z3lQvh3 -JZNXrRoompKWi2iY1RVssSG2IAE1wN7l4Y2T3ecXTfsIdNCdPNFWtpqdTA2NZZtF -cFLjou6Qgn5WjrluTyeJqS0O8k1FtMIQagEFebKlw5OGEo77zfQ= -=e0Oc ------END PGP SIGNATURE----- diff --git a/cmake-3.7.2.tar.gz b/cmake-3.7.2.tar.gz deleted file mode 100644 index fb4deca..0000000 --- a/cmake-3.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 -size 7361593 diff --git a/cmake-3.8.0-SHA-256.txt b/cmake-3.8.0-SHA-256.txt new file mode 100644 index 0000000..8fc7500 --- /dev/null +++ b/cmake-3.8.0-SHA-256.txt @@ -0,0 +1,11 @@ +fc1badbd48a0fdf045498e658627a7e4691c53d02da77439d57a8c2a584fc6a3 cmake-3.8.0-Darwin-x86_64.dmg +aba3cf725dfd80324eb4251c13e890c25b65d1b8719454e4769e5d33abd140f1 cmake-3.8.0-Darwin-x86_64.tar.gz +f38a3aec8c83b4792ac1d4ff4eac4f168a3218c8a1638808606e38f0456d08c6 cmake-3.8.0-Linux-x86_64.sh +330357990d84599f9c1a87f568a724f0fe5de1687c32961dda689d52588a5b24 cmake-3.8.0-Linux-x86_64.tar.gz +3a67684ba2039c0cd15db19a6c40e7abbeb6d3f0b3c40fec233986c0a1b158bb cmake-3.8.0-win32-x86.msi +857fca00974ad6ac12fa042373d85ad1288770d4f09fbd99753c822df76b1c6c cmake-3.8.0-win32-x86.zip +1abb378901f3650b432819fe026e445b03d288ea7cf8edeab2a94d41fa5472b7 cmake-3.8.0-win64-x64.msi +602d6c0bd458291d21414f94ee24f5bb623f3a623409e15601cc80b9922ff6bd cmake-3.8.0-win64-x64.zip +393c5dbc527b45c543ebe6ca5bf76a86e40cb76d0eb8ab888c81c3bcd2288599 cmake-3.8.0.tar.Z +cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 cmake-3.8.0.tar.gz +b04ea40152633fe351fc60f82b023700dfd84d06b63e3fda87c95b9d01af0cbb cmake-3.8.0.zip diff --git a/cmake-3.8.0-SHA-256.txt.asc b/cmake-3.8.0-SHA-256.txt.asc new file mode 100644 index 0000000..094a2a2 --- /dev/null +++ b/cmake-3.8.0-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAljrt98ACgkQLSzvEDSS +FoSxlg//fthMb3R2STD8Rv+ev+MIwfcpkMcRze+zkh2rEiOO920lucPRUFId7PwB +Y2zyut2Y6u4P9uMOcKOksEi7wUQbrbwO4AhelziHWJzHWxFP/nm6kp2VcjYT8tAW +WiqFrdZGhAqsin1b7daDHL9Fh02A/FrMrHi7tRig3mobvw52IKg/w59F7NyT+SaX +zK8AjP7uSQTtN8I0Z/yFzeZbHtHvMadHNhlDKpcO78V/euxpJSKJy6JHmTI6zB+Y +LJUWYqtnOtEkhvszFviU7sQVLXklsZLWVaAQm78j8OKF/f2U/wzcxH1rpmLIueyP +VWJR4b3ITGl06OM8dcrzZzVqX9/jzj81uk0D1UiD89fuyZckqt/9rBdrsKZkec7S +EcaMgGeecsU35iQqBGQy08YoG8hUZ0HzfLhPOtMgHA+zhrvJwRPwaCVvMaEHTgL1 +XZvKFsgK2CaOS92wiaFKUlVXVW4UAg++woBcnn8j/Uo6AMKrrhWZWDMOvZkZYkfL +WPITBsEp0V5R7YvvuUCrZFRfFSNv9FuiQ0du5r7XatIRqfdZANURZz+PNfXnrJGl +RAz3fZxMFYnUE6WUHPiVBr9g8V+ifavjrCuXWVR/r2MNU1pho/nTwHGX9a4IB8ai +wrZa7dydut8oB4vqt9BkgAJHOeJZFgg5loFfKdig4jdmcGDjZIY= +=xYDT +-----END PGP SIGNATURE----- diff --git a/cmake-3.8.0.tar.gz b/cmake-3.8.0.tar.gz new file mode 100644 index 0000000..5035017 --- /dev/null +++ b/cmake-3.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cab99162e648257343a20f61bcd0b287f5e88e36fcb2f1d77959da60b7f35969 +size 7503379 diff --git a/cmake-gui.changes b/cmake-gui.changes index ef8d4aa..f71bfa3 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 11 04:55:48 UTC 2017 - foss@grueninger.de + +- update to 3.8.0: + * no changes specific to CMake-GUI for Linux + ------------------------------------------------------------------- Sun Jan 15 14:11:33 UTC 2017 - astieger@suse.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 1a72834..c2e9839 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -16,16 +16,17 @@ # +%define shortver 3.8 Name: cmake-gui -Version: 3.7.2 +Version: 3.8.0 Release: 0 Summary: CMake graphical user interface License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.7/cmake-%{version}.tar.gz -Source5: http://www.cmake.org/files/v3.7/cmake-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.7/cmake-%{version}-SHA-256.txt.asc +Source0: http://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz +Source5: http://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt.asc Source7: cmake.keyring # PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes Patch4: form.patch @@ -91,6 +92,7 @@ export CXXFLAGS="%{optflags}" --sphinx-man \ --system-libs \ --no-system-jsoncpp \ + --no-system-librhash \ --parallel=0%{jobs} \ --verbose \ --qt-gui \ diff --git a/cmake.changes b/cmake.changes index 3a955a5..a479b91 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 11 04:56:27 UTC 2017 - foss@grueninger.de + +- update to 3.8.0: + * support C# + * support CUDA s a first-class language + * improve try_compile + * improve compile_features + full changelog: https://blog.kitware.com/cmake-3-8-0-available-for-download/ +- update system-libs.patch +- drop reproducible.patch and reproducible2.patch which are part + of upstream + ------------------------------------------------------------------- Wed Mar 29 14:59:26 UTC 2017 - bwiedemann@suse.com diff --git a/cmake.spec b/cmake.spec index 876e5d2..856e02e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -16,20 +16,21 @@ # +%define shortver 3.8 Name: cmake -Version: 3.7.2 +Version: 3.8.0 Release: 0 Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.7/%{name}-%{version}.tar.gz +Source0: http://www.cmake.org/files/v%{shortversion}/%{name}-%{version}.tar.gz Source1: cmake.macros # bnc#947585 - Let CMake produces automatic RPM provides Source3: cmake.attr Source4: cmake.prov -Source5: http://www.cmake.org/files/v3.7/%{name}-%{version}-SHA-256.txt -Source6: http://www.cmake.org/files/v3.7/%{name}-%{version}-SHA-256.txt.asc +Source5: http://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt +Source6: http://www.cmake.org/files/v%{shortversion}/%{name}-%{version}-SHA-256.txt.asc Source7: cmake.keyring Patch2: cmake-fix-ruby-test.patch # PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes @@ -38,10 +39,6 @@ Patch4: form.patch Patch5: system-libs.patch # PATCH-FIX-UPSTREAM cmake-ImageMagick7.patch -- find also ImageMagick 7 Patch6: cmake-ImageMagick7.patch -# PATCH-FIX-UPSTREAM reproducible.patch -- https://gitlab.kitware.com/cmake/cmake/merge_requests/432 -Patch7: reproducible.patch -# PATCH-FIX-UPSTREAM reproducible2.patch -- https://gitlab.kitware.com/cmake/cmake/merge_requests/446 -Patch8: reproducible2.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -82,8 +79,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build export CFLAGS="%{optflags}" @@ -95,6 +90,7 @@ export CXXFLAGS="%{optflags}" --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ --system-libs \ + --no-system-librhash \ --no-system-jsoncpp \ --parallel=0%{jobs} \ --verbose \ diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 32ecf14..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,167 +0,0 @@ -commit 243aed525a2fd8e5fe32139fd0f8d0cc0e40cc33 -Author: Bernhard M. Wiedemann -Date: Wed Jan 25 07:15:40 2017 +0100 - - cmTimestamp: Support SOURCE_DATE_EPOCH to override current time - - See https://reproducible-builds.org/ for why this is good and - https://reproducible-builds.org/specs/source-date-epoch/ for the - definition of this variable. - -diff --git a/Help/command/string.rst b/Help/command/string.rst -index 77538f6..2c7847a 100644 ---- a/Help/command/string.rst -+++ b/Help/command/string.rst -@@ -329,6 +329,12 @@ If no explicit ```` is given it will default to: - - Write a string which can be used as an identifier in C. - -+.. note:: -+ -+ If the ``SOURCE_DATE_EPOCH`` environment variable is set, -+ its value will be used instead of the current time. -+ See https://reproducible-builds.org/specs/source-date-epoch/ for details. -+ - UUID - """" - -diff --git a/Help/release/dev/SOURCE_DATE_EPOCH.rst b/Help/release/dev/SOURCE_DATE_EPOCH.rst -new file mode 100644 -index 0000000..576e1da ---- /dev/null -+++ b/Help/release/dev/SOURCE_DATE_EPOCH.rst -@@ -0,0 +1,5 @@ -+SOURCE_DATE_EPOCH -+----------------- -+ -+* The :command:`string(TIMESTAMP)` will now honor the ``SOURCE_DATE_EPOCH`` -+ environment variable and use its value instead of the current time. -diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx -index 4a97114..1e5ac5b 100644 ---- a/Source/cmTimestamp.cxx -+++ b/Source/cmTimestamp.cxx -@@ -12,6 +13,16 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString, - bool utcFlag) - { - time_t currentTimeT = time(CM_NULLPTR); -+ std::string source_date_epoch; -+ cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch); -+ if (!source_date_epoch.empty()) { -+ std::istringstream iss(source_date_epoch); -+ iss >> currentTimeT; -+ if (iss.fail() || !iss.eof()) { -+ cmSystemTools::Error("Cannot parse SOURCE_DATE_EPOCH as integer"); -+ exit(27); -+ } -+ } - if (currentTimeT == time_t(-1)) { - return std::string(); - } -diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake b/Tests/RunCMake/string/RunCMakeTest.cmake -index 8067d9d..38a77b0 100644 ---- a/Tests/RunCMake/string/RunCMakeTest.cmake -+++ b/Tests/RunCMake/string/RunCMakeTest.cmake -@@ -6,6 +6,11 @@ run_cmake(AppendNoArgs) - run_cmake(Concat) - run_cmake(ConcatNoArgs) - -+run_cmake(Timestamp) -+run_cmake(TimestampEmpty) -+run_cmake(TimestampInvalid) -+run_cmake(TimestampInvalid2) -+ - run_cmake(Uuid) - run_cmake(UuidMissingNamespace) - run_cmake(UuidMissingNamespaceValue) -diff --git a/Tests/RunCMake/string/Timestamp-result.txt b/Tests/RunCMake/string/Timestamp-result.txt -new file mode 100644 -index 0000000..573541a ---- /dev/null -+++ b/Tests/RunCMake/string/Timestamp-result.txt -@@ -0,0 +1 @@ -+0 -diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt -new file mode 100644 -index 0000000..c12b070 ---- /dev/null -+++ b/Tests/RunCMake/string/Timestamp-stderr.txt -@@ -0,0 +1 @@ -+RESULT=2005-08-07 23:19:49 Sun Aug 05 day=219 wd=0 week=32 %%I=11 -diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake -new file mode 100644 -index 0000000..1232300 ---- /dev/null -+++ b/Tests/RunCMake/string/Timestamp.cmake -@@ -0,0 +1,3 @@ -+set(ENV{SOURCE_DATE_EPOCH} "1123456789") -+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S %a %b %y day=%j wd=%w week=%U %%I=%I" UTC) -+message("RESULT=${RESULT}") -diff --git a/Tests/RunCMake/string/TimestampEmpty-result.txt b/Tests/RunCMake/string/TimestampEmpty-result.txt -new file mode 100644 -index 0000000..573541a ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampEmpty-result.txt -@@ -0,0 +1 @@ -+0 -diff --git a/Tests/RunCMake/string/TimestampEmpty-stderr.txt b/Tests/RunCMake/string/TimestampEmpty-stderr.txt -new file mode 100644 -index 0000000..35cbd3c ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampEmpty-stderr.txt -@@ -0,0 +1 @@ -+RESULT=2 -diff --git a/Tests/RunCMake/string/TimestampEmpty.cmake b/Tests/RunCMake/string/TimestampEmpty.cmake -new file mode 100644 -index 0000000..21b770f ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampEmpty.cmake -@@ -0,0 +1,3 @@ -+set(ENV{SOURCE_DATE_EPOCH} "") -+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC) -+message("RESULT=${RESULT}") -diff --git a/Tests/RunCMake/string/TimestampInvalid-result.txt b/Tests/RunCMake/string/TimestampInvalid-result.txt -new file mode 100644 -index 0000000..f64f5d8 ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampInvalid-result.txt -@@ -0,0 +1 @@ -+27 -diff --git a/Tests/RunCMake/string/TimestampInvalid-stderr.txt b/Tests/RunCMake/string/TimestampInvalid-stderr.txt -new file mode 100644 -index 0000000..75566da ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampInvalid-stderr.txt -@@ -0,0 +1 @@ -+CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer -diff --git a/Tests/RunCMake/string/TimestampInvalid.cmake b/Tests/RunCMake/string/TimestampInvalid.cmake -new file mode 100644 -index 0000000..ab36270 ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampInvalid.cmake -@@ -0,0 +1,3 @@ -+set(ENV{SOURCE_DATE_EPOCH} "invalid-integer") -+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC) -+message("RESULT=${RESULT}") -diff --git a/Tests/RunCMake/string/TimestampInvalid2-result.txt b/Tests/RunCMake/string/TimestampInvalid2-result.txt -new file mode 100644 -index 0000000..f64f5d8 ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampInvalid2-result.txt -@@ -0,0 +1 @@ -+27 -diff --git a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt -new file mode 100644 -index 0000000..75566da ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt -@@ -0,0 +1 @@ -+CMake Error: Cannot parse SOURCE_DATE_EPOCH as integer -diff --git a/Tests/RunCMake/string/TimestampInvalid2.cmake b/Tests/RunCMake/string/TimestampInvalid2.cmake -new file mode 100644 -index 0000000..5cc61b8 ---- /dev/null -+++ b/Tests/RunCMake/string/TimestampInvalid2.cmake -@@ -0,0 +1,3 @@ -+set(ENV{SOURCE_DATE_EPOCH} "123trailing-garbage") -+string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC) -+message("RESULT=${RESULT}") diff --git a/reproducible2.patch b/reproducible2.patch deleted file mode 100644 index 0c661c0..0000000 --- a/reproducible2.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 5181f1f86a4d4c2ac09a540285c938fe2c2fa262 -Author: Bernhard M. Wiedemann -Date: Sun Jan 29 11:52:55 2017 +0100 - - Tests: make tests pass with SOURCE_DATE_EPOCH set - - Fix tests to account for commit 243aed52 (cmTimestamp: Support - SOURCE_DATE_EPOCH to override current time, 2017-01-25). - - In openSUSE we are running the test-suite as part of the build and that - failed in these two places when building everything with - `SOURCE_DATE_EPOCH` set. - -diff --git a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake -index d0e5fe3..f1aa390 100644 ---- a/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake -+++ b/Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake -@@ -1,6 +1,7 @@ - set(STAMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/FileTimestamp-Stamp") - set(STAMP_FORMAT "%Y-%m-%d") - -+unset(ENV{SOURCE_DATE_EPOCH}) - string(TIMESTAMP timestamp1 "${STAMP_FORMAT}") - - file(WRITE "${STAMP_FILENAME}" "foo") -diff --git a/Tests/CTestTestStopTime/GetDate.cmake b/Tests/CTestTestStopTime/GetDate.cmake -index 1f4cb24..46ab2fb 100644 ---- a/Tests/CTestTestStopTime/GetDate.cmake -+++ b/Tests/CTestTestStopTime/GetDate.cmake -@@ -49,6 +49,7 @@ macro(GET_DATE) - # 01/12/2006 08:55:12 - # mm/dd/YYYY HH:MM:SS - # -+ unset(ENV{SOURCE_DATE_EPOCH}) - string(TIMESTAMP "${GD_PREFIX}OV" "%m/%d/%Y %H:%M:%S") - - if(${GD_PREFIX}VERBOSE) diff --git a/system-libs.patch b/system-libs.patch index e9835e1..543b299 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -1,15 +1,15 @@ ---- cmake-3.5.0/bootstrap.old 2016-03-08 15:36:25.000000000 +0100 -+++ cmake-3.5.0/bootstrap 2016-03-08 23:02:06.663484353 +0100 -@@ -634,10 +634,10 @@ +--- cmake-3.5.0/bootstrap.old ++++ cmake-3.5.0/bootstrap +@@ -724,10 +724,10 @@ --init=*) cmake_init_file=`cmake_arg "$1"` ;; --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; -- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib|--system-liblzma) -+ --system-bzip2|--system-curl|--system-expat|--system-form|--system-jsoncpp|--system-libarchive|--system-zlib|--system-liblzma) +- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma) ++ --system-bzip2|--system-curl|--system-expat|--system-from|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma) lib=`cmake_arg "$1" "--system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; -- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib|--no-system-liblzma) -+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib|--no-system-liblzma) +- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma) ++ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma) lib=`cmake_arg "$1" "--no-system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; --qt-gui) cmake_bootstrap_qt_gui="1" ;;