Wed Apr 26 18:19:31 2017 UTC ()
cmake: revise netbsd-6 build fix patch as suggested by Brad King
TagRunPath = 0 may cause client code such as cmSystemTools::RemoveRPath
to misbehave.

Define DT_RUNPATH to the expected value (29) instead.

bump pkgrevision


(maya)
diff -r1.7 -r1.8 pkgsrc/devel/cmake/Makefile.version
diff -r1.98 -r1.99 pkgsrc/devel/cmake/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx
cvs diff -r1.7 -r1.8 pkgsrc/devel/cmake/Attic/Makefile.version (expand / switch to unified diff)

--- pkgsrc/devel/cmake/Attic/Makefile.version 2017/04/11 20:18:54 1.7
+++ pkgsrc/devel/cmake/Attic/Makefile.version 2017/04/26 18:19:31 1.8
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1# $NetBSD: Makefile.version,v 1.7 2017/04/11 20:18:54 adam Exp $ 1# $NetBSD: Makefile.version,v 1.8 2017/04/26 18:19:31 maya Exp $
2# 2#
3# used by devel/cmake/Makefile 3# used by devel/cmake/Makefile
4# used by devel/cmake-fedora/Makefile 4# used by devel/cmake-fedora/Makefile
5CMAKE_VERSION= 3.8.0 5CMAKE_VERSION= 3.8.0
6CMAKE_API= ${CMAKE_VERSION:R} 6CMAKE_API= ${CMAKE_VERSION:R}
 7PKGREVISION= 1
cvs diff -r1.98 -r1.99 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2017/04/24 22:48:48 1.98
+++ pkgsrc/devel/cmake/distinfo 2017/04/26 18:19:31 1.99
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.98 2017/04/24 22:48:48 maya Exp $ 1$NetBSD: distinfo,v 1.99 2017/04/26 18:19:31 maya Exp $
2 2
3SHA1 (cmake-3.8.0.tar.gz) = 660ec06a46b46dc5d675371a2256ec739f8bb8b7 3SHA1 (cmake-3.8.0.tar.gz) = 660ec06a46b46dc5d675371a2256ec739f8bb8b7
4RMD160 (cmake-3.8.0.tar.gz) = 30dacd3b01f98fbd47721b201e48e8fe776082da 4RMD160 (cmake-3.8.0.tar.gz) = 30dacd3b01f98fbd47721b201e48e8fe776082da
5SHA512 (cmake-3.8.0.tar.gz) = a261088073ab41c41b461d155bead82b580225c8a4d32884715fba5eeb892acb2f73ae0484e823d7c33c9e29f331ec34ca223987f05e3ceb9a2f9b7defef17bf 5SHA512 (cmake-3.8.0.tar.gz) = a261088073ab41c41b461d155bead82b580225c8a4d32884715fba5eeb892acb2f73ae0484e823d7c33c9e29f331ec34ca223987f05e3ceb9a2f9b7defef17bf
6Size (cmake-3.8.0.tar.gz) = 7503379 bytes 6Size (cmake-3.8.0.tar.gz) = 7503379 bytes
7SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d 7SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
8SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc 8SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
9SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c 9SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
10SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 1685973706bd2041422e5f8da12634c6c0695714 10SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 1685973706bd2041422e5f8da12634c6c0695714
11SHA1 (patch-Source_cmELF.cxx) = e1629ff181c5757fad098ee1534680bf7e24cb64 11SHA1 (patch-Source_cmELF.cxx) = 180212c2f4225fd1163fe00639f70f55cac2cad6
12SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 12SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
13SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9 13SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9
14SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f 14SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
15SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 15SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
cvs diff -r1.6 -r1.7 pkgsrc/devel/cmake/patches/Attic/patch-Source_cmELF.cxx (expand / switch to unified diff)

--- pkgsrc/devel/cmake/patches/Attic/patch-Source_cmELF.cxx 2017/04/24 22:48:48 1.6
+++ pkgsrc/devel/cmake/patches/Attic/patch-Source_cmELF.cxx 2017/04/26 18:19:31 1.7
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1$NetBSD: patch-Source_cmELF.cxx,v 1.6 2017/04/24 22:48:48 maya Exp $ 1$NetBSD: patch-Source_cmELF.cxx,v 1.7 2017/04/26 18:19:31 maya Exp $
2 2
3Don't use DT_RUNPATH if it's not defined (netbsd-6) 3cmELF: Provide DT_RUNPATH definition fallback (netbsd-6)
 4https://gitlab.kitware.com/cmake/cmake/merge_requests/764
4 5
5--- Source/cmELF.cxx.orig 2017-04-10 15:23:07.000000000 +0000 6--- Source/cmELF.cxx.orig 2017-04-10 15:23:07.000000000 +0000
6+++ Source/cmELF.cxx 7+++ Source/cmELF.cxx
7@@ -675,7 +675,11 @@ cmELF::StringEntry const* cmELFInternalI 8@@ -44,6 +44,9 @@ typedef struct Elf32_Rela Elf32_Rela;
8 // External class implementation. 9 #ifdef _SCO_DS
9  10 #include <link.h> // For DT_SONAME etc.
10 const long cmELF::TagRPath = DT_RPATH; 11 #endif
11+#ifdef DT_RUNPATH 12+#ifndef DT_RUNPATH
12 const long cmELF::TagRunPath = DT_RUNPATH; 13+#define DT_RUNPATH 29
13+#else 
14+const long cmELF::TagRunPath = 0; 
15+#endif 14+#endif
16  15
17 #ifdef DT_MIPS_RLD_MAP_REL 16 // Low-level byte swapping implementation.
18 const long cmELF::TagMipsRldMapRel = DT_MIPS_RLD_MAP_REL; 17 template <size_t s>