diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-04-18 11:55:26 +1200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-04-24 01:47:14 +0700 |
| commit | f1f08cf44c02eb933997de9571bd1a9ae1880727 (patch) | |
| tree | 328dc1f65ca0fd80c546c1cc5df7d6bcb19fb697 | |
| parent | 78b55611f3d403fec140149f314f2ba2a2263455 (diff) | |
| download | slackbuilds-f1f08cf44c02eb933997de9571bd1a9ae1880727.tar.gz | |
misc/simh-classic: Gzip patch to preserve line endings.
The source file is CRLF and we need to preserve these in the patch.
Restrict build to 1 job, otherwise it randomly fails.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | misc/simh-classic/pdp11_defs.h.patch | 23 | ||||
| -rw-r--r-- | misc/simh-classic/pdp11_defs.h.patch.gz | bin | 0 -> 327 bytes | |||
| -rw-r--r-- | misc/simh-classic/simh-classic.SlackBuild | 8 |
3 files changed, 4 insertions, 27 deletions
diff --git a/misc/simh-classic/pdp11_defs.h.patch b/misc/simh-classic/pdp11_defs.h.patch deleted file mode 100644 index b5e7a9a235..0000000000 --- a/misc/simh-classic/pdp11_defs.h.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- PDP11/pdp11_defs.h 2017-02-10 15:31:48.000000000 +0000 -+++ PDP11/.new/pdp11_defs.h 2022-02-07 20:45:14.270208500 +0000 -@@ -900,13 +900,13 @@ - #define WrMemW(pa,d) uc15_WrMemW (pa, d) - #define WrMemB(pa, d) uc15_WrMemB (pa, d) - --uint32 uc15_memsize; --int32 uc15_RdMemW (int32 pa); --int32 uc15_RdMemB (int32 pa); --void uc15_WrMemW (int32 pa, int32 d); --void uc15_WrMemB (int32 pa, int32 d); --int32 Map_Read18 (uint32 ba, int32 bc, uint32 *buf); --int32 Map_Write18 (uint32 ba, int32 bc, uint32 *buf); -+extern uint32 uc15_memsize; -+extern int32 uc15_RdMemW (int32 pa); -+extern int32 uc15_RdMemB (int32 pa); -+extern void uc15_WrMemW (int32 pa, int32 d); -+extern void uc15_WrMemB (int32 pa, int32 d); -+extern int32 Map_Read18 (uint32 ba, int32 bc, uint32 *buf); -+extern int32 Map_Write18 (uint32 ba, int32 bc, uint32 *buf); - - #else /* PDP-11 */ - diff --git a/misc/simh-classic/pdp11_defs.h.patch.gz b/misc/simh-classic/pdp11_defs.h.patch.gz Binary files differnew file mode 100644 index 0000000000..531eb45510 --- /dev/null +++ b/misc/simh-classic/pdp11_defs.h.patch.gz diff --git a/misc/simh-classic/simh-classic.SlackBuild b/misc/simh-classic/simh-classic.SlackBuild index 8e89ca4fb0..404b3bb35e 100644 --- a/misc/simh-classic/simh-classic.SlackBuild +++ b/misc/simh-classic/simh-classic.SlackBuild @@ -86,8 +86,8 @@ else fi # Patch the sources in order for uc15 to compile... -patch PDP11/pdp11_defs.h $CWD/pdp11_defs.h.patch - +# gzipped to preserve CRLF line endings +zcat $CWD/pdp11_defs.h.patch.gz | patch PDP11/pdp11_defs.h chown -R root:root . find -L . \ @@ -99,7 +99,7 @@ find -L . \ chmod 0755 . # make the simulators -make all +make -j1 all mkdir -p $PKG/slackbuild/opt/$PRGNAM/bin mv BIN/* $PKG/slackbuild/opt/$PRGNAM/bin @@ -115,7 +115,7 @@ cp -a \ doc/* \ $PKG/slackbuild/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/slackbuild/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cp $CWD/pdp11_defs.h.patch $PKG/slackbuild/usr/doc/$PRGNAM-$VERSION/pdp11_defs.h.patch +cat $CWD/pdp11_defs.h.patch.gz > $PKG/slackbuild/usr/doc/$PRGNAM-$VERSION/pdp11_defs.h.patch.gz mkdir -p $PKG/slackbuild/opt/$PRGNAM/doc/$PRGNAM-$VERSION cp -a doc/* $PKG/slackbuild/opt/$PRGNAM/doc/ |