[Cmake-commits] CMake branch, next, updated. v3.6.1-1040-g567b83a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  567b83acbae9f986bbbe0d85770810be4b88836a (commit)
       via  56539d89da4f8f0834a17faee14ef88f3b232048 (commit)
       via  16a3a73508e8109e453e35288c37fe545a8ab59e (commit)
      from  7b3e38b04e7abd7144b33938f839c61aa92e6660 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567b83acbae9f986bbbe0d85770810be4b88836a
commit 567b83acbae9f986bbbe0d85770810be4b88836a
Merge: 7b3e38b 56539d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 10:11:32 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 10:11:32 2016 -0400

    Merge topic 'port-to-sco' into next
    
    56539d89 SCO_SV: Enable so filename versioning
    16a3a735 cmELF: Port to SCO OpenServer 5.0.7/3.2


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56539d89da4f8f0834a17faee14ef88f3b232048
commit 56539d89da4f8f0834a17faee14ef88f3b232048
Author:     Patrick Welche <prlw1 at cam.ac.uk>
AuthorDate: Thu Jul 28 17:26:10 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 10:09:52 2016 -0400

    SCO_SV: Enable so filename versioning
    
    Take changes used by pkgsrc [1]:
    
    * so filename versioning requires CMAKE_SHARED_LIBRARY_SONAME_C_FLAG.
    
    [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/

diff --git a/Modules/Platform/SCO_SV.cmake b/Modules/Platform/SCO_SV.cmake
index ddd9600..1cb4b38 100644
--- a/Modules/Platform/SCO_SV.cmake
+++ b/Modules/Platform/SCO_SV.cmake
@@ -1,2 +1,3 @@
 set(CMAKE_DL_LIBS "")
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h,")
 include(Platform/UnixPaths)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16a3a73508e8109e453e35288c37fe545a8ab59e
commit 16a3a73508e8109e453e35288c37fe545a8ab59e
Author:     Patrick Welche <prlw1 at cam.ac.uk>
AuthorDate: Thu Jul 28 17:26:10 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 10:04:31 2016 -0400

    cmELF: Port to SCO OpenServer 5.0.7/3.2
    
    Take changes used by pkgsrc [1]:
    
    * SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
    
    [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/

diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx
index 15755cb..266b786 100644
--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@@ -46,6 +46,9 @@ typedef struct Elf32_Rela Elf32_Rela;
 #if defined(__sun)
 #include <sys/link.h> // For dynamic section information
 #endif
+#ifdef _SCO_DS
+#include <link.h> // For DT_SONAME etc.
+#endif
 
 // Low-level byte swapping implementation.
 template <size_t s>
@@ -214,6 +217,7 @@ struct cmELFTypes32
 };
 
 // Configure the implementation template for 64-bit ELF files.
+#ifndef _SCO_DS
 struct cmELFTypes64
 {
   typedef Elf64_Ehdr ELF_Ehdr;
@@ -223,6 +227,7 @@ struct cmELFTypes64
   typedef KWIML_INT_uint64_t tagtype;
   static const char* GetName() { return "64-bit"; }
 };
+#endif
 
 // Parser implementation template.
 template <class Types>
@@ -800,10 +805,14 @@ cmELF::cmELF(const char* fname)
   if (ident[EI_CLASS] == ELFCLASS32) {
     // 32-bit ELF
     this->Internal = new cmELFInternalImpl<cmELFTypes32>(this, fin, order);
-  } else if (ident[EI_CLASS] == ELFCLASS64) {
+  }
+#ifndef _SCO_DS
+  else if (ident[EI_CLASS] == ELFCLASS64) {
     // 64-bit ELF
     this->Internal = new cmELFInternalImpl<cmELFTypes64>(this, fin, order);
-  } else {
+  }
+#endif
+  else {
     this->ErrorMessage = "ELF file class is not 32-bit or 64-bit.";
     return;
   }

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/SCO_SV.cmake |    1 +
 Source/cmELF.cxx              |   13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake