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

fix mingw's fork-bomb.

Browse Source 
Turns out you need to name the compiler gcc for things to work out, BUT
clang never knows how to compile ada ANYWAY, so it *will* turn to gcc to
try to compile it.

*however* it calls gcc by name, so in this case, it calls... itself recursively
until it goes boom.

Plain disable the ada test..
This commit is contained in:
espie 2018-07-26 12:58:16 +00:00
parent 93a34a7a52
commit e72635a326
3 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devel/mingw/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2018/07/23 22:46:16 espie Exp $
# $OpenBSD: Makefile,v 1.16 2018/07/26 12:58:16 espie Exp $
COMMENT = development environment for native Windows applications
@ -14,8 +14,6 @@ HOMEPAGE = http://www.mingw.org/
MAINTAINER = Paul Irofti <pirofti@openbsd.org>
BROKEN = probable fork bomb. Breaks bulk builds
# Headers: public domain
# Compiler/toolchain: GPL
PERMIT_PACKAGE_CDROM = Yes
@ -35,25 +33,25 @@ BUILD_DEPENDS = shells/bash
BUILD_DEPENDS += textproc/gsed
SCRIPT_MASTER = files/Other/Cross-Hosted%20MinGW%20Build%20Tool/${BASENAME}-${V}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mingw/}${SCRIPT_MASTER}-rc1
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mingw/}${SCRIPT_MASTER}-rc1/
TOOL_SUFX = .tar.gz
TOOL_MASTER = ${MASTER_SITE_SOURCEFORGE:=mingw/}files/MinGW/Base/
TOOL_GCC = gcc-core-3.4.5-20060117-2
MASTER_SITES0 = ${TOOL_MASTER}gcc/Version3/Previous%20Release_%20${TOOL_GCC}
MASTER_SITES0 = ${TOOL_MASTER}gcc/Version3/Previous%20Release_%20${TOOL_GCC}/
TOOL_BINUTILS = binutils-2.20.1
MASTER_SITES1 = ${TOOL_MASTER}binutils/${TOOL_BINUTILS}
MASTER_SITES1 = ${TOOL_MASTER}binutils/${TOOL_BINUTILS}/
TOOL_WRT = mingwrt-3.18
MASTER_SITES2 = ${TOOL_MASTER}mingw-rt/${TOOL_WRT}
MASTER_SITES2 = ${TOOL_MASTER}mingw-rt/${TOOL_WRT}/
TOOL_W32API = w32api-3.14
MASTER_SITES3 = ${TOOL_MASTER}w32api/${TOOL_W32API}
MASTER_SITES3 = ${TOOL_MASTER}w32api/${TOOL_W32API}/
TOOL_G++ = gcc-g++-3.4.5-20060117-2
MASTER_SITES4 = ${TOOL_MASTER}g++/Version3/Previous%20Release_%20${TOOL_G++}
MASTER_SITES4 = ${TOOL_MASTER}g++/Version3/Previous%20Release_%20${TOOL_G++}/
TOOLCHAIN = ${TOOL_BINUTILS}-src${TOOL_SUFX}:0 \
${TOOL_GCC}-src${TOOL_SUFX}:1 \
@ -82,6 +80,7 @@ do-build:
CONFIG_SHELL=${LOCALBASE}/bin/bash \
AWK=/usr/bin/awk \
PATH=${PORTPATH} \
OPENBSD_PATCH_DIR=${PATCHDIR} \
ac_cv_path_mkdir=/bin/mkdir \
/bin/sh ${WRKBUILD}/${BASENAME}.sh --no-pre-clean --no-post-clean \
--unattended

16
devel/mingw/patches/patch-x86-mingw32-build_sh_functions Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-x86-mingw32-build_sh_functions,v 1.1 2018/07/26 12:58:16 espie Exp $
Index: x86-mingw32-build.sh.functions
--- x86-mingw32-build.sh.functions.orig
+++ x86-mingw32-build.sh.functions
@@ -160,8 +160,9 @@ prepare()
esac; break
fi
done
- for PACKAGE in $PATCHES_DIR/$1${3-"-patch"}*
+ for PACKAGE in $PATCHES_DIR/$1${3-"-patch"}* $OPENBSD_PATCH_DIR/patch_$1-*
do
+ echo "patch template is $PACKAGE"
if test -r $PACKAGE
then
prompt "$script: applying patch $PACKAGE ... "

13
devel/mingw/patches/patch_binutils-2.20.1-configure Normal file
View File

@ -0,0 +1,13 @@
--- binutils-2.20.1/configure.orig Thu Jul 26 09:46:12 2018
+++ binutils-2.20.1/configure Thu Jul 26 09:46:59 2018
@@ -4959,10 +4959,6 @@ acx_cv_cc_gcc_supports_ada=no
# Other compilers, like HP Tru64 UNIX cc, exit successfully when
# given a .adb file, but produce no object file. So we must check
# if an object file was really produced to guard against this.
-errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
-if test x"$errors" = x && test -f conftest.$ac_objext; then
- acx_cv_cc_gcc_supports_ada=yes
-fi
rm -f conftest.*
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5