[PATCH] gnu: sdcc: Update to 4.4.0.

index 313675814a..b758e445af 100644

(define-public sdcc

(package

(name "sdcc")

(source (origin

(method url-fetch)

(uri (string-append

"/" version "/sdcc-src-" version ".tar.bz2"))

(sha256

(base32

(modules '((guix build utils)))

(snippet

#~(begin

diff --git a/gnu/packages/patches/sdcc-disable-non-free-code.patch b/gnu/packages/patches/sdcc-disable-non-free-code.patch

index 7602ead9af..6dcfbee1ab 100644

software.

diff --git a/Makefile.common.in b/Makefile.common.in

--- a/Makefile.common.in

+++ b/Makefile.common.in

OPT_DISABLE_SDBINUTILS = @OPT_DISABLE_SDBINUTILS@

OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@

OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@

SLIB = $(top_builddir)/support/util

diff --git a/Makefile.in b/Makefile.in

--- a/Makefile.in

+++ b/Makefile.in

ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)

TARGETS += sdcc-device-lib

PKGS += device/lib

endif

ifeq ($(OPT_DISABLE_PACKIHX), 0)

TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts

PKGS += $(SDCC_LIBS) src device/include

PKGS += $(SDCC_AS) sdas/linksrc $(SDCC_SCRIPTS)

PORTS = $(shell cat ports.build)

sdcc-device-inc:

$(MAKE) -C device/include

# doc depends on latex and latex2html

diff --git a/configure b/configure

--- a/configure

+++ b/configure

@@ -659,7 +659,6 @@ LATEX

OPT_DISABLE_SDBINUTILS

OPT_DISABLE_SDCDB

OPT_DISABLE_SDCPP

OPT_DISABLE_MCS51

SVN_REVISION

GIT_REVISION

include_dir_suffix

inclib_dir_suffix

LIB_TYPE

enable_sdcpp

enable_sdcdb

enable_sdbinutils

enable_doc

enable_libgc

'

LIB_TYPE

inclib_dir_suffix

include_dir_suffix

docdir'

ac_subdirs_all='support/cpp

support/packihx

debugger/mcs51

support/sdbinutils

device/lib/pic14

# Initialize some variables set by options.

ac_init_help=

--disable-sdcpp Disables building sdcpp

--disable-sdcdb Disables building sdcdb

--disable-sdbinutils Disables configuring and building of sdbinutils

--enable-doc Enables building the documentation

--enable-libgc Use the Bohem memory allocator. Lower runtime

footprint.

appended to datadir to define SDCC's include/lib directory

include_dir_suffix

appended to datadir to define SDCC's include directory

docdir documentation installation directory

Use these variables to override the choices made by `configure' or to help

include_dir_suffix="${inclib_dir_suffix}/include"

fi

# lib_dir_suffix:

# *nix default: "sdcc/lib"

lib_dir_suffix="${inclib_dir_suffix}/lib"

fi

# docdir:

# *nix default: "${datadir}/sdcc/doc"

printf "%s\n" "#define INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_inc_dir_suffix}\"" >>confdefs.h

norm_lib_dir_suffix=${lib_dir_suffix}

case ":$norm_lib_dir_suffix:" in

printf "%s\n" "#define LIB_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_lib_dir_suffix}\"" >>confdefs.h

# relative paths

for _lcl_i in expanded_bindir:expanded_datadir:bin2data_dir; do

# Check whether --enable-doc was given.

if test ${enable_doc+y}

test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14"

-

fi

test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile"

ac_config_files="$ac_config_files main.mk:main_in.mk bin/Makefile src/Makefile device/include/Makefile sdas/linksrc/Makefile support/makebin/Makefile support/regression/Makefile support/regression/cases/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"

ac_config_files="$ac_config_files bin/sdobjcopy"

cat >confcache <<\_ACEOF

# This file is a shell script that caches the results of configure

# tests run on this system so they can be shared between configure

"device/lib/pdk15-stack-auto/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/pdk15-stack-auto/Makefile" ;;

"sdas/aspdk16/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/aspdk16/Makefile" ;;

"device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;;

"main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;;

"bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;

"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;

"bin/sdnm") CONFIG_FILES="$CONFIG_FILES bin/sdnm" ;;

"bin/sdranlib") CONFIG_FILES="$CONFIG_FILES bin/sdranlib" ;;

"bin/sdobjcopy") CONFIG_FILES="$CONFIG_FILES bin/sdobjcopy" ;;

*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

esac

incPath3=`echo "$incPath3" | sed 's,\\\\\\\\,\\\\,g'`

libPath1=`echo "/${prefix2data_dir}/${norm_lib_dir_suffix}" | sed 's,/\./,/,g'`

case ":$libPath1:" in

libPath3=`echo "$libPath3" | sed 's,\\\\\\\\,\\\\,g'`

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:

sdcc ${VERSION} is now configured for

mos6502 ${enable_mos6502_port}

mos65c02 ${enable_mos65c02_port}

Disable packihx: ${OPT_DISABLE_PACKIHX}

Disable ucsim: ${OPT_DISABLE_UCSIM}

Disable device lib: ${OPT_DISABLE_DEVICE_LIB}

include/library files: ${datadir}/${inclib_dir_suffix}

include files: ${datadir}/${include_dir_suffix}

library files: ${datadir}/${lib_dir_suffix}

documentation: ${docdir}

prefix: ${prefix}

include files: ${incPath1}

path(argv[0])${incPath2}

${incPath3}

" >&5

printf "%s\n" "

sdcc ${VERSION} is now configured for

mos6502 ${enable_mos6502_port}

mos65c02 ${enable_mos65c02_port}

Disable packihx: ${OPT_DISABLE_PACKIHX}

Disable ucsim: ${OPT_DISABLE_UCSIM}

Disable device lib: ${OPT_DISABLE_DEVICE_LIB}

include/library files: ${datadir}/${inclib_dir_suffix}

include files: ${datadir}/${include_dir_suffix}

library files: ${datadir}/${lib_dir_suffix}

documentation: ${docdir}

prefix: ${prefix}

include files: ${incPath1}

path(argv[0])${incPath2}

${incPath3}

# End of configure/configure.in

diff --git a/configure.ac b/configure.ac

--- a/configure.ac

+++ b/configure.ac

include_dir_suffix="${inclib_dir_suffix}/include"

fi

# lib_dir_suffix:

# *nix default: "sdcc/lib"

AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory])

lib_dir_suffix="${inclib_dir_suffix}/lib"

fi

# docdir:

# *nix default: "${datadir}/sdcc/doc"

AC_ARG_VAR([docdir], [documentation installation directory])

adl_NORMALIZE_PATH([norm_inc_dir_suffix], [$sdccconf_h_dir_separator])

AC_DEFINE_UNQUOTED(INCLUDE_DIR_SUFFIX,

DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}", [XXX])

# relative paths

adl_COMPUTE_RELATIVE_PATHS([expanded_bindir:expanded_datadir:bin2data_dir])

AC_DO_DISABLER(sdcpp, SDCPP, [Disables building sdcpp])

AC_DO_DISABLER(sdcdb, SDCDB, [Disables building sdcdb])

AC_DO_DISABLER(sdbinutils, SDBINUTILS, [Disables configuring and building of sdbinutils])

AC_DO_ENABLER(doc, DOC, [Enables building the documentation])

AC_CHECK_PROG([LYX], [lyx], [lyx], [:])

AC_CONFIG_FILES(src/pic14/Makefile)

test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/lib/pic14)

fi

- test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic16)

-fi

AC_CONFIG_FILES([src/z80/Makefile])

test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile])

AC_CONFIG_FILES([main.mk:main_in.mk

bin/Makefile

AC_CONFIG_FILES([bin/sdnm], [chmod +x bin/sdnm])

AC_CONFIG_FILES([bin/sdranlib], [chmod +x bin/sdranlib])

AC_CONFIG_FILES([bin/sdobjcopy], [chmod +x bin/sdobjcopy])

AC_OUTPUT

# I found no better place

adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_inc_dir_suffix}, [incPath1], [$dirch])

adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_inc_dir_suffix}, [incPath2], [$dirch])

adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_inc_dir_suffix}, [incPath3], [$dirch])

AC_MSG_RESULT([

sdcc ${VERSION} is now configured for

mos6502 ${enable_mos6502_port}

mos65c02 ${enable_mos65c02_port}

Disable packihx: ${OPT_DISABLE_PACKIHX}

Disable ucsim: ${OPT_DISABLE_UCSIM}

Disable device lib: ${OPT_DISABLE_DEVICE_LIB}

include/library files: ${datadir}/${inclib_dir_suffix}

include files: ${datadir}/${include_dir_suffix}

library files: ${datadir}/${lib_dir_suffix}

documentation: ${docdir}

prefix: ${prefix}

include files: ${incPath1}

path(argv[[0]])${incPath2}

${incPath3}

.SUFFIXES:

diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in

--- a/device/lib/pic16/libc/Makefile.in

+++ b/device/lib/pic16/libc/Makefile.in

@@ -88,10 +88,7 @@ PRE_UNINSTALL = :

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

$(ACLOCAL_M4)

DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)

string/strpbrk.c string/strrchr.c string/strspn.c \

string/strstr.c string/strtok.c string/strupr.c \

utils/cnvfrac.S utils/cnvint.S utils/cvtdec.S

#AM_CFLAGS += --no-optimize-goto

#AM_CFLAGS += --debug-ralloc

#AM_CFLAGS += --noinduction

#AM_CFLAGS += --nojtbound

#AM_CFLAGS += --noloopreverse

.SUFFIXES:

diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt

--- a/doc/INSTALL.txt

+++ b/doc/INSTALL.txt

@@ -18,9 +18,7 @@ To install:

You can test the install by entering:

diff --git a/doc/README.txt b/doc/README.txt

--- a/doc/README.txt

+++ b/doc/README.txt

@@ -37,10 +37,9 @@ Exception are pic device libraries and header files which are derived

However: Many think that the Microchip requirement is not legally enforceable,

arguing that the header files only contain noncopyrightable facts.

diff --git a/doc/sdccman.lyx b/doc/sdccman.l