yet another mkstemp needed.

allow fixinc tests to not run.
fix acats to not use type, since which works...
This commit is contained in:
espie 2005-01-07 11:33:14 +00:00
parent 165bc45d53
commit 5fcba21418
5 changed files with 57 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2005/01/06 19:36:48 espie Exp $
# $OpenBSD: Makefile,v 1.5 2005/01/07 11:33:14 espie Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
@ -149,7 +149,8 @@ PKG_ARGS+=-DPPC=1
PKG_ARGS+=-DPPC=0
.endif
.if defined(PACKAGING) && defined(SUBPACKAGE)
SUBPACKAGE?=
.if defined(PACKAGING)
. if !empty(SUBPACKAGE) && ${SUBPACKAGE} != "-estdc"
RUN_DEPENDS+=::${PKGPATH}
. endif
@ -157,6 +158,9 @@ RUN_DEPENDS+=::${PKGPATH}
RUN_DEPENDS+=::${PKGPATH},-estdc
. endif
.endif
.if !defined(PACKAGING) || ${SUBPACKAGE} == "-f95"
LIB_DEPENDS+=gmp:gmp->=4.1.4:devel/gmp
.endif
.include <bsd.port.mk>

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-fixincludes_Makefile_in,v 1.1 2005/01/07 11:33:14 espie Exp $
--- fixincludes/Makefile.in.orig Fri Jan 7 04:10:08 2005
+++ fixincludes/Makefile.in Fri Jan 7 04:10:14 2005
@@ -163,8 +163,8 @@ $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/
cp $(srcdir)/../gcc/aclocal.m4 .
check : all
- autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
- $(SHELL) ./check.sh $(srcdir)/tests/base
+ -autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
+ -$(SHELL) ./check.sh $(srcdir)/tests/base
@rm -f ./check.sh
install : all

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_ada_adaint_c,v 1.1 2005/01/07 03:30:41 espie Exp $
$OpenBSD: patch-gcc_ada_adaint_c,v 1.2 2005/01/07 11:33:14 espie Exp $
--- gcc/ada/adaint.c.orig Fri Jan 7 04:27:01 2005
+++ gcc/ada/adaint.c Fri Jan 7 04:27:29 2005
+++ gcc/ada/adaint.c Fri Jan 7 12:19:37 2005
@@ -685,7 +685,7 @@ __gnat_open_new_temp (char *path, int fm
strcpy (path, "GNAT-XXXXXX");
@ -10,3 +10,12 @@ $OpenBSD: patch-gcc_ada_adaint_c,v 1.1 2005/01/07 03:30:41 espie Exp $
return mkstemp (path);
#elif defined (__Lynx__)
mktemp (path);
@@ -775,7 +775,7 @@ __gnat_tmp_name (char *tmp_filename)
free (pname);
}
-#elif defined (linux) || defined (__FreeBSD__)
+#elif defined (linux) || defined (__FreeBSD__) || defined(__OpenBSD__)
#define MAX_SAFE_PATH 1000
char *tmpdir = getenv ("TMPDIR");

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-gcc_testsuite_ada_acats_run_acats,v 1.1 2005/01/07 11:33:14 espie Exp $
--- gcc/testsuite/ada/acats/run_acats.orig Fri Jan 7 04:04:46 2005
+++ gcc/testsuite/ada/acats/run_acats Fri Jan 7 04:06:26 2005
@@ -7,8 +7,8 @@ fi
# Set up environment to use the Ada compiler from the object tree
-host_gnatchop=`type gnatchop | awk '{print $3}'`
-host_gnatmake=`type gnatmake | awk '{print $3}'`
+host_gnatchop=`which gnatchop`
+host_gnatmake=`which gnatmake`
ROOT=`${PWDCMD-pwd}`
BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gcc_testsuite_ada_acats_run_all_sh,v 1.1 2005/01/07 11:33:14 espie Exp $
--- gcc/testsuite/ada/acats/run_all.sh.orig Fri Jan 7 04:06:30 2005
+++ gcc/testsuite/ada/acats/run_all.sh Fri Jan 7 04:06:46 2005
@@ -77,7 +77,7 @@ display target gcc is $GCC
display `$GCC -v 2>&1`
display host=`gcc -dumpmachine`
display target=$target
-display `type gnatmake`
+display `which gnatmake`
gnatls -v >> $dir/acats.log
display ""