hg: bsd-port/bsd-port/jdk: . Pull in a MacOS X compatible version of binary_file_verification from the

[Stephen Bannasch]

At 6:23 PM +0000 3/8/11, glewis at eyesbeyond.com wrote:
>Changeset: 79f55f85ae1d
>Author:    Greg Lewis <glewis at eyesbeyond.com>
>Date:      2011-03-08 10:22 -0800
>URL:       http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/79f55f85ae1d
>
>. Pull in a MacOS X compatible version of binary_file_verification from the
>  MacOS X port.
>
>Obtained from:	macosx-port (Alexander Strange <astrange at apple.com>)
>
>! make/common/shared/Defs-bsd.gmk
>! make/common/shared/Defs-utils.gmk


Hi Greg,

The change you pulled from the Mac OS X port for jdk/make/common/shared/Defs-bsd.gmk
doesn't work -- the result is a unhelpful error about being unable to compile freetype.

Apply these changes and it will:

[jdk]$ hg diff
diff --git a/make/common/shared/Defs-bsd.gmk b/make/common/shared/Defs-bsd.gmk
--- a/make/common/shared/Defs-bsd.gmk
+++ b/make/common/shared/Defs-bsd.gmk
@@ -177,6 +177,7 @@
 
 # Macro to check it's input file for banned dependencies and verify the
 #   binary built properly. Relies on process exit code.
+define binary_file_verification # binary_file
 ifeq ($(OS_VENDOR), Apple)
 ( \
   $(ECHO) "Checking for mapfile use in: $1" && \
@@ -189,7 +190,6 @@
   ( $(OTOOL) -l $1 | $(EGREP) 'path ' ) \
 )
 else
-define binary_file_verification # binary_file
 ( \
   $(ECHO) "Checking for mapfile use in: $1" && \
   if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
@@ -200,5 +200,5 @@
   $(ECHO) "RUNPATH for: $1" && \
   ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
 )
+endif
 endef
-endif
[jdk]$