development/sdcc: Updated for version 4.2.0

Signed-off-by: Kyle Guinn <elyk03@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 27 insertions, 29 deletions

diff --git a/development/sdcc/README b/development/sdcc/README
index 17bf5e4510..761e4b5a82 100644
--- a/development/sdcc/README
+++ b/development/sdcc/README
@@ -2,12 +2,15 @@ SDCC is a retargettable, optimizing Standard C (ANSI C89, ISO C99, ISO
 C11) compiler suite that targets the Intel MCS51 based microprocessors
 (8031, 8032, 8051, 8052, etc.), Maxim (formerly Dallas) DS80C390
 variants, Freescale (formerly Motorola) HC08 based (hc08, s08), Zilog
-Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A,
-TLCS-90), Padauk (pdk14, pdk15) and STMicroelectronics STM8.  Work is
-in progress on supporting the Padauk (pdk13), Microchip PIC16 and
-PIC18 targets.  It can be retargeted for other microprocessors.
+Z80 based MCUs (Z80, Z180, SM83, Rabbit 2000, 2000A, 3000A, TLCS-90),
+Padauk (pdk14, pdk15) and STMicroelectronics STM8.  Work is in progress
+on supporting the Padauk pdk13 and MOS 6502 targets; Microchip PIC16 and
+PIC18 targets are unmaintained.  SDCC can be retargeted for other
+microprocessors.
 
-By default, this will build sdcc without pic support.  If you want
-that, install gputils and run the script as follows:
+The documentation (SDCC manual) and support for PIC targets are disabled
+by default because they require extra packages.  Enable them by passing
+these variables to the script (VAR=yes|no ./sdcc.SlackBuild):
 
-ENABLE_PIC=y sh ./sdcc.SlackBuild
+ENABLE_DOC=yes|no (default: no), requires lyx, latex2html
+ENABLE_PIC=yes|no (default: no), requires gputils
diff --git a/development/sdcc/patches/source-tree.patch b/development/sdcc/patches/source-tree.patch
index 521adef57c..e101ac2993 100644
--- a/development/sdcc/patches/source-tree.patch
+++ b/development/sdcc/patches/source-tree.patch
@@ -1,10 +1,10 @@
 diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
 --- a/device/lib/Makefile.in
 +++ b/device/lib/Makefile.in
-@@ -623,19 +623,11 @@
- 	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 ez80_z80 z80n r2k r2ka r3ka tlcs90 gbz80 hc08 s08 stm8 pdk13 pdk14 pdk15 $(sdcc_libdir)/src
+@@ -649,19 +649,11 @@
+	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 ez80_z80 z80n r2k r2ka r3ka tlcs90 sm83 hc08 s08 stm8 pdk13 pdk14 pdk15 $(sdcc_libdir)/src
  
- 	for src in $(MODELS) ds390 ds400 z80 z180 ez80_z80 z80n r2k r2ka r3ka tlcs90 gbz80 hc08 s08 stm8 pdk13 pdk14 pdk15 pic14 pic16; do \
+	for src in $(MODELS) ds390 ds400 z80 z180 ez80_z80 z80n r2k r2ka r3ka tlcs90 sm83 hc08 s08 mos6502 mos65c02 stm8 pdk13 pdk14 pdk15 pic14 pic16; do \
 -	  find $(sdcc_libdir)/src/$$src -depth \
 -	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 -	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
diff --git a/development/sdcc/sdcc.SlackBuild b/development/sdcc/sdcc.SlackBuild
index 7733f67f9b..df93915592 100644
--- a/development/sdcc/sdcc.SlackBuild
+++ b/development/sdcc/sdcc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sdcc
 
-# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2014-2022 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sdcc
-VERSION=${VERSION:-4.1.0}
+VERSION=${VERSION:-4.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -74,9 +71,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-src-$VERSION.tar.bz2
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
@@ -88,10 +85,7 @@ chmod -x device/lib/isinf.c device/lib/isnan.c
 # up afterwards.  Delete some byproducts that they missed.
 patch -p1 < $CWD/patches/source-tree.patch
 
-# Avoid creating empty man directories.
-sed -i '/(man1dir)/d' sim/ucsim/doc/Makefile.in
-
-# Requires lyx, latex2html, possibly others.  Untested.
+# Requires lyx and latex2html.
 if [ "${ENABLE_DOC:-no}" != 'no' ]; then
   enable_doc='--enable-doc'
 fi
@@ -128,6 +122,7 @@ find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a sdas/doc $PKG/usr/doc/$PRGNAM-$VERSION/sdas
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/sdcc/sdcc.info b/development/sdcc/sdcc.info
index 9aa42f7ae4..0b212583a2 100644
--- a/development/sdcc/sdcc.info
+++ b/development/sdcc/sdcc.info
@@ -1,8 +1,8 @@
 PRGNAM="sdcc"
-VERSION="4.1.0"
+VERSION="4.2.0"
 HOMEPAGE="http://sdcc.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/sdcc/files/sdcc/4.1.0/sdcc-src-4.1.0.tar.bz2"
-MD5SUM="83df8cd5b24c7dbb7c83c5fa0857b3f8"
+DOWNLOAD="https://sourceforge.net/projects/sdcc/files/sdcc/4.2.0/sdcc-src-4.2.0.tar.bz2"
+MD5SUM="cc5042a207b15c387185867ca1b32145"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/sdcc/slack-desc b/development/sdcc/slack-desc
index fabcddda7f..e84dbace93 100644
--- a/development/sdcc/slack-desc
+++ b/development/sdcc/slack-desc
@@ -12,8 +12,8 @@ sdcc: SDCC is a retargettable, optimizing Standard C (ANSI C89, ISO C99, ISO
 sdcc: C11) compiler suite that targets the Intel MCS51 based microprocessors
 sdcc: (8031, 8032, 8051, 8052, etc.), Maxim (formerly Dallas) DS80C390
 sdcc: variants, Freescale (formerly Motorola) HC08 based (hc08, s08), Zilog
-sdcc: Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A,
-sdcc: TLCS-90), Padauk (pdk14, pdk15) and STMicroelectronics STM8.  Work is
-sdcc: in progress on supporting the Padauk (pdk13), Microchip PIC16 and
-sdcc: PIC18 targets.  It can be retargeted for other microprocessors.
-sdcc:
+sdcc: Z80 based MCUs (Z80, Z180, SM83, Rabbit 2000, 2000A, 3000A, TLCS-90),
+sdcc: Padauk (pdk14, pdk15) and STMicroelectronics STM8.  Work is in
+sdcc: progress on supporting the Padauk pdk13 and MOS 6502 targets;
+sdcc: Microchip PIC16 and PIC18 targets are unmaintained.  SDCC can be
+sdcc: retargeted for other microprocessors.