gentoo christmass resync : 25.12.2020

2 files changed, 156 insertions, 0 deletions

diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index fb4e583995bb..4a9fe1800d68 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -1,8 +1,10 @@
 AUX newlib-3.3.0-no-nano-cxx.patch 1338 BLAKE2B ff16751b01784a38dc07aa79120c38f0274bb14caeeb653cecca4b3ca69c60a72e0e1918fea8f2c0f4734293817539122fa41b349f61ceabb3cb9ae878a11d13 SHA512 08dfc7d854dc75c8b875fa7c1829078c8df8988b4ba2b20739d387c656ca63b8b344487861d23658e31b72f911d05c2f57abe51bdf3b2dedcc88ce072c6595c8
 DIST newlib-3.3.0.tar.gz 18361083 BLAKE2B bdc81427955d0a2f550bf2973ca82c0b8b55aa170565cdf1cfe8ac926257fad6d3e860ce7b2e286949ab21be2677378b5b6d3c743c05fe8aa6df8a8c34a16945 SHA512 2f0c6666487520e1a0af0b6935431f85d2359e27ded0d01d02567d0d1c6479f2f0e6bbc60405e88e46b92c2a18780a01a60fc9281f7e311cfd40b8d5881d629c
 DIST newlib-4.0.0.tar.gz 18645966 BLAKE2B 04dced199253f7ea725c1812c2083fd5664722bed645c5cc26567587f802119826ed6bb0372c53c9496110efdc6ee9ea0ec007885c00af885164bfd6b8280bad SHA512 15786bdba2ea6252409b0e3a11046d6315c7629df3b0ee37f0aa2e119c3f356d04e4da6ad2b5dc90de218cc35008f144d7bc986f6b24d95e8868e1848a9ca970
+DIST newlib-4.1.0.tar.gz 18648429 BLAKE2B c4d4d734bceeacf05b75d450d4316392d0000266812f98f99cd3f9f0926ac9848e1dc145361827d1d6951edfe5f109923c982d9f284f927ffc5fd5e5edaf8be6 SHA512 6a24b64bb8136e4cd9d21b8720a36f87a34397fd952520af66903e183455c5cf19bb0ee4607c12a05d139c6c59382263383cb62c461a839f969d23d3bc4b1d34
 EBUILD newlib-3.3.0-r1.ebuild 4459 BLAKE2B c2a94dbe1f3f02e9b4f5ffdd3d80c0a7b85533966ae4e5339f8efda4534aa3e8eef297fb82b0a9c1c113556e3b28293a11444f7208abcce6f5fa9f3996ddcb29 SHA512 140d1044b26489f050a4d5e26f8df168c1a524fcaad1ce10b12c274f188b7c62d31c5870ab731d5f82262d594aa37d0251bd0da2ca1f62a8fd8a7a387dc9fe4e
 EBUILD newlib-3.3.0.ebuild 4401 BLAKE2B a35d99451e91261ea18c9d3e988e2ef260fa8bfbc17d16cb85db8958f1531152baf0b25281c930288a9d6a7affe0c08deb9d608b78e7906381e03962a4e9da61 SHA512 58ed88812207e3c2ef6e811ddb9e74cdef1b1626cc6c04a9d619e5c5bc4ad1f88516b4b9c2fdda9179848b17995bb34ec38f9d66f3bcea201bdee432e34cf7aa
 EBUILD newlib-4.0.0.ebuild 4458 BLAKE2B 1dd071212b733aec7c9b274c966439517eefec491cc99e2e2b2068b08dfca5b80de3de4482a67e5c1a6c51a4f53154b545115d883b98cf1e6d9c17636f02920f SHA512 7934761958f4171a30c109d46b5fe4f353f1a8f812a69663e4315a472cceb378102d862d335b0c991e3a479c2557daa960a8502aa1686b49456ee0629c2e133b
+EBUILD newlib-4.1.0.ebuild 4458 BLAKE2B 1dd071212b733aec7c9b274c966439517eefec491cc99e2e2b2068b08dfca5b80de3de4482a67e5c1a6c51a4f53154b545115d883b98cf1e6d9c17636f02920f SHA512 7934761958f4171a30c109d46b5fe4f353f1a8f812a69663e4315a472cceb378102d862d335b0c991e3a479c2557daa960a8502aa1686b49456ee0629c2e133b
 EBUILD newlib-9999.ebuild 4458 BLAKE2B 1dd071212b733aec7c9b274c966439517eefec491cc99e2e2b2068b08dfca5b80de3de4482a67e5c1a6c51a4f53154b545115d883b98cf1e6d9c17636f02920f SHA512 7934761958f4171a30c109d46b5fe4f353f1a8f812a69663e4315a472cceb378102d862d335b0c991e3a479c2557daa960a8502aa1686b49456ee0629c2e133b
 MISC metadata.xml 413 BLAKE2B 03320244c40182ff9d503fd1d9c7c3847209eeb91081e7d4a3285ed43eba6a42e0f361f6b7601966df420dde2d4e93ca458816198c2f9ebaec82790359ce868b SHA512 37e46d117243b93e189177ada64acedc0d798dfe4859f29a7ef70b22fe44e6364a3445e345def7e48264cb2bf3047ac78637759bc04d9ed3d7ea339432adf7e4
