Fix build under 10-CURRENT.

4 files changed, 106 insertions, 1 deletions

diff --git a/lang/dmd/files/patch-src-dmd-mars.c b/lang/dmd/files/patch-src-dmd-mars.c
new file mode 100644
index 000000000000..c7076410113a
--- /dev/null
+++ b/lang/dmd/files/patch-src-dmd-mars.c
@@ -0,0 +1,29 @@
+--- ../../src/dmd/mars.c.orig	2012-12-31 12:16:46.000000000 -0800
++++ ../../src/dmd/mars.c	2013-09-27 11:06:20.705469255 -0700
+@@ -387,7 +387,7 @@
+ }
+ #endif
+ 
+-int main(size_t argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+     mem.init();                         // initialize storage allocator
+     mem.setStackBottom(&argv);
+@@ -422,7 +422,7 @@
+             goto Largs;
+     }
+ 
+-    if (response_expand(&argc,&argv))   // expand response files
++    if (response_expand((size_t *) &argc,&argv))   // expand response files
+         error(0, "can't open response file");
+ 
+     files.reserve(argc - 1);
+@@ -522,7 +522,7 @@
+ 
+     inifile(argv[0], inifilename, is64bit ? "Environment64" : "Environment32");
+ 
+-    getenv_setargv("DFLAGS", &argc, &argv);
++    getenv_setargv("DFLAGS", (size_t *) &argc, &argv);
+ 
+ #if 0
+     for (size_t i = 0; i < argc; i++)
diff --git a/lang/dmd/files/patch-src-dmd-posix.mak b/lang/dmd/files/patch-src-dmd-posix.mak
index 4cb15ff22a73..5a495b45a8a3 100644
--- a/lang/dmd/files/patch-src-dmd-posix.mak
+++ b/lang/dmd/files/patch-src-dmd-posix.mak
@@ -1,5 +1,5 @@
 --- ../../src/dmd/posix.mak.orig	2012-12-31 12:16:46.000000000 -0800
-+++ ../../src/dmd/posix.mak	2013-01-30 16:20:15.160587655 -0800
++++ ../../src/dmd/posix.mak	2013-09-27 22:38:06.189546090 -0700
 @@ -49,7 +49,6 @@
  TK=tk
  ROOT=root
@@ -8,3 +8,21 @@
  ifneq (x,x$(MODEL))
      MODEL_FLAG=-m$(MODEL)
  endif
+@@ -73,7 +72,7 @@
+     LDFLAGS=-lm -lstdc++ -lpthread
+ endif
+ 
+-HOST_CC=g++
++HOST_CC=$(CXX)
+ CC=$(HOST_CC) $(MODEL_FLAG) $(TARGET_CFLAGS)
+ 
+ #OPT=-g -g3
+@@ -572,7 +571,7 @@
+ 	$(CC) -c $(GFLAGS) -I$(ROOT) $<
+ 
+ strtold.o: $C/strtold.c
+-	gcc $(MODEL_FLAG) -I$(ROOT) -c $<
++	$(CC) $(MODEL_FLAG) -I$(ROOT) -c $<
+ 
+ struct.o: struct.c
+ 	$(CC) -c $(CFLAGS) $<
diff --git a/lang/dmd/files/patch-src-dmd-root-port.c b/lang/dmd/files/patch-src-dmd-root-port.c
new file mode 100644
index 000000000000..614b64d73d5f
--- /dev/null
+++ b/lang/dmd/files/patch-src-dmd-root-port.c
@@ -0,0 +1,29 @@
+--- ../../src/dmd/root/port.c.orig	2012-12-31 12:16:46.000000000 -0800
++++ ../../src/dmd/root/port.c	2013-09-27 22:41:16.360128824 -0700
+@@ -386,7 +386,7 @@
+ #else
+     return __inline_isnan(r);
+ #endif
+-#elif __OpenBSD__
++#elif __OpenBSD__ || __FreeBSD__
+     return isnan(r);
+ #else
+     #undef isnan
+@@ -402,7 +402,7 @@
+ #else
+     return __inline_isnan(r);
+ #endif
+-#elif __OpenBSD__
++#elif __OpenBSD__ || __FreeBSD__
+     return isnan(r);
+ #else
+     #undef isnan
+@@ -436,7 +436,7 @@
+ {
+ #if __APPLE__
+     return fpclassify(r) == FP_INFINITE;
+-#elif __OpenBSD__
++#elif __OpenBSD__ || __FreeBSD__
+     return isinf(r);
+ #else
+     #undef isinf
diff --git a/lang/dmd2/files/patch-src-dmd-root-port.c b/lang/dmd2/files/patch-src-dmd-root-port.c
new file mode 100644
index 000000000000..f7d6bf72258f
--- /dev/null
+++ b/lang/dmd2/files/patch-src-dmd-root-port.c
@@ -0,0 +1,29 @@
+--- ../../src/dmd/root/port.c.orig	2013-06-12 22:42:08.000000000 -0700
++++ ../../src/dmd/root/port.c	2013-09-27 17:56:26.292841909 -0700
+@@ -406,7 +406,7 @@
+ #else
+     return __inline_isnan(r);
+ #endif
+-#elif __OpenBSD__
++#elif __OpenBSD__ || __FreeBSD__
+     return isnan(r);
+ #else
+     #undef isnan
+@@ -422,7 +422,7 @@
+ #else
+     return __inline_isnan(r);
+ #endif
+-#elif __OpenBSD__
++#elif __OpenBSD__ || __FreeBSD__
+     return isnan(r);
+ #else
+     #undef isnan
+@@ -456,7 +456,7 @@
+ {
+ #if __APPLE__
+     return fpclassify(r) == FP_INFINITE;
+-#elif __OpenBSD__
++#elif __OpenBSD__ || __FreeBSD__
+     return isinf(r);
+ #else
+     #undef isinf