cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore a patch that was dropped in an update:

Browse Source 
Do not rm -f /tmp/conftest*.  This kills configure tests of other builds
that happen to run at the same time.
This commit is contained in:
naddy 2020-08-04 17:50:11 +00:00
parent c778578f8f
commit f5d84f5f8a
2 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc/screen/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.73 2020/02/06 16:17:20 sthen Exp $
# $OpenBSD: Makefile,v 1.74 2020/08/04 17:50:11 naddy Exp $
COMMENT= multi-screen window manager
@ -11,7 +11,8 @@ HOMEPAGE= https://www.gnu.org/software/screen/
# GPLv3+
PERMIT_PACKAGE= Yes
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION=2.69
CONFIGURE_STYLE=autoconf
CONFIGURE_ARGS= --with-sys-screenrc="${SYSCONFDIR}/screenrc"
USE_GMAKE= Yes
USE_GROFF= Yes

61
misc/screen/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-configure_ac,v 1.3 2020/08/04 17:50:11 naddy Exp $
Do not rm -f /tmp/conftest*. This kills configure tests of other builds
that happen to run at the same time.
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -22,7 +22,7 @@ _CUT_HERE_
EOF
eval "$ac_cpp conftest.c 2>&5 | sed -e '1,/_CUT_HERE_/d' -e 's/ //g' > conftest.out"
. ./conftest.out
-rm -f conftest*
+rm -f conftest.out
])dnl
dnl
define(AC_NOTE,
@@ -362,7 +362,7 @@ main()
], AC_NOTE(- your fifos are usable) fifo=1,
AC_NOTE(- your fifos are not usable),
AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1)
-rm -f /tmp/conftest*
+rm -f /tmp/conftest$$
if test -n "$fifo"; then
AC_CHECKING(for broken fifo implementation)
@@ -411,7 +411,7 @@ main()
], AC_NOTE(- your implementation is ok),
AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1,
AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok))
-rm -f /tmp/conftest*
+rm -f /tmp/conftest$$
fi
dnl
@@ -474,7 +474,7 @@ main()
], AC_NOTE(- your sockets are usable) sock=1,
AC_NOTE(- your sockets are not usable),
AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1)
-rm -f /tmp/conftest*
+rm -f /tmp/conftest$$
if test -n "$sock"; then
AC_CHECKING(socket implementation)
@@ -514,7 +514,7 @@ main()
AC_NOTE(- unix domain sockets are not kept in the filesystem)
AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1,
AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal))
-rm -f /tmp/conftest*
+rm -f /tmp/conftest$$
fi
@@ -619,6 +619,7 @@ main()
],AC_NOTE(- select is ok),
AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN),
AC_NOTE(- skipping check because we are cross compiling; assuming select is ok))
+rm -f /tmp/conftest$$
dnl
dnl **** termcap or terminfo ****