diff --git a/sys-libs/newlib/newlib-4.1.0.ebuild b/sys-libs/newlib/newlib-4.1.0.ebuild
new file mode 100644
index 000000000000..e16fd4c10b75
--- /dev/null
+++ b/sys-libs/newlib/newlib-4.1.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"
+	KEYWORDS="~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Newlib is a C library intended for use on embedded systems"
+HOMEPAGE="https://sourceware.org/newlib/"
+
+LICENSE="NEWLIB LIBGLOSS GPL-2"
+SLOT="0"
+IUSE="nls threads unicode headers-only nano"
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.0-no-nano-cxx.patch
+)
+
+NEWLIBBUILD="${WORKDIR}/build"
+NEWLIBNANOBUILD="${WORKDIR}/build.nano"
+NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
+
+# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's
+# auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4
+# Currently newlib can't be built itself when _FORTIFY_SOURCE
+# is set.
+CFLAGS_FULL="-ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
+CFLAGS_NANO="-Os -ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
+
+pkg_setup() {
+	# Reject newlib-on-glibc type installs
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		case ${CHOST} in
+			*-newlib|*-elf) ;;
+			*) die "Use sys-devel/crossdev to build a newlib toolchain" ;;
+		esac
+	fi
+
+	case ${CTARGET} in
+		msp430*)
+			if ver_test $(gcc-version ${CTARGET}) -lt 10.1; then
+				# bug #717610
+				die "gcc for ${CTARGET} has to be 10.1 or above"
+			fi
+			;;
+	esac
+}
+
+src_configure() {
+	# TODO: we should fix this
+	unset LDFLAGS
+	CHOST=${CTARGET} strip-unsupported-flags
+	CCASFLAGS_ORIG="${CCASFLAGS}"
+	CFLAGS_ORIG="${CFLAGS}"
+
+	local myconf=(
+		# Disable legacy syscall stub code in newlib.  These have been
+		# moved to libgloss for a long time now, so the code in newlib
+		# itself just gets in the way.
+		--disable-newlib-supplied-syscalls
+	)
+	[[ ${CTARGET} == "spu" ]] \
+		&& myconf+=( --disable-newlib-multithread ) \
+		|| myconf+=( $(use_enable threads newlib-multithread) )
+
+	mkdir -p "${NEWLIBBUILD}"
+	cd "${NEWLIBBUILD}"
+
+	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable unicode newlib-mb) \
+		$(use_enable nls) \
+		"${myconf[@]}"
+
+	# Build newlib-nano beside newlib (original)
+	# Based on https://tracker.debian.org/media/packages/n/newlib/rules-2.1.0%2Bgit20140818.1a8323b-2
+	if use nano ; then
+		mkdir -p "${NEWLIBNANOBUILD}" || die
+		cd "${NEWLIBNANOBUILD}" || die
+		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+		ECONF_SOURCE=${S} \
+		econf \
+			$(use_enable unicode newlib-mb) \
+			$(use_enable nls) \
+			--enable-newlib-reent-small \
+			--disable-newlib-fvwrite-in-streamio \
+			--disable-newlib-fseek-optimization \
+			--disable-newlib-wide-orient \
+			--enable-newlib-nano-malloc \
+			--disable-newlib-unbuf-stream-opt \
+			--enable-lite-exit \
+			--enable-newlib-global-atexit \
+			--enable-newlib-nano-formatted-io \
+			${myconf}
+	fi
+}
+
+src_compile() {
+	export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}"
+	export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}"
+	emake -C "${NEWLIBBUILD}"
+
+	if use nano ; then
+		export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}"
+		export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}"
+		emake -C "${NEWLIBNANOBUILD}"
+	fi
+}
+
+src_install() {
+	cd "${NEWLIBBUILD}" || die
+	emake -j1 DESTDIR="${D}" install
+
+	if use nano ; then
+		cd "${NEWLIBNANOBUILD}" || die
+		emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install
+		# Rename nano lib* files to lib*_nano and move to the real ${D}
+		local nanolibfiles=""
+		nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|rdimon\)\.a" -print)
+		for f in ${nanolibfiles}; do
+			local l="${f##${NEWLIBNANOTMPINSTALL}}"
+			mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die
+		done
+
+		# Move newlib-nano's version of newlib.h to newlib-nano/newlib.h
+		mkdir -p "${D}/usr/${CTARGET}/include/newlib-nano" || die
+		mv "${NEWLIBNANOTMPINSTALL}/usr/${CTARGET}/include/newlib.h" \
+			"${D}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die
+	fi
+
+	# minor hack to keep things clean
+	rm -rf "${D}"/usr/share/info || die
+	rm -rf "${D}"/usr/info || die
+}