From 7c9bbc43382557a2cd2b760fe659187235704679 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Sat, 21 Jul 2018 17:39:51 +0200 Subject: [PATCH] SimH: bump, cleanup, debuginfo, silenced warings (#2410) --- .../simh/patches/simh-4.0.0_git.patchset | 42 +++- app-emulation/simh/simh-4.0.0_git.recipe | 188 ++++++++++++------ 2 files changed, 160 insertions(+), 70 deletions(-) diff --git a/app-emulation/simh/patches/simh-4.0.0_git.patchset b/app-emulation/simh/patches/simh-4.0.0_git.patchset index 68ebbadfe..635c5e003 100644 --- a/app-emulation/simh/patches/simh-4.0.0_git.patchset +++ b/app-emulation/simh/patches/simh-4.0.0_git.patchset @@ -1,23 +1,47 @@ -From 68c7b23429476c19c4ad22548950b8a913291ae8 Mon Sep 17 00:00:00 2001 +From 240230434ae2ea539f3bc3093fff815496e22d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 8 Jul 2017 18:51:36 +0200 Subject: HAIKU: Build fix diff --git a/sim_defs.h b/sim_defs.h -index 328f02c..dcdc153 100644 +index fd24e95..a994de1 100644 --- a/sim_defs.h +++ b/sim_defs.h -@@ -189,6 +189,9 @@ typedef signed int int32; - typedef unsigned char uint8; - typedef unsigned short uint16; - typedef unsigned int uint32; +@@ -207,6 +207,9 @@ typedef int32_t int32; + typedef uint8_t uint8; + typedef uint16_t uint16; + typedef uint32_t uint32; +#ifdef __HAIKU__ +typedef unsigned char Uint8; +#endif - #endif + #endif /* end standard integers */ + typedef int t_stat; /* status */ - typedef int t_bool; /* boolean */ -- -2.12.2 +2.16.2 + + +From dc7860c9137726a45053b2b2c4e7a2346f8924b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Mon, 2 Apr 2018 10:09:38 +0200 +Subject: Fix build warning + + +diff --git a/makefile b/makefile +index 8f2f622..e19f549 100644 +--- a/makefile ++++ b/makefile +@@ -335,7 +335,8 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin) + INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY) + INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix) + LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY) +- OS_LDFLAGS += -lnetwork ++ OS_LDFLAGS += -lnetwork -lposix_error_mapper ++ OS_CCDEFS += -DB_USE_POSITIVE_POSIX_ERRORS + else + ifeq (,$(findstring NetBSD,$(OSTYPE))) + ifneq (no ldconfig,$(findstring no ldconfig,$(shell which ldconfig 2>&1))) +-- +2.16.2 diff --git a/app-emulation/simh/simh-4.0.0_git.recipe b/app-emulation/simh/simh-4.0.0_git.recipe index 9b549f46a..e305d6e98 100644 --- a/app-emulation/simh/simh-4.0.0_git.recipe +++ b/app-emulation/simh/simh-4.0.0_git.recipe @@ -17,62 +17,80 @@ PDP-11, PDP-15, VAX HOMEPAGE="http://simh.trailing-edge.com/" COPYRIGHT="1993-2008 Robert M Supnik" LICENSE="MIT" -REVISION="4" -SOURCE_URI="https://github.com/simh/simh/archive/7ed68aed6a60160c58b5d5ffc8be5228221a6f6c.tar.gz" -CHECKSUM_SHA256="fb74be15f7e96f79c0ca9d91eb3d22468806767b0671e079d23803db5a5e105c" -SOURCE_DIR="simh-7ed68aed6a60160c58b5d5ffc8be5228221a6f6c" +REVISION="5" +srcGitRev="a92dc610a4d39354f890b0263077b0686a60a407" +SOURCE_URI="https://github.com/simh/simh/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="89ed93b7f30f33f4af40012bcbcb476d8337da6a6cccaf13a79aa8a3bf57fdb7" +SOURCE_FILENAME="simh-$portVersion-$srcGitRev.tar.gz" +SOURCE_DIR="simh-$srcGitRev" PATCHES="simh-4.0.0_git.patchset" -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86" + +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi PROVIDES=" simh$secondaryArchSuffix = $portVersion - cmd:altair = $portVersion - cmd:altairz80 = $portVersion - cmd:b5500 = $portVersion - cmd:cdc1700 = $portVersion - cmd:eclipse = $portVersion - cmd:gri = $portVersion - cmd:h316 = $portVersion - cmd:hp2100 = $portVersion - cmd:hp3000 = $portVersion - cmd:i1401 = $portVersion - cmd:i1620 = $portVersion - cmd:i7094 = $portVersion - cmd:ibm1130 = $portVersion - cmd:id16 = $portVersion - cmd:id32 = $portVersion - cmd:imds_225 = $portVersion - cmd:isys8010 = $portVersion - cmd:isys8020 = $portVersion - cmd:isys8024 = $portVersion - cmd:isys8030 = $portVersion - cmd:lgp = $portVersion - cmd:microvax1 = $portVersion - cmd:microvax2 = $portVersion - cmd:microvax3900 = $portVersion - cmd:nova = $portVersion - cmd:pdp1 = $portVersion - cmd:pdp10 = $portVersion - cmd:pdp11 = $portVersion - cmd:pdp15 = $portVersion - cmd:pdp4 = $portVersion - cmd:pdp7 = $portVersion - cmd:pdp8 = $portVersion - cmd:pdp9 = $portVersion - cmd:rtvax1000 = $portVersion - cmd:s3 = $portVersion - cmd:sds = $portVersion - cmd:ssem = $portVersion - cmd:swtp6800mp_a = $portVersion - cmd:swtp6800mp_a2 = $portVersion - cmd:tx_0 = $portVersion - cmd:vax = $portVersion - cmd:vax730 = $portVersion - cmd:vax750 = $portVersion - cmd:vax780 = $portVersion - cmd:vax8600 = $portVersion + cmd:3b2$commandSuffix = $portVersion + cmd:altair$commandSuffix = $portVersion + cmd:altairz80$commandSuffix = $portVersion + cmd:b5500$commandSuffix = $portVersion + cmd:cdc1700$commandSuffix = $portVersion + cmd:eclipse$commandSuffix = $portVersion + cmd:gri$commandSuffix = $portVersion + cmd:h316$commandSuffix = $portVersion + cmd:hp2100$commandSuffix = $portVersion + cmd:hp3000$commandSuffix = $portVersion + cmd:i1401$commandSuffix = $portVersion + cmd:i1620$commandSuffix = $portVersion + cmd:i650$commandSuffix = $portVersion + cmd:i701$commandSuffix = $portVersion + cmd:i7010$commandSuffix = $portVersion + cmd:i704$commandSuffix = $portVersion + cmd:i7070$commandSuffix = $portVersion + cmd:i7080$commandSuffix = $portVersion + cmd:i7090$commandSuffix = $portVersion + cmd:i7094$commandSuffix = $portVersion + cmd:ibm1130$commandSuffix = $portVersion + cmd:id16$commandSuffix = $portVersion + cmd:id32$commandSuffix = $portVersion + cmd:imds_225$commandSuffix = $portVersion + cmd:isys8010$commandSuffix = $portVersion + cmd:isys8020$commandSuffix = $portVersion + cmd:isys8024$commandSuffix = $portVersion + cmd:isys8030$commandSuffix = $portVersion + cmd:lgp$commandSuffix = $portVersion + cmd:microvax1$commandSuffix = $portVersion + cmd:microvax2$commandSuffix = $portVersion + cmd:microvax3900$commandSuffix = $portVersion + cmd:nova$commandSuffix = $portVersion + cmd:pdp1$commandSuffix = $portVersion + cmd:pdp10$commandSuffix = $portVersion + cmd:pdp11$commandSuffix = $portVersion + cmd:pdp15$commandSuffix = $portVersion + cmd:pdp4$commandSuffix = $portVersion + cmd:pdp7$commandSuffix = $portVersion + cmd:pdp8$commandSuffix = $portVersion + cmd:pdp9$commandSuffix = $portVersion + cmd:rtvax1000$commandSuffix = $portVersion + cmd:s3$commandSuffix = $portVersion + cmd:scelbi$commandSuffix = $portVersion + cmd:sds$commandSuffix = $portVersion + cmd:ssem$commandSuffix = $portVersion + cmd:swtp6800mp_a$commandSuffix = $portVersion + cmd:swtp6800mp_a2$commandSuffix = $portVersion + cmd:tx_0$commandSuffix = $portVersion + cmd:vax$commandSuffix = $portVersion + cmd:vax730$commandSuffix = $portVersion + cmd:vax750$commandSuffix = $portVersion + cmd:vax780$commandSuffix = $portVersion + cmd:vax8600$commandSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -99,23 +117,71 @@ BUILD_PREREQUIRES=" dejavu " +defineDebugInfoPackage simh$secondaryArchSuffix \ + "$commandBinDir"/3b2 \ + "$commandBinDir"/altair \ + "$commandBinDir"/altairz80 \ + "$commandBinDir"/b5500 \ + "$commandBinDir"/cdc1700 \ + "$commandBinDir"/eclipse \ + "$commandBinDir"/gri \ + "$commandBinDir"/h316 \ + "$commandBinDir"/hp2100 \ + "$commandBinDir"/hp3000 \ + "$commandBinDir"/i1401 \ + "$commandBinDir"/i1620 \ + "$commandBinDir"/i650 \ + "$commandBinDir"/i701 \ + "$commandBinDir"/i7010 \ + "$commandBinDir"/i704 \ + "$commandBinDir"/i7070 \ + "$commandBinDir"/i7080 \ + "$commandBinDir"/i7090 \ + "$commandBinDir"/i7094 \ + "$commandBinDir"/ibm1130 \ + "$commandBinDir"/id16 \ + "$commandBinDir"/id32 \ + "$commandBinDir"/imds-225 \ + "$commandBinDir"/isys8010 \ + "$commandBinDir"/isys8020 \ + "$commandBinDir"/isys8024 \ + "$commandBinDir"/isys8030 \ + "$commandBinDir"/lgp \ + "$commandBinDir"/microvax1 \ + "$commandBinDir"/microvax2 \ + "$commandBinDir"/microvax3900 \ + "$commandBinDir"/nova \ + "$commandBinDir"/pdp1 \ + "$commandBinDir"/pdp10 \ + "$commandBinDir"/pdp11 \ + "$commandBinDir"/pdp15 \ + "$commandBinDir"/pdp4 \ + "$commandBinDir"/pdp7 \ + "$commandBinDir"/pdp8 \ + "$commandBinDir"/pdp9 \ + "$commandBinDir"/rtvax1000 \ + "$commandBinDir"/s3 \ + "$commandBinDir"/scelbi \ + "$commandBinDir"/sds \ + "$commandBinDir"/ssem \ + "$commandBinDir"/swtp6800mp-a \ + "$commandBinDir"/swtp6800mp-a2 \ + "$commandBinDir"/tx-0 \ + "$commandBinDir"/vax \ + "$commandBinDir"/vax730 \ + "$commandBinDir"/vax750 \ + "$commandBinDir"/vax780 \ + "$commandBinDir"/vax8600 + BUILD() { - # Something wrong with the include and lib detection - # Let's do it manually for now. make \ - VIDEO_CCDEFS="$(sdl2-config --cflags)" \ - VIDEO_LDFLAGS="$(sdl2-config --libs)" \ FONTPATH=$(finddir B_SYSTEM_FONTS_DIRECTORY) \ $jobArgs } INSTALL() { - mkdir -p "$prefix/bin" - for bin in BIN/*; do - cp -a "$bin" "$prefix/bin" - done - - strip $prefix/bin/* + install -d "$commandBinDir" + install -t "$commandBinDir" BIN/* }