Tue Oct 14 14:04:19 2014 UTC ()
Deal with systems providing execvpe.


(joerg)
diff -r1.15 -r1.16 pkgsrc/lang/hugs/distinfo
diff -r0 -r1.1 pkgsrc/lang/hugs/patches/patch-packages_base_cbits_execvpe.c
diff -r0 -r1.1 pkgsrc/lang/hugs/patches/patch-packages_base_configure
diff -r0 -r1.1 pkgsrc/lang/hugs/patches/patch-packages_base_configure.ac
diff -r0 -r1.1 pkgsrc/lang/hugs/patches/patch-packages_base_include_HsBaseConfig.h.in
diff -r1.1 -r1.2 pkgsrc/lang/hugs/patches/patch-packages_base_include_HsBase.h

cvs diff -r1.15 -r1.16 pkgsrc/lang/hugs/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/hugs/distinfo 2012/11/11 22:30:08 1.15
+++ pkgsrc/lang/hugs/distinfo 2014/10/14 14:04:19 1.16
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
1$NetBSD: distinfo,v 1.15 2012/11/11 22:30:08 joerg Exp $ 1$NetBSD: distinfo,v 1.16 2014/10/14 14:04:19 joerg Exp $
2 2
3SHA1 (hugs98-Sep2006.tar.gz) = bf3fec6b28ab812839d20a6c19d0f39e8190b4cc 3SHA1 (hugs98-Sep2006.tar.gz) = bf3fec6b28ab812839d20a6c19d0f39e8190b4cc
4RMD160 (hugs98-Sep2006.tar.gz) = 99b6b88bd7256efa16e97684f265932d29133c40 4RMD160 (hugs98-Sep2006.tar.gz) = 99b6b88bd7256efa16e97684f265932d29133c40
5Size (hugs98-Sep2006.tar.gz) = 2157369 bytes 5Size (hugs98-Sep2006.tar.gz) = 2157369 bytes
6SHA1 (patch-packages_base_include_HsBase.h) = 003db97899985bec5783dfdda2436019f49686c6 6SHA1 (patch-packages_base_cbits_execvpe.c) = 4ed8e023a12f67d8687f1f32d1c20b7045f5bda9
 7SHA1 (patch-packages_base_configure) = 60ef62c4d20c6f1552b2564f8b67c4495f514130
 8SHA1 (patch-packages_base_configure.ac) = 1101dd23e1a2dedc38cfa12ff5b07ecfc8bea129
 9SHA1 (patch-packages_base_include_HsBase.h) = 1f3071c6afa6d0aaa5aa01bfb77abdf0147f795b
 10SHA1 (patch-packages_base_include_HsBaseConfig.h.in) = 64be85306e04edc429168e68725e6ad76b758d88

File Added: pkgsrc/lang/hugs/patches/patch-packages_base_cbits_execvpe.c
$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" */

File Added: pkgsrc/lang/hugs/patches/patch-packages_base_configure
$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

File Added: pkgsrc/lang/hugs/patches/patch-packages_base_configure.ac
$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

File Added: pkgsrc/lang/hugs/patches/patch-packages_base_include_HsBaseConfig.h.in
$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
 

cvs diff -r1.1 -r1.2 pkgsrc/lang/hugs/patches/patch-packages_base_include_HsBase.h (expand / switch to unified diff)

--- pkgsrc/lang/hugs/patches/patch-packages_base_include_HsBase.h 2012/11/11 22:30:09 1.1
+++ pkgsrc/lang/hugs/patches/patch-packages_base_include_HsBase.h 2014/10/14 14:04:19 1.2
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-packages_base_include_HsBase.h,v 1.1 2012/11/11 22:30:09 joerg Exp $ 1$NetBSD: patch-packages_base_include_HsBase.h,v 1.2 2014/10/14 14:04:19 joerg Exp $
2 2
3--- packages/base/include/HsBase.h.orig 2006-09-20 22:01:52.000000000 +0000 3--- packages/base/include/HsBase.h.orig 2006-09-20 22:01:52.000000000 +0000
4+++ packages/base/include/HsBase.h 4+++ packages/base/include/HsBase.h
 5@@ -149,7 +149,7 @@ int inputReady(int fd, int msecs, int is
 6 /* in Signals.c */
 7 extern HsInt nocldstop;
 8
 9-#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32)
 10+#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) && !HAVE_EXECVPE
 11 /* in execvpe.c */
 12 extern int execvpe(char *name, char *const argv[], char **envp);
 13 extern void pPrPr_disableITimers (void);
5@@ -221,7 +221,11 @@ StgWord64 stg_integerToWord64 (StgInt sa 14@@ -221,7 +221,11 @@ StgWord64 stg_integerToWord64 (StgInt sa
6 # if defined(_MSC_VER) 15 # if defined(_MSC_VER)
7 # define INLINE extern __inline 16 # define INLINE extern __inline
8 # elif defined(__GNUC__) 17 # elif defined(__GNUC__)
9-# define INLINE extern inline 18-# define INLINE extern inline
10+# ifdef __GNUC_STDC_INLINE__ 19+# ifdef __GNUC_STDC_INLINE__
11+# define INLINE extern inline __attribute__((__gnu_inline__)) 20+# define INLINE extern inline __attribute__((__gnu_inline__))
12+# else 21+# else
13+# define INLINE extern inline 22+# define INLINE extern inline
14+# endif 23+# endif
15 # else 24 # else
16 # define INLINE inline 25 # define INLINE inline
17 # endif 26 # endif