summaryrefslogtreecommitdiff
path: root/devel/bmake
diff options
context:
space:
mode:
authorjoerg <joerg>2007-09-06 20:25:21 +0000
committerjoerg <joerg>2007-09-06 20:25:21 +0000
commitef70bbbca03e4d7e41b8836ffabec63c7e81ff2f (patch)
tree7b7ad14775770611036cd7b7768f9256d7a0390e /devel/bmake
parent79ffb3dc4b288006346ff59a93d132c6d3e4320c (diff)
downloadpkgsrc-ef70bbbca03e4d7e41b8836ffabec63c7e81ff2f.tar.gz
Add QNX support. Don't redefine __BEGIN_DECLS and __END_DECLS if
system headers provided them. From Sean Boudreau.
Diffstat (limited to 'devel/bmake')
-rw-r--r--devel/bmake/files/missing/sys/cdefs.h18
-rw-r--r--devel/bmake/files/os.sh7
2 files changed, 19 insertions, 6 deletions
diff --git a/devel/bmake/files/missing/sys/cdefs.h b/devel/bmake/files/missing/sys/cdefs.h
index 9432d65893b..3532281a3dc 100644
--- a/devel/bmake/files/missing/sys/cdefs.h
+++ b/devel/bmake/files/missing/sys/cdefs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.2 2007/05/07 22:19:32 rillig Exp $ */
+/* $NetBSD: cdefs.h,v 1.3 2007/09/06 20:25:21 joerg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -73,11 +73,19 @@
#endif
#if defined(__cplusplus)
-#define __BEGIN_DECLS extern "C" {
-#define __END_DECLS };
+# ifndef __BEGIN_DECLS
+# define __BEGIN_DECLS extern "C" {
+# endif
+# ifndef __END_DECLS
+# define __END_DECLS };
+# endif
#else
-#define __BEGIN_DECLS
-#define __END_DECLS
+# ifndef __BEGIN_DECLS
+# define __BEGIN_DECLS
+# endif
+# ifndef __END_DECLS
+# define __END_DECLS
+# endif
#endif
/*
diff --git a/devel/bmake/files/os.sh b/devel/bmake/files/os.sh
index 6e9d6c41e8b..b07ca664a3e 100644
--- a/devel/bmake/files/os.sh
+++ b/devel/bmake/files/os.sh
@@ -17,7 +17,7 @@
# Simon J. Gerraty <sjg@crufty.net>
# RCSid:
-# $Id: os.sh,v 1.1.1.1 2005/12/02 00:02:59 sjg Exp $
+# $Id: os.sh,v 1.2 2007/09/06 20:25:21 joerg Exp $
#
# @(#) Copyright (c) 1994 Simon J. Gerraty
#
@@ -172,6 +172,11 @@ Linux)
PS_AXC=axc
[ -x /usr/bin/md5sum ] && { MD5=/usr/bin/md5sum; export MD5; }
;;
+QNX)
+ case $MACHINE in
+ x86pc) MACHINE_ARCH=i386;;
+ esac
+ ;;
esac
HOSTNAME=${HOSTNAME:-`( hostname ) 2>/dev/null`}