diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-30 08:30:36 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-01-30 08:30:53 +0000 |
| commit | eb100a85c7481ac78d7c95f035924f267aca798a (patch) | |
| tree | c61ab1b83b8fe74a285e3b28d50a11b5852684e8 /app-emulation/simh/files | |
| parent | sys-kernel/vanilla-sources: Automated version bump to {4.14.169,4.19.100,5.4.... (diff) | |
| download | gentoo-eb100a85c7481ac78d7c95f035924f267aca798a.tar.gz gentoo-eb100a85c7481ac78d7c95f035924f267aca798a.tar.bz2 gentoo-eb100a85c7481ac78d7c95f035924f267aca798a.zip | |
app-emulation/simh: bump up to 3.11.0, take package
Reported-by: https://bugs.gentoo.org/706866
Closes: https://bugs.gentoo.org/706866
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-emulation/simh/files')
3 files changed, 61 insertions, 0 deletions
diff --git a/app-emulation/simh/files/simh-3.11.0-fcommon.patch b/app-emulation/simh/files/simh-3.11.0-fcommon.patch new file mode 100644 index 000000000000..b23866aaab49 --- /dev/null +++ b/app-emulation/simh/files/simh-3.11.0-fcommon.patch @@ -0,0 +1,37 @@ +From ca4b7338836edb7325c82f86dccdeb4808cb4a89 Mon Sep 17 00:00:00 2001 +From: Mark Pizzolato <mark@infocomm.com> +Date: Wed, 29 Jan 2020 11:39:36 -0800 +Subject: [PATCH] makefile: Force gcc/clang -fcommon to address future gcc + -fno-common default + +as reported and discussed in #794 +--- + makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/makefile ++++ b/makefile +@@ -506,9 +506,13 @@ else
+ ifneq (3,$(GCC_MAJOR_VERSION))
+ ifeq (,$(GCC_OPTIMIZERS_CMD))
+ GCC_OPTIMIZERS_CMD = $(GCC) --help=optimizers
++ GCC_COMMON_CMD = $(GCC) --help=common
+ endif
+ GCC_OPTIMIZERS = $(shell $(GCC_OPTIMIZERS_CMD))
+ endif
++ ifneq (,$(GCC_COMMON_CMD))
++ GCC_OPTIMIZERS += $(shell $(GCC_COMMON_CMD))
++ endif
+ ifneq (,$(findstring $(GCC_VERSION),$(LTO_EXCLUDE_VERSIONS)))
+ NO_LTO = 1
+ endif
+@@ -530,6 +534,9 @@ else
+ ifneq (,$(findstring -fstrict-overflow,$(GCC_OPTIMIZERS)))
+ CFLAGS_O += -fno-strict-overflow
+ endif
++ ifneq (,$(findstring -fcommon,$(GCC_OPTIMIZERS))$(findstring -fno-common,$(GCC_OPTIMIZERS)))
++ CFLAGS_O += -fcommon
++ endif
+ ifeq (,$(NO_LTO))
+ ifneq (,$(findstring -flto,$(GCC_OPTIMIZERS)))
+ CFLAGS_O += -flto -fwhole-program
diff --git a/app-emulation/simh/files/simh-3.11.0-fix-mkdir-race.patch b/app-emulation/simh/files/simh-3.11.0-fix-mkdir-race.patch new file mode 100644 index 000000000000..e2b1b5547efb --- /dev/null +++ b/app-emulation/simh/files/simh-3.11.0-fix-mkdir-race.patch @@ -0,0 +1,11 @@ +--- simh-3.9.0/makefile ++++ simh-3.9.0/makefile +@@ -249,7 +249,7 @@
+ NETWORK_OPT = $(NETWORK_CCDEFS)
+ endif
+ ifneq (binexists,$(shell if $(TEST) -e BIN; then echo binexists; fi))
+- MKDIRBIN = if $(TEST) ! -e BIN; then mkdir BIN; fi
++ MKDIRBIN = mkdir -p BIN
+ endif
+ else
+ #Win32 Environments (via MinGW32)
diff --git a/app-emulation/simh/files/simh-3.11.0-respect-FLAGS.patch b/app-emulation/simh/files/simh-3.11.0-respect-FLAGS.patch new file mode 100644 index 000000000000..0ceca7b0abf8 --- /dev/null +++ b/app-emulation/simh/files/simh-3.11.0-respect-FLAGS.patch @@ -0,0 +1,13 @@ +--- a/makefile ++++ b/makefile +@@ -497,8 +497,8 @@ ifneq ($(DEBUG),)
+ CFLAGS_O = -O0
+ BUILD_FEATURES = - debugging support
+ else
+- CFLAGS_O = -O2
+- LDFLAGS_O =
++ CFLAGS_O ?= -O2
++ LDFLAGS_O ?=
+ ifeq (Darwin,$(OSTYPE))
+ NO_LTO = 1
+ endif
|