CVS commit: pkgsrc/devel/cmake

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Apr 24 22:48:48 UTC 2017

Modified Files:
        pkgsrc/devel/cmake: distinfo
        pkgsrc/devel/cmake/patches: patch-Source_CursesDialog_ccmake.cxx
Added Files:
        pkgsrc/devel/cmake/patches: patch-Source_cmELF.cxx

Log Message:
cmake: fix build under netbsd-6

don't use DT_RUNPATH if it's not defined
include cstdlib as our patch uses exit

from yancm via pkgsrc-users


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
cvs rdiff -u -r0 -r1.6 pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.97 pkgsrc/devel/cmake/distinfo:1.98
--- pkgsrc/devel/cmake/distinfo:1.97    Tue Apr 11 20:18:54 2017
+++ pkgsrc/devel/cmake/distinfo Mon Apr 24 22:48:48 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.97 2017/04/11 20:18:54 adam Exp $
+$NetBSD: distinfo,v 1.98 2017/04/24 22:48:48 maya Exp $
 
 SHA1 (cmake-3.8.0.tar.gz) = 660ec06a46b46dc5d675371a2256ec739f8bb8b7
 RMD160 (cmake-3.8.0.tar.gz) = 30dacd3b01f98fbd47721b201e48e8fe776082da
@@ -7,7 +7,8 @@ Size (cmake-3.8.0.tar.gz) = 7503379 byte
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
-SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d32233df33f057b1468bc487adb66eaa9ac1a7c9
+SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 1685973706bd2041422e5f8da12634c6c0695714
+SHA1 (patch-Source_cmELF.cxx) = e1629ff181c5757fad098ee1534680bf7e24cb64
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9
 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f

Index: pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx
diff -u pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.3 pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.4
--- pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx:1.3 Tue Apr 11 20:18:54 2017
+++ pkgsrc/devel/cmake/patches/patch-Source_CursesDialog_ccmake.cxx     Mon Apr 24 22:48:48 2017
@@ -1,10 +1,19 @@
-$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.3 2017/04/11 20:18:54 adam Exp $
+$NetBSD: patch-Source_CursesDialog_ccmake.cxx,v 1.4 2017/04/24 22:48:48 maya Exp $
 
 initscr() error path
+include cstdlib for exit
 
 --- Source/CursesDialog/ccmake.cxx.orig        2017-04-10 15:23:06.000000000 +0000
 +++ Source/CursesDialog/ccmake.cxx
-@@ -49,7 +49,11 @@ void onsig(int /*unused*/)
+@@ -11,6 +11,7 @@
+ #include "cmake.h"
+ 
+ #include <cmsys/Encoding.hxx>
++#include <cstdlib>
+ #include <iostream>
+ #include <signal.h>
+ #include <string.h>
+@@ -49,7 +50,11 @@ void onsig(int /*unused*/)
  {
    if (cmCursesForm::CurrentForm) {
      endwin();
@@ -17,7 +26,7 @@ initscr() error path
      noecho();             /* Echo off */
      cbreak();             /* nl- or cr not needed */
      keypad(stdscr, true); /* Use key symbols as KEY_DOWN */
-@@ -124,7 +128,10 @@ int main(int argc, char const* const* ar
+@@ -124,7 +129,10 @@ int main(int argc, char const* const* ar
      cmCursesForm::DebugStart();
    }
  

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx:1.6
--- /dev/null   Mon Apr 24 22:48:48 2017
+++ pkgsrc/devel/cmake/patches/patch-Source_cmELF.cxx   Mon Apr 24 22:48:48 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-Source_cmELF.cxx,v 1.6 2017/04/24 22:48:48 maya Exp $
+
+Don't use DT_RUNPATH if it's not defined (netbsd-6)
+
+--- 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;
++#endif
+ 
+ #ifdef DT_MIPS_RLD_MAP_REL
+ const long cmELF::TagMipsRldMapRel = DT_MIPS_RLD_MAP_REL;