Date: Sun, 4 Oct 2020 20:49:36 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551458 - in head/devel/arm-none-eabi-newlib: . files Message-ID: <202010042049.094KnaRf000381@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sun Oct 4 20:49:35 2020 New Revision: 551458 URL: https://svnweb.freebsd.org/changeset/ports/551458 Log: devel/arm-none-eabi-newlib: unbreak after include-fixed removal We're now operating on more standards-compliant headers. Defining __LONG_LONG_SUPPORTED is a little hacky, but some backflips are needed to assume a C99 build. For now, just make it work so that we can get the definition from sys/limits.h as needed. MFH: 2020Q4 (blanket: build fix) Added: head/devel/arm-none-eabi-newlib/files/ head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_strtoll__r.c (contents, props changed) head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_strtoull__r.c (contents, props changed) head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_wcstoll__r.c (contents, props changed) head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_wcstoull__r.c (contents, props changed) Modified: head/devel/arm-none-eabi-newlib/Makefile Modified: head/devel/arm-none-eabi-newlib/Makefile ============================================================================== --- head/devel/arm-none-eabi-newlib/Makefile Sun Oct 4 20:31:43 2020 (r551457) +++ head/devel/arm-none-eabi-newlib/Makefile Sun Oct 4 20:49:35 2020 (r551458) @@ -11,8 +11,6 @@ PKGNAMEPREFIX= ${NEWLIB_TARGET}- MAINTAINER= kevans@FreeBSD.org COMMENT= Newlib distribution for ${NEWLIB_TARGET} targets -BROKEN= arm-none-eabi-ar: ../stdlib/lib.a: No such file or directory - BUILD_DEPENDS+= ${NEWLIB_TARGET}-ar:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \ ${NEWLIB_TARGET}-as:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \ ${NEWLIB_TARGET}-ld:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \ Added: head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_strtoll__r.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_strtoll__r.c Sun Oct 4 20:49:35 2020 (r551458) @@ -0,0 +1,28 @@ +--- newlib/libc/stdlib/strtoll_r.c.orig 2020-10-04 20:42:31 UTC ++++ newlib/libc/stdlib/strtoll_r.c +@@ -42,6 +42,7 @@ + #ifdef __GNUC__ + + #define _GNU_SOURCE ++#define __LONG_LONG_SUPPORTED + #include <_ansi.h> + #include <limits.h> + #include <ctype.h> +@@ -107,7 +108,7 @@ _DEFUN (_strtoll_r, (rptr, nptr, endptr, base), + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ +- cutoff = neg ? -(unsigned long long)LONG_LONG_MIN : LONG_LONG_MAX; ++ cutoff = neg ? -(unsigned long long)LLONG_MIN : LLONG_MAX; + cutlim = cutoff % (unsigned long long)base; + cutoff /= (unsigned long long)base; + for (acc = 0, any = 0;; c = *s++) { +@@ -128,7 +129,7 @@ _DEFUN (_strtoll_r, (rptr, nptr, endptr, base), + } + } + if (any < 0) { +- acc = neg ? LONG_LONG_MIN : LONG_LONG_MAX; ++ acc = neg ? LLONG_MIN : LLONG_MAX; + rptr->_errno = ERANGE; + } else if (neg) + acc = -acc; Added: head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_strtoull__r.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_strtoull__r.c Sun Oct 4 20:49:35 2020 (r551458) @@ -0,0 +1,30 @@ +--- newlib/libc/stdlib/strtoull_r.c.orig 2020-10-04 20:42:46 UTC ++++ newlib/libc/stdlib/strtoull_r.c +@@ -43,6 +43,7 @@ + #ifdef __GNUC__ + + #define _GNU_SOURCE ++#define __LONG_LONG_SUPPORTED + #include <_ansi.h> + #include <limits.h> + #include <ctype.h> +@@ -88,8 +89,8 @@ _DEFUN (_strtoull_r, (rptr, nptr, endptr, base), + } + if (base == 0) + base = c == '0' ? 8 : 10; +- cutoff = (unsigned long long)ULONG_LONG_MAX / (unsigned long long)base; +- cutlim = (unsigned long long)ULONG_LONG_MAX % (unsigned long long)base; ++ cutoff = (unsigned long long)ULLONG_MAX / (unsigned long long)base; ++ cutlim = (unsigned long long)ULLONG_MAX % (unsigned long long)base; + for (acc = 0, any = 0;; c = *s++) { + if (isdigit(c)) + c -= '0'; +@@ -108,7 +109,7 @@ _DEFUN (_strtoull_r, (rptr, nptr, endptr, base), + } + } + if (any < 0) { +- acc = ULONG_LONG_MAX; ++ acc = ULLONG_MAX; + rptr->_errno = ERANGE; + } else if (neg) + acc = -acc; Added: head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_wcstoll__r.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_wcstoll__r.c Sun Oct 4 20:49:35 2020 (r551458) @@ -0,0 +1,28 @@ +--- newlib/libc/stdlib/wcstoll_r.c.orig 2020-10-04 20:42:35 UTC ++++ newlib/libc/stdlib/wcstoll_r.c +@@ -42,6 +42,7 @@ + #ifdef __GNUC__ + + #define _GNU_SOURCE ++#define __LONG_LONG_SUPPORTED + #include <_ansi.h> + #include <limits.h> + #include <wctype.h> +@@ -107,7 +108,7 @@ _DEFUN (_wcstoll_r, (rptr, nptr, endptr, base), + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ +- cutoff = neg ? -(unsigned long long)LONG_LONG_MIN : LONG_LONG_MAX; ++ cutoff = neg ? -(unsigned long long)LLONG_MIN : LLONG_MAX; + cutlim = cutoff % (unsigned long long)base; + cutoff /= (unsigned long long)base; + for (acc = 0, any = 0;; c = *s++) { +@@ -128,7 +129,7 @@ _DEFUN (_wcstoll_r, (rptr, nptr, endptr, base), + } + } + if (any < 0) { +- acc = neg ? LONG_LONG_MIN : LONG_LONG_MAX; ++ acc = neg ? LLONG_MIN : LLONG_MAX; + rptr->_errno = ERANGE; + } else if (neg) + acc = -acc; Added: head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_wcstoull__r.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/arm-none-eabi-newlib/files/patch-newlib_libc_stdlib_wcstoull__r.c Sun Oct 4 20:49:35 2020 (r551458) @@ -0,0 +1,10 @@ +--- newlib/libc/stdlib/wcstoull_r.c.orig 2020-10-04 20:42:50 UTC ++++ newlib/libc/stdlib/wcstoull_r.c +@@ -43,6 +43,7 @@ + #ifdef __GNUC__ + + #define _GNU_SOURCE ++#define __LONG_LONG_SUPPORTED + #include <_ansi.h> + #include <limits.h> + #include <wchar.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010042049.094KnaRf000381>