Deal with systems providing execvpe.

6 files changed, 69 insertions, 3 deletions

diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index 96e8e317913..b4e5282a448 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.15 2012/11/11 22:30:08 joerg Exp $
+$NetBSD: distinfo,v 1.16 2014/10/14 14:04:19 joerg Exp $
 
 SHA1 (hugs98-Sep2006.tar.gz) = bf3fec6b28ab812839d20a6c19d0f39e8190b4cc
 RMD160 (hugs98-Sep2006.tar.gz) = 99b6b88bd7256efa16e97684f265932d29133c40
 Size (hugs98-Sep2006.tar.gz) = 2157369 bytes
-SHA1 (patch-packages_base_include_HsBase.h) = 003db97899985bec5783dfdda2436019f49686c6
+SHA1 (patch-packages_base_cbits_execvpe.c) = 4ed8e023a12f67d8687f1f32d1c20b7045f5bda9
+SHA1 (patch-packages_base_configure) = 60ef62c4d20c6f1552b2564f8b67c4495f514130
+SHA1 (patch-packages_base_configure.ac) = 1101dd23e1a2dedc38cfa12ff5b07ecfc8bea129
+SHA1 (patch-packages_base_include_HsBase.h) = 1f3071c6afa6d0aaa5aa01bfb77abdf0147f795b
+SHA1 (patch-packages_base_include_HsBaseConfig.h.in) = 64be85306e04edc429168e68725e6ad76b758d88
diff --git a/lang/hugs/patches/patch-packages_base_cbits_execvpe.c b/lang/hugs/patches/patch-packages_base_cbits_execvpe.c
new file mode 100644
index 00000000000..a70d920f57f
--- /dev/null
+++ b/lang/hugs/patches/patch-packages_base_cbits_execvpe.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-packages_base_cbits_execvpe.c,v 1.1 2014/10/14 14:04:19 joerg Exp $
+
+--- packages/base/cbits/execvpe.c.orig	2014-10-14 12:37:00.000000000 +0000
++++ packages/base/cbits/execvpe.c
+@@ -5,7 +5,7 @@
+    -------------------------------------------------------------------------- */
+ #include "HsBase.h"
+ 
+-#if !(defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)) /* to the end */
++#if !(defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)) && !HAVE_EXECVPE /* to the end */
+ 
+ /* Evidently non-Posix. */
+ /* #include "PosixSource.h" */
diff --git a/lang/hugs/patches/patch-packages_base_configure b/lang/hugs/patches/patch-packages_base_configure
new file mode 100644
index 00000000000..4d081bdaf2f
--- /dev/null
+++ b/lang/hugs/patches/patch-packages_base_configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-packages_base_configure,v 1.1 2014/10/14 14:04:19 joerg Exp $
+
+--- packages/base/configure.orig	2014-10-14 12:09:59.000000000 +0000
++++ packages/base/configure
+@@ -5539,7 +5539,7 @@ done
+ 
+ 
+ 
+-for ac_func in _chsize ftruncate
++for ac_func in _chsize ftruncate execvpe
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/lang/hugs/patches/patch-packages_base_configure.ac b/lang/hugs/patches/patch-packages_base_configure.ac
new file mode 100644
index 00000000000..651edde7296
--- /dev/null
+++ b/lang/hugs/patches/patch-packages_base_configure.ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-packages_base_configure.ac,v 1.1 2014/10/14 14:04:19 joerg Exp $
+
+--- packages/base/configure.ac.orig	2014-10-14 12:09:57.000000000 +0000
++++ packages/base/configure.ac
+@@ -31,7 +31,7 @@ AC_CHECK_HEADERS([wctype.h], [AC_CHECK_F
+ 
+ AC_CHECK_FUNCS([ftime gmtime_r localtime_r lstat readdir_r])
+ AC_CHECK_FUNCS([getclock getrusage gettimeofday setitimer times])
+-AC_CHECK_FUNCS([_chsize ftruncate])
++AC_CHECK_FUNCS([_chsize ftruncate execvpe])
+ 
+ dnl ** check if it is safe to include both <time.h> and <sys/time.h>
+ AC_HEADER_TIME
diff --git a/lang/hugs/patches/patch-packages_base_include_HsBase.h b/lang/hugs/patches/patch-packages_base_include_HsBase.h
index d83955e1698..a0fceec0dd9 100644
--- a/lang/hugs/patches/patch-packages_base_include_HsBase.h
+++ b/lang/hugs/patches/patch-packages_base_include_HsBase.h
@@ -1,7 +1,16 @@
-$NetBSD: patch-packages_base_include_HsBase.h,v 1.1 2012/11/11 22:30:09 joerg Exp $
+$NetBSD: patch-packages_base_include_HsBase.h,v 1.2 2014/10/14 14:04:19 joerg Exp $
 
 --- packages/base/include/HsBase.h.orig	2006-09-20 22:01:52.000000000 +0000
 +++ packages/base/include/HsBase.h
+@@ -149,7 +149,7 @@ int inputReady(int fd, int msecs, int is
+ /* in Signals.c */
+ extern HsInt nocldstop;
+ 
+-#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32)
++#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) && !HAVE_EXECVPE
+ /* in execvpe.c */
+ extern int execvpe(char *name, char *const argv[], char **envp);
+ extern void pPrPr_disableITimers (void);
 @@ -221,7 +221,11 @@ StgWord64 stg_integerToWord64 (StgInt sa
  # if defined(_MSC_VER)
  #  define INLINE extern __inline
diff --git a/lang/hugs/patches/patch-packages_base_include_HsBaseConfig.h.in b/lang/hugs/patches/patch-packages_base_include_HsBaseConfig.h.in
new file mode 100644
index 00000000000..35c97984e78
--- /dev/null
+++ b/lang/hugs/patches/patch-packages_base_include_HsBaseConfig.h.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-packages_base_include_HsBaseConfig.h.in,v 1.1 2014/10/14 14:04:19 joerg Exp $
+
+--- packages/base/include/HsBaseConfig.h.in.orig	2014-10-14 12:10:33.000000000 +0000
++++ packages/base/include/HsBaseConfig.h.in
+@@ -419,6 +419,9 @@
+ /* Define to 1 if you have the <errno.h> header file. */
+ #undef HAVE_ERRNO_H
+ 
++/* Define to 1 if you have the `execvpe' function. */
++#undef HAVE_EXECVPE
++
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #undef HAVE_FCNTL_H
+