diff options
| author | maya <maya> | 2017-04-26 18:19:31 +0000 |
|---|---|---|
| committer | maya <maya> | 2017-04-26 18:19:31 +0000 |
| commit | a7dadbf1fb8ed9193463d1d2521c86109bd68cdb (patch) | |
| tree | d60d0eb1d729601ade86e0f084db0a4b3b971dd2 /devel | |
| parent | 074fe7c4d7c7637a11a779105b56b38174f2080a (diff) | |
| download | pkgsrc-a7dadbf1fb8ed9193463d1d2521c86109bd68cdb.tar.gz | |
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
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cmake/Makefile.version | 3 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 4 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-Source_cmELF.cxx | 23 |
3 files changed, 15 insertions, 15 deletions
diff --git a/devel/cmake/Makefile.version b/devel/cmake/Makefile.version index f05515f659f..29f0e211a2c 100644 --- a/devel/cmake/Makefile.version +++ b/devel/cmake/Makefile.version @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.version,v 1.7 2017/04/11 20:18:54 adam Exp $ +# $NetBSD: Makefile.version,v 1.8 2017/04/26 18:19:31 maya Exp $ # # used by devel/cmake/Makefile # used by devel/cmake-fedora/Makefile CMAKE_VERSION= 3.8.0 CMAKE_API= ${CMAKE_VERSION:R} +PKGREVISION= 1 diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 328af1593fa..38a20d25e77 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.98 2017/04/24 22:48:48 maya Exp $ +$NetBSD: distinfo,v 1.99 2017/04/26 18:19:31 maya Exp $ SHA1 (cmake-3.8.0.tar.gz) = 660ec06a46b46dc5d675371a2256ec739f8bb8b7 RMD160 (cmake-3.8.0.tar.gz) = 30dacd3b01f98fbd47721b201e48e8fe776082da @@ -8,7 +8,7 @@ SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 1685973706bd2041422e5f8da12634c6c0695714 -SHA1 (patch-Source_cmELF.cxx) = e1629ff181c5757fad098ee1534680bf7e24cb64 +SHA1 (patch-Source_cmELF.cxx) = 180212c2f4225fd1163fe00639f70f55cac2cad6 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f diff --git a/devel/cmake/patches/patch-Source_cmELF.cxx b/devel/cmake/patches/patch-Source_cmELF.cxx index 31296ed376e..b5e6e8feaf1 100644 --- a/devel/cmake/patches/patch-Source_cmELF.cxx +++ b/devel/cmake/patches/patch-Source_cmELF.cxx @@ -1,18 +1,17 @@ -$NetBSD: patch-Source_cmELF.cxx,v 1.6 2017/04/24 22:48:48 maya Exp $ +$NetBSD: patch-Source_cmELF.cxx,v 1.7 2017/04/26 18:19:31 maya Exp $ -Don't use DT_RUNPATH if it's not defined (netbsd-6) +cmELF: Provide DT_RUNPATH definition fallback (netbsd-6) +https://gitlab.kitware.com/cmake/cmake/merge_requests/764 --- Source/cmELF.cxx.orig 2017-04-10 15:23:07.000000000 +0000 +++ Source/cmELF.cxx -@@ -675,7 +675,11 @@ cmELF::StringEntry const* cmELFInternalI - // External class implementation. - - const long cmELF::TagRPath = DT_RPATH; -+#ifdef DT_RUNPATH - const long cmELF::TagRunPath = DT_RUNPATH; -+#else -+const long cmELF::TagRunPath = 0; +@@ -44,6 +44,9 @@ typedef struct Elf32_Rela Elf32_Rela; + #ifdef _SCO_DS + #include <link.h> // For DT_SONAME etc. + #endif ++#ifndef DT_RUNPATH ++#define DT_RUNPATH 29 +#endif - #ifdef DT_MIPS_RLD_MAP_REL - const long cmELF::TagMipsRldMapRel = DT_MIPS_RLD_MAP_REL; + // Low-level byte swapping implementation. + template <size_t s> |