Date: Thursday, November 12, 2020 @ 20:35:30 Author: spupykin Revision: 753735
upgpkg: simh 3.11.1-1 Added: simh/trunk/build-fix.patch Modified: simh/trunk/PKGBUILD -----------------+ PKGBUILD | 27 +++++++++++++++++---------- build-fix.patch | 12 ++++++++++++ 2 files changed, 29 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-12 20:34:48 UTC (rev 753734) +++ PKGBUILD 2020-11-12 20:35:30 UTC (rev 753735) @@ -2,9 +2,9 @@ # Contributor: waterbear <st92.at.freeshell.org> pkgname=simh -pkgver=3.10 -#_pkgver=${pkgver//./-} -#_pkgver=${pkgver/-/.} +pkgver=3.11.1 +_pkgver=${pkgver//./-} +_pkgver=${_pkgver/-/.} pkgrel=1 pkgdesc="simulator for assorted historical computers, from Altair to VAX" arch=('x86_64') @@ -13,13 +13,20 @@ depends=("libpcap") makedepends=("unzip" "linux-api-headers") install=simh.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/simh/simh/archive/v$pkgver.tar.gz" - "LICENSE") -sha512sums=('287f68079df778910b9a1a1b9066342750fea35aa943037756d9cd929913b4c709fe50c91f402b1199f999d16ec669aa1af0539b2dba01462a4befeeeba88d27' - '084faf8a66c95cb337bca19a6116c916aa04fc23ec5d57d5d8c2fc168231272123a705e83f8da2bf38f404da51727a69db68ffd87b36028e0cde52b54b92b2dd') +source=("$pkgname-$pkgver.tar.gz::https://github.com/simh/simh/archive/v${_pkgver}.tar.gz" + "LICENSE" + build-fix.patch) +sha512sums=('7c2f81a64d3016b9a44409fc336c804c0da836317745d47594cc48c64cb57dc8f22084d9086e3f86868ec485ee56ac63301f350cee6d275e705b7c5fc82875db' + '084faf8a66c95cb337bca19a6116c916aa04fc23ec5d57d5d8c2fc168231272123a705e83f8da2bf38f404da51727a69db68ffd87b36028e0cde52b54b92b2dd' + '663a5514333653352ad6134e42eca2a8c780f4d7c140dcc30063893c7470bdafe704703eee23ea89272d04acff2cdae013781b0345c2d9e9d86fcb42c50db530') +prepare() { + cd "$srcdir/$pkgname-${_pkgver}" + patch -p1 <../build-fix.patch +} + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-${_pkgver}" mkdir -p BIN # find VAX -type f -exec sed -i 's/SIM_INLINE//' {} + make USE_TAP_NETWORK=1 USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -DUSE_TAP_NETWORK -isystem /usr/include -lpcap' @@ -26,12 +33,12 @@ } package() { - cd "$srcdir/$pkgname-$pkgver/BIN" + cd "$srcdir/$pkgname-${_pkgver}/BIN" for i in *; do install -D $i "$pkgdir/usr/bin/simh-$i" done - cd "$srcdir/$pkgname-$pkgver/VAX" + cd "../VAX" mkdir -p "$pkgdir/usr/lib/simh" cp *.bin "$pkgdir/usr/lib/simh" Added: build-fix.patch =================================================================== --- build-fix.patch (rev 0) +++ build-fix.patch 2020-11-12 20:35:30 UTC (rev 753735) @@ -0,0 +1,12 @@ +diff -wbBur simh-3.11-1/PDP11/pdp11_defs.h simh-3.11-1.my/PDP11/pdp11_defs.h +--- simh-3.11-1/PDP11/pdp11_defs.h 2020-03-14 17:43:09.000000000 +0300 ++++ simh-3.11-1.my/PDP11/pdp11_defs.h 2020-11-12 23:22:59.363475165 +0300 +@@ -900,7 +900,7 @@ + #define WrMemW(pa,d) uc15_WrMemW (pa, d) + #define WrMemB(pa, d) uc15_WrMemB (pa, d) + +-uint32 uc15_memsize; ++extern uint32 uc15_memsize; + int32 uc15_RdMemW (int32 pa); + int32 uc15_RdMemB (int32 pa); + void uc15_WrMemW (int32 pa, int32 d);