Fix net/nload cross-build by avoiding AC_FUNC_MALLOC in configure.

3 files changed, 91 insertions, 3 deletions

diff --git a/net/nload/distinfo b/net/nload/distinfo
index 5d264a48651..9f218e1513b 100644
--- a/net/nload/distinfo
+++ b/net/nload/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/02/15 12:30:06 obache Exp $
+$NetBSD: distinfo,v 1.6 2013/05/11 19:27:48 riastradh Exp $
 
 SHA1 (nload-0.7.4.tar.gz) = bb0a168c93c588ad4fd5e3a653b3620b79ada1e8
 RMD160 (nload-0.7.4.tar.gz) = 77eb199ee73fdc45b25b0e246c2ba73fa6efe779
 Size (nload-0.7.4.tar.gz) = 151005 bytes
 SHA1 (patch-aa) = 1551e7059eb0ebde05ed8cdc561099192d048503
-SHA1 (patch-ac) = 6d26b865eeea4f8ae18db7f1ad6703694d63f514
+SHA1 (patch-ac) = bbc117e6801fc7918eeff56ce2a467402bf2a903
+SHA1 (patch-configure.in) = e8858851c2514c1708d36d01e85ff83cdbf099b7
diff --git a/net/nload/patches/patch-ac b/net/nload/patches/patch-ac
index e6204be47de..74289972c02 100644
--- a/net/nload/patches/patch-ac
+++ b/net/nload/patches/patch-ac
@@ -1,4 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2012/02/15 12:30:06 obache Exp $
+$NetBSD: patch-ac,v 1.5 2013/05/11 19:27:48 riastradh Exp $
+
+Match Darwin and DragonflyBSD as BSD too.
+
+Skip broken AC_FUNC_MALLOC.
 
 --- configure.orig	2012-02-06 09:53:58.000000000 +0000
 +++ configure
@@ -11,3 +15,65 @@ $NetBSD: patch-ac,v 1.4 2012/02/15 12:30:06 obache Exp $
  
  $as_echo "#define HAVE_BSD 1" >>confdefs.h
  
+@@ -4707,61 +4707,6 @@ fi
+ 
+ done
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then :
+-  ac_cv_func_malloc_0_nonnull=no
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+-# include <stdlib.h>
+-#else
+-char *malloc ();
+-#endif
+-
+-int
+-main ()
+-{
+-return ! malloc (0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  ac_cv_func_malloc_0_nonnull=yes
+-else
+-  ac_cv_func_malloc_0_nonnull=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+-if test $ac_cv_func_malloc_0_nonnull = yes; then :
+-
+-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
+-
+-else
+-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
+-
+-   case " $LIBOBJS " in
+-  *" malloc.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
+- ;;
+-esac
+-
+-
+-$as_echo "#define malloc rpl_malloc" >>confdefs.h
+-
+-fi
+-
+-
+         ;;
+     *solaris*)
+ 
diff --git a/net/nload/patches/patch-configure.in b/net/nload/patches/patch-configure.in
new file mode 100644
index 00000000000..cb7c9584d1c
--- /dev/null
+++ b/net/nload/patches/patch-configure.in
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure.in,v 1.1 2013/05/11 19:27:48 riastradh Exp $
+
+Match Darwin and DragonflyBSD as BSD too.
+
+Skip broken AC_FUNC_MALLOC.
+
+--- configure.in.orig	2012-02-06 09:39:14.000000000 +0000
++++ configure.in
+@@ -38,11 +38,9 @@ case $host_os in
+ 
+         AC_CHECK_FUNCS([memset])
+         ;;
+-    *bsd*)
++    *bsd* | *darwin* | *dragonfly*)
+         AC_DEFINE(HAVE_BSD, 1, [Define to 1 if your build target is BSD.])
+         AM_CONDITIONAL(HAVE_BSD, true)
+-        
+-        AC_FUNC_MALLOC
+         ;;
+     *solaris*)
+         AC_DEFINE(HAVE_SOLARIS, 1, [Define to 1 if your build target is Solaris.])