commit: b0477c53abfd96c13a56d28bf1a473aa106e4d5f
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 12:29:54 2026 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 14:01:55 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0477c53
dev-embedded/sdcc: add binutils to SRC_URI
Add the binutils trick to 4.3.0-r1 and remove the missing m4 from ${FILESDIR}.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-embedded/sdcc/Manifest | 1 +
dev-embedded/sdcc/files/binutils-2.41-acinclude.m4 | 193 ---------------------
dev-embedded/sdcc/sdcc-4.3.0-r1.ebuild | 7 +-
3 files changed, 6 insertions(+), 195 deletions(-)
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 05aed014c6af..5a7ad7765591 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,3 +1,4 @@
+DIST binutils-2.41.tar.xz 26765692 BLAKE2B
3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75
SHA512
5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
DIST binutils-2.45.1.tar.xz 27962312 BLAKE2B
1ccab38659ec47f9100b61322627345fe79ebd04ed0b1e872c988edded4d292d7c9ac33d9f6ea47bf265ec823dfba60da0e84374900c15ec89e3aa9280ac020c
SHA512
ea030419eba387579ab717be7e3223fc99e93b586860b06003c12489f93441640d4082736f76aa5e98233db4f46e232f536a45e471486de1f5b64e1b827c167e
DIST sdcc-doc-4.3.0.tar.bz2 1271916 BLAKE2B
a8c8018990ff2ae5504253f38a9de045b8a5227a60d76604394c286cb55d11b24f3ab97ed0a11d434c0b1ccb7e5340c33872c5ff5e677130e395b396a389f532
SHA512
088dce843c9e06380a8058b5253051e2a2442655be38435f15ed6754291e75d3f6e2b1a416e4f90dd865b2d89a9e1c59a2b9ee1422096132f49f038c527bcd19
DIST sdcc-doc-4.5.0.tar.bz2 1404904 BLAKE2B
6d48c83b698e94e721c45dc6928bc718054b6bc019f1e62104929633fb16eaad77efefd2cd827ce36a19809508d6f53c67f8f1113c7df9ab3d0ea1006d4f4fef
SHA512
0591352d6ed3dd39b71ac79135da0bb37782911c400b6802ee300bc9ffd397aba7558b5d53ae0e37a0408ba686dfb548be0e2fcf9ecebb550e0f5d254789bbd8
diff --git a/dev-embedded/sdcc/files/binutils-2.41-acinclude.m4
b/dev-embedded/sdcc/files/binutils-2.41-acinclude.m4
deleted file mode 100644
index 03bc955c619b..000000000000
--- a/dev-embedded/sdcc/files/binutils-2.41-acinclude.m4
+++ /dev/null
@@ -1,193 +0,0 @@
-dnl Copyright (C) 2000-2023 Free Software Foundation, Inc.
-dnl
-dnl GCC is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GCC is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GCC; see the file COPYING3. If not see
-dnl <http://www.gnu.org/licenses/>.
-
-dnl See whether strncmp reads past the end of its string parameters.
-dnl On some versions of SunOS4 at least, strncmp reads a word at a time
-dnl but erroneously reads past the end of strings. This can cause
-dnl a SEGV in some cases.
-AC_DEFUN([libiberty_AC_FUNC_STRNCMP],
-[AC_REQUIRE([AC_FUNC_MMAP])
-AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works,
-[AC_TRY_RUN([
-/* Test by Jim Wilson and Kaveh Ghazi.
- Check whether strncmp reads past the end of its string parameters. */
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-#ifndef MAP_ANON
-#ifdef MAP_ANONYMOUS
-#define MAP_ANON MAP_ANONYMOUS
-#else
-#define MAP_ANON MAP_FILE
-#endif
-#endif
-
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-#ifndef O_RDONLY
-#define O_RDONLY 0
-#endif
-
-#define MAP_LEN 0x10000
-
-int
-main (void)
-{
-#if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE)
- char *p;
- int dev_zero;
-
- dev_zero = open ("/dev/zero", O_RDONLY);
- if (dev_zero < 0)
- exit (1);
-
- p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
- MAP_ANON|MAP_PRIVATE, dev_zero, 0);
- if (p == (char *)-1)
- p = (char *) mmap (0, MAP_LEN, PROT_READ|PROT_WRITE,
- MAP_ANON|MAP_PRIVATE, -1, 0);
- if (p == (char *)-1)
- exit (2);
- else
- {
- char *string = "__si_type_info";
- char *q = (char *) p + MAP_LEN - strlen (string) - 2;
- char *r = (char *) p + 0xe;
-
- strcpy (q, string);
- strcpy (r, string);
- strncmp (r, q, 14);
- }
-#endif /* HAVE_MMAP || HAVE_MMAP_ANYWHERE */
- exit (0);
-}
-], ac_cv_func_strncmp_works=yes, ac_cv_func_strncmp_works=no,
- ac_cv_func_strncmp_works=yes)
-rm -f core core.* *.core])
-if test $ac_cv_func_strncmp_works = no ; then
- AC_LIBOBJ([strncmp])
-fi
-])
-
-dnl See if errno must be declared even when <errno.h> is included.
-AC_DEFUN([libiberty_AC_DECLARE_ERRNO],
-[AC_CACHE_CHECK(whether errno must be declared, libiberty_cv_declare_errno,
-[AC_TRY_COMPILE(
-[#include <errno.h>],
-[int x = errno;],
-libiberty_cv_declare_errno=no,
-libiberty_cv_declare_errno=yes)])
-if test $libiberty_cv_declare_errno = yes
-then AC_DEFINE(NEED_DECLARATION_ERRNO, 1,
- [Define if errno must be declared even when <errno.h> is included.])
-fi
-])
-
-dnl See whether we need a declaration for a function.
-AC_DEFUN([libiberty_NEED_DECLARATION],
-[AC_MSG_CHECKING([whether $1 must be declared])
-AC_CACHE_VAL(libiberty_cv_decl_needed_$1,
-[AC_TRY_COMPILE([
-#include "confdefs.h"
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif],
-[char *(*pfn) = (char *(*)) $1],
-libiberty_cv_decl_needed_$1=no, libiberty_cv_decl_needed_$1=yes)])
-AC_MSG_RESULT($libiberty_cv_decl_needed_$1)
-if test $libiberty_cv_decl_needed_$1 = yes; then
- AC_DEFINE([NEED_DECLARATION_]translit($1, [a-z], [A-Z]), 1,
- [Define if $1 is not declared in system header files.])
-fi
-])dnl
-
-# We always want a C version of alloca() compiled into libiberty,
-# because native-compiler support for the real alloca is so !@#$%
-# unreliable that GCC has decided to use it only when being compiled
-# by GCC. This is the part of AC_FUNC_ALLOCA that calculates the
-# information alloca.c needs.
-AC_DEFUN([libiberty_AC_FUNC_C_ALLOCA],
-[AC_CACHE_CHECK(whether alloca needs Cray hooks, ac_cv_os_cray,
-[AC_EGREP_CPP(webecray,
-[#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-], ac_cv_os_cray=yes, ac_cv_os_cray=no)])
-if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- AC_CHECK_FUNC($ac_func,
- [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func,
- [Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP
- systems. This function is required for alloca.c support on those
- systems.]) break])
- done
-fi
-
-AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
-[AC_TRY_RUN([#include <stdlib.h>
-
-int
-find_stack_direction (void)
-{
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
-}
-
-int
-main (void)
-{
- exit (find_stack_direction() < 0);
-}],
- ac_cv_c_stack_direction=1,
- ac_cv_c_stack_direction=-1,
- ac_cv_c_stack_direction=0)])
-AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction,
- [Define if you know the direction of stack growth for your system;
- otherwise it will be automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown])
-])
diff --git a/dev-embedded/sdcc/sdcc-4.3.0-r1.ebuild
b/dev-embedded/sdcc/sdcc-4.3.0-r1.ebuild
index 5d2904b115c1..3d98aa7f2933 100644
--- a/dev-embedded/sdcc/sdcc-4.3.0-r1.ebuild
+++ b/dev-embedded/sdcc/sdcc-4.3.0-r1.ebuild
@@ -9,8 +9,11 @@ if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc";
inherit subversion
else
+ BINUTILS_PV=2.41
SRC_URI="
https://downloads.sourceforge.net/project/${PN}/sdcc/${PV}/${PN}-src-${PV}.tar.bz2
+ mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
+
https://sourceware.org/pub/binutils/releases/binutils-${BINUTILS_PV}.tar.xz
doc? (
https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2
)
"
@@ -90,8 +93,8 @@ src_prepare() {
mkdir -p support/sdbinutils/bfd/doc || die
- # add acinclude.m4 from binutils to run autoreconf for libiberty
- cp "${FILESDIR}"/binutils-2.41-acinclude.m4
support/sdbinutils/libiberty/acinclude.m4 || die
+ # add m4 files from binutils to run autoreconf for libiberty
+ cp "${WORKDIR}"/binutils-${BINUTILS_PV}/libiberty/acinclude.m4
support/sdbinutils/libiberty/acinclude.m4 || die
# libiberty configure will check this file and fail if not found
cp install-sh support/sdbinutils/libiberty/ || die
# libiberty configure will fail if this was not set
