commit: f61cc139dc76de82a5cc0a0960c19c9afb383da7 Author: Marty E. Plummer <hanetzer <AT> protonmail <DOT> com> AuthorDate: Mon Sep 18 16:54:46 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Sep 23 13:19:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61cc139
dev-util/mingw64-runtime: fix build of dev-libs/icu Fixes building dev-libs/icu against mingw-w64 targets. References: http://ssl.icu-project.org/trac/ticket/12896 https://sourceforge.net/p/mingw-w64/mingw-w64/ci/b508bb87ad179421d10df68a7ebc48b33570f9b0/ Package-Manager: Portage-2.3.8, Repoman-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/5726 .../files/mingw64-runtime-5.0.2-locale.patch | 36 +++++++ .../mingw64-runtime-5.0.2-r2.ebuild | 115 +++++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch new file mode 100644 index 00000000000..a7a0a09dc16 --- /dev/null +++ b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch @@ -0,0 +1,36 @@ +--- a/mingw-w64-crt/lib32/msvcrt.def.in ++++ b/mingw-w64-crt/lib32/msvcrt.def.in +@@ -138,6 +138,7 @@ _copysign + _cprintf + _cputs + _creat ++_create_locale + _cscanf + _ctype DATA + _cwait +@@ -192,6 +193,7 @@ _fpieee_flt + _fpreset DATA + _fputchar + _fputwchar ++_free_locale + _fsopen + _fstat + _fstat32 == _fstat +--- a/mingw-w64-crt/lib64/msvcrt.def.in ++++ b/mingw-w64-crt/lib64/msvcrt.def.in +@@ -240,6 +240,7 @@ _cprintf_p_l + _cputs + _cputws + _creat ++_create_locale + _cscanf + _cscanf_l + _cscanf_s +@@ -315,6 +316,7 @@ _fputchar + _fputwchar + _fscanf_l + _fscanf_s_l ++_free_locale + _fsopen + _fstat + _fstat64 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild new file mode 100644 index 00000000000..0edd83c0035 --- /dev/null +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +WANT_AUTOMAKE="1.15" + +inherit autotools flag-o-matic eutils + +DESCRIPTION="Free Win64 runtime and import library definitions" +HOMEPAGE="http://mingw-w64.sourceforge.net/"; +SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="crosscompile_opts_headers-only idl libraries tools" +RESTRICT="strip" + +S="${WORKDIR}/mingw-w64-v${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.1-winpthreads.patch" + "${FILESDIR}/${PN}-4.0.1-build.patch" + "${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch" + "${FILESDIR}/${PN}-5.0.2-locale.patch" +) + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} +just_headers() { + use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] +} +crt_with() { + just_headers && echo --without-$1 || echo --with-$1 +} +crt_use_enable() { + just_headers && echo --without-$2 || use_enable "$@" +} +crt_use_with() { + just_headers && echo --without-$2 || use_with "$@" +} + +pkg_setup() { + if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then + die "Invalid configuration" + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + CHOST=${CTARGET} strip-unsupported-flags + + if ! just_headers; then + mkdir "${WORKDIR}/headers" + pushd "${WORKDIR}/headers" > /dev/null + CHOST=${CTARGET} "${S}/configure" \ + --prefix="${T}/tmproot" \ + --with-headers \ + --without-crt \ + || die + popd > /dev/null + append-cppflags "-I${T}/tmproot/include" + fi + + CHOST=${CTARGET} econf \ + --prefix=/usr/${CTARGET} \ + --includedir=/usr/${CTARGET}/usr/include \ + --libdir=/usr/${CTARGET}/usr/lib \ + --with-headers \ + --enable-sdk \ + $(crt_with crt) \ + $(crt_use_enable idl) \ + $(crt_use_with libraries libraries winpthreads,libmangle) \ + $(crt_use_with tools) \ + $( + $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \ + && echo --disable-lib32 --enable-lib64 \ + || echo --enable-lib32 --disable-lib64 + ) +} + +src_compile() { + if ! just_headers; then + emake -C "${WORKDIR}/headers" install + fi + default +} + +src_install() { + default + + if is_crosscompile ; then + # gcc is configured to look at specific hard-coded paths for mingw #419601 + dosym usr /usr/${CTARGET}/mingw + dosym usr /usr/${CTARGET}/${CTARGET} + dosym usr/include /usr/${CTARGET}/sys-include + fi + + env -uRESTRICT CHOST=${CTARGET} prepallstrip + rm -rf "${ED}/usr/share" +}
