summaryrefslogtreecommitdiff
path: root/devel/cmake/patches/patch-Source_cmELF.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'devel/cmake/patches/patch-Source_cmELF.cxx')
-rw-r--r--devel/cmake/patches/patch-Source_cmELF.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/devel/cmake/patches/patch-Source_cmELF.cxx b/devel/cmake/patches/patch-Source_cmELF.cxx
index 58b414531a4..8d624d5047e 100644
--- a/devel/cmake/patches/patch-Source_cmELF.cxx
+++ b/devel/cmake/patches/patch-Source_cmELF.cxx
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_cmELF.cxx,v 1.1 2014/07/17 13:44:28 ryoon Exp $
+$NetBSD: patch-Source_cmELF.cxx,v 1.2 2015/01/17 13:29:55 adam Exp $
* SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
---- Source/cmELF.cxx.orig 2014-01-16 17:15:08.000000000 +0000
+--- Source/cmELF.cxx.orig 2014-12-15 20:07:43.000000000 +0000
+++ Source/cmELF.cxx
-@@ -28,6 +28,9 @@
+@@ -49,6 +49,9 @@
#if defined(__sun)
# include <sys/link.h> // For dynamic section information
#endif
@@ -14,29 +14,29 @@ $NetBSD: patch-Source_cmELF.cxx,v 1.1 2014/07/17 13:44:28 ryoon Exp $
//----------------------------------------------------------------------------
// Low-level byte swapping implementation.
-@@ -181,6 +184,8 @@ struct cmELFTypes32
+@@ -203,6 +206,8 @@ struct cmELFTypes32
};
- // Configure the implementation template for 32-bit ELF files.
+ // Configure the implementation template for 64-bit ELF files.
+#if !defined(_SCO_DS)
-+// SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
++// SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
struct cmELFTypes64
{
typedef Elf64_Ehdr ELF_Ehdr;
-@@ -189,6 +194,7 @@ struct cmELFTypes64
- typedef Elf64_Half ELF_Half;
+@@ -212,6 +217,7 @@ struct cmELFTypes64
+ typedef cmIML_INT_uint64_t tagtype;
static const char* GetName() { return "64-bit"; }
};
+#endif
//----------------------------------------------------------------------------
// Parser implementation template.
-@@ -764,11 +770,14 @@ cmELF::cmELF(const char* fname): Interna
+@@ -788,11 +794,14 @@ cmELF::cmELF(const char* fname): Interna
// 32-bit ELF
this->Internal = new cmELFInternalImpl<cmELFTypes32>(this, fin, order);
}
+#if !defined(_SCO_DS)
-+// SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
++// SCO OpenServer 5.0.7/3.2 does not support 64-bit ELF.
else if(ident[EI_CLASS] == ELFCLASS64)
{
// 64-bit ELF