Replace objdump by readelf. Fixes build on arm64.

While here, refresh patches.

PR:		212308
Submitted by:	emaste@
Reported by:	andrew@
MFH:		2016Q3
Differential Revision:	D7842

7 files changed, 22 insertions, 22 deletions

diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile
index a8b673829712..43d664b54a0a 100644
--- a/graphics/OpenEXR/Makefile
+++ b/graphics/OpenEXR/Makefile
@@ -73,8 +73,8 @@ post-patch:
 # library
 _ilm_libcxx=${COMPILER_FEATURES:Mlib*c++}
 pre-configure:
-	@${OBJDUMP} -p ${LOCALBASE}/lib/libImath.so \
-	| ${EGREP} -q '^[[:space:]]*NEEDED[[:space:]]+${_ilm_libcxx:C/\+/\\+/g}\.' \
+	@${READELF} -d ${LOCALBASE}/lib/libImath.so \
+	| ${EGREP} -q '\(NEEDED\).*\[${_ilm_libcxx:C/\+/\\+/g}\.' \
 	|| {	${ECHO_CMD} "*** Your ilmbase package uses a different C++ standard library than ***" ; \
 		${ECHO_CMD} "*** OpenEXR would. Please recompile and reinstall ilmbase with the  ***" ; \
 		${ECHO_CMD} "*** same C++ std. library before trying to build OpenEXR.  Abort.   ***" ; \
diff --git a/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in b/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
index f874a4f6603e..5e7f8e875e73 100644
--- a/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
+++ b/graphics/OpenEXR/files/patch-IlmImfUtil__Makefile.in
@@ -1,6 +1,6 @@
---- ./IlmImfUtil/Makefile.in.orig	2014-08-15 19:35:57.000000000 +0200
-+++ ./IlmImfUtil/Makefile.in	2014-08-15 19:45:15.000000000 +0200
-@@ -265,10 +265,11 @@
+--- IlmImfUtil/Makefile.in.orig	2014-08-10 04:48:23 UTC
++++ IlmImfUtil/Makefile.in
+@@ -265,10 +265,11 @@ libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFL
  libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
  libIlmImfUtilincludedir = $(includedir)/OpenEXR
  EXTRA_DIST = CMakeLists.txt
diff --git a/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp b/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
index 8253cdaaf75d..ee84d88dcb84 100644
--- a/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
+++ b/graphics/OpenEXR/files/patch-IlmImf_ImfFastHuf.cpp
@@ -1,6 +1,6 @@
---- IlmImf/ImfFastHuf.cpp.orig	2014-08-10 08:23:56.000000000 +0400
-+++ IlmImf/ImfFastHuf.cpp	2015-04-08 00:10:07.536640000 +0300
-@@ -107,7 +107,7 @@
+--- IlmImf/ImfFastHuf.cpp.orig	2014-08-10 04:23:56 UTC
++++ IlmImf/ImfFastHuf.cpp
+@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
      for (int i = 0; i <= MAX_CODE_LEN; ++i)
      {
          codeCount[i] = 0;
@@ -9,7 +9,7 @@
          offset[i]    = 0;
      }
  
-@@ -352,7 +352,7 @@
+@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base
  
      for (int i = 0; i <= MAX_CODE_LEN; ++i)
      {
@@ -18,7 +18,7 @@
          {
              _ljBase[i] = base[i] << (64 - i);
          }
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base
              // Unused code length - insert dummy values
              //
  
@@ -27,7 +27,7 @@
          }
      }
  
-@@ -417,7 +417,7 @@
+@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base
  
      int minIdx = TABLE_LOOKUP_BITS;
  
@@ -36,7 +36,7 @@
          minIdx--;
  
      if (minIdx < 0)
-@@ -427,7 +427,7 @@
+@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base
          // Set the min value such that the table is never tested.
          //
  
diff --git a/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp b/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
index 32af4ebb1297..db0fa88a2cc6 100644
--- a/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
+++ b/graphics/OpenEXR/files/patch-IlmImf__ImfSystemSpecific.cpp
@@ -1,6 +1,6 @@
---- IlmImf/ImfSystemSpecific.cpp.orig	2014-08-10 08:23:57.000000000 +0400
-+++ IlmImf/ImfSystemSpecific.cpp	2015-04-09 00:08:50.100958000 +0300
-@@ -44,11 +44,23 @@
+--- IlmImf/ImfSystemSpecific.cpp.orig	2014-08-10 04:23:57 UTC
++++ IlmImf/ImfSystemSpecific.cpp
+@@ -44,11 +44,23 @@ namespace {
      // Helper functions for gcc + SSE enabled
      void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
      {
diff --git a/graphics/OpenEXR/files/patch-IlmImf__Makefile.in b/graphics/OpenEXR/files/patch-IlmImf__Makefile.in
index 2a259498124b..d2f9cca01ac1 100644
--- a/graphics/OpenEXR/files/patch-IlmImf__Makefile.in
+++ b/graphics/OpenEXR/files/patch-IlmImf__Makefile.in
@@ -1,6 +1,6 @@
---- ./IlmImf/Makefile.in.orig	2014-08-15 19:35:57.000000000 +0200
-+++ ./IlmImf/Makefile.in	2014-08-15 19:45:43.000000000 +0200
-@@ -458,9 +458,10 @@
+--- IlmImf/Makefile.in.orig	2014-08-10 04:48:23 UTC
++++ IlmImf/Makefile.in
+@@ -458,9 +458,10 @@ noinst_HEADERS = ImfCompressor.h    \
  		 ImfOptimizedPixelReading.h
  
  EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
diff --git a/graphics/OpenEXR/files/patch-exrenvmap__main.cpp b/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
index 0a2501473816..77cab6dfc684 100644
--- a/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
+++ b/graphics/OpenEXR/files/patch-exrenvmap__main.cpp
@@ -1,5 +1,5 @@
---- ./exrenvmap/main.cpp.orig	2013-11-25 20:49:55.000000000 +0100
-+++ ./exrenvmap/main.cpp	2014-03-24 18:28:37.906458972 +0100
+--- exrenvmap/main.cpp.orig	2014-08-10 04:24:00 UTC
++++ exrenvmap/main.cpp
 @@ -47,6 +47,7 @@
  #include <ImfHeader.h>
  
diff --git a/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp b/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
index e9d021bd964c..7b83c1a5a5a1 100644
--- a/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
+++ b/graphics/OpenEXR/files/patch-exrmaketiled__main.cpp
@@ -1,5 +1,5 @@
---- ./exrmaketiled/main.cpp.orig	2013-11-25 20:49:56.000000000 +0100
-+++ ./exrmaketiled/main.cpp	2014-03-24 18:28:37.916466529 +0100
+--- exrmaketiled/main.cpp.orig	2014-08-10 04:24:00 UTC
++++ exrmaketiled/main.cpp
 @@ -43,6 +43,7 @@
  #include "makeTiled.h"