[pkgsrc/trunk]: pkgsrc/lang/gcc48 Fix build issues on Darwin

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ae598a3cd82
branches:  trunk
changeset: 645324:4ae598a3cd82
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Jan 27 04:46:06 2015 +0000

description:
Fix build issues on Darwin

diffstat:

 lang/gcc48/distinfo                                             |   3 +-
 lang/gcc48/options.mk                                           |  10 +++++++-
 lang/gcc48/patches/patch-libsanitizer_asan_asan__malloc__mac.cc |  12 ++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (57 lines):

diff -r f8c467647934 -r 4ae598a3cd82 lang/gcc48/distinfo
--- a/lang/gcc48/distinfo       Tue Jan 27 04:37:53 2015 +0000
+++ b/lang/gcc48/distinfo       Tue Jan 27 04:46:06 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2015/01/14 10:36:17 jperkin Exp $
+$NetBSD: distinfo,v 1.21 2015/01/27 04:46:06 dbj Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -74,6 +74,7 @@
 SHA1 (patch-libjava_libltdl_configure) = aed53e3063685d16a9dbd4c494e40be2a2ecede4
 SHA1 (patch-libjava_prims.cc) = b6007bfa5700046ca0e31de44539c5a8ccaede68
 SHA1 (patch-libmudflap_mf-runtime.h) = efb0687749fbd8d71e75542a36392d51805c2cc8
+SHA1 (patch-libsanitizer_asan_asan__malloc__mac.cc) = b6345978a7d358a2d8f0c278309dcd472c10b1d6
 SHA1 (patch-libsanitizer_configure.tgt) = a56ba5e2dc6bc413e80358353af16e6910b0e106
 SHA1 (patch-libstdc++-v3_config_locale_dragonfly_c__locale.cc) = 5c0ccc6b90e3508b03ed399e8e9e300a6aa9cbb7
 SHA1 (patch-libstdc++-v3_config_locale_dragonfly_ctype__members.cc) = 876a754c7fcb1c4a362ca7b2655da6cdbb784ccc
diff -r f8c467647934 -r 4ae598a3cd82 lang/gcc48/options.mk
--- a/lang/gcc48/options.mk     Tue Jan 27 04:37:53 2015 +0000
+++ b/lang/gcc48/options.mk     Tue Jan 27 04:46:06 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2014/10/31 14:22:20 ryoon Exp $
+# $NetBSD: options.mk,v 1.8 2015/01/27 04:46:06 dbj Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
@@ -132,6 +132,14 @@
 PLIST_SUBST+=          JAVA_NAME=${JAVA_NAME:Q}
 PLIST_SUBST+=          JAVA_ARCH=${JAVA_ARCH:Q}
 
+.if ${OPSYS} == "Darwin"
+SUBST_CLASSES+=                        fix-dylib
+SUBST_STAGE.fix-dylib=         pre-configure
+SUBST_MESSAGE.fix-dylib=       Fixing java dylib symlink
+SUBST_FILES.fix-dylib=         libjava/Makefile.in
+SUBST_SED.fix-dylib=           -e 's,libjvm.so,libjvm.dylib,g'
+.endif
+
 # Create a JPackage compatible SDK environment.
 CONFIGURE_ARGS+=       --enable-java-home
 CONFIGURE_ARGS+=       --with-os-directory=${LOWER_OPSYS:Q}
diff -r f8c467647934 -r 4ae598a3cd82 lang/gcc48/patches/patch-libsanitizer_asan_asan__malloc__mac.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc48/patches/patch-libsanitizer_asan_asan__malloc__mac.cc   Tue Jan 27 04:46:06 2015 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-libsanitizer_asan_asan__malloc__mac.cc,v 1.1 2015/01/27 04:46:06 dbj Exp $
+
+--- libsanitizer/asan/asan_malloc_mac.cc.orig  2013-01-23 11:41:33.000000000 +0000
++++ libsanitizer/asan/asan_malloc_mac.cc
+@@ -13,7 +13,6 @@
+ #ifdef __APPLE__
+ 
+ #include <AvailabilityMacros.h>
+-#include <CoreFoundation/CFBase.h>
+ #include <dlfcn.h>
+ #include <malloc/malloc.h>
+