From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- dev-util/mingw64-runtime/Manifest | 4 +- dev-util/mingw64-runtime/metadata.xml | 12 +-- .../mingw64-runtime-6.0.0-r1.ebuild | 113 +++++++++++++++++++++ .../mingw64-runtime/mingw64-runtime-6.0.0.ebuild | 106 ------------------- 4 files changed, 118 insertions(+), 117 deletions(-) create mode 100644 dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild delete mode 100644 dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild (limited to 'dev-util/mingw64-runtime') diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest index e49c2b921814..47fd5d0a858f 100644 --- a/dev-util/mingw64-runtime/Manifest +++ b/dev-util/mingw64-runtime/Manifest @@ -1,5 +1,5 @@ DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e EBUILD mingw64-runtime-5.0.4.ebuild 2597 BLAKE2B 500aecb0c6f8a8fe314c18937515438c730e25d6637d0b641d90cbbef8cb0764ffd690c7313c6cbade86bbf8bdf725f2bc075460a1e96987f9c6c043609f72da SHA512 cca85d0666b28bec6abcd4c4d40b89f9fb6c76077b10b8e8111b1fb6a96f78bc3877392c7f03f17a733e421bb242adcb8b2058af82136fc9c32c18b9fb7120b7 -EBUILD mingw64-runtime-6.0.0.ebuild 2564 BLAKE2B 5223ae19f8d1c6f08b27bbb2373d0fca2a9fac958b0fe98d7f7d5dad25a066ec02e1f3421ca800ad6c3a97b951531b09fe3648b39bcc6e3d0371c0e32ad4c465 SHA512 51261358421fca211c27bcfce201b585eea4a9448d1c749d580deb350f4fc3fb4d858712190faa23b50fdaa23c3300bcbf2fcc8c9522be85c9463f055418d1be -MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8 +EBUILD mingw64-runtime-6.0.0-r1.ebuild 2908 BLAKE2B 5402e752fab1dd5c784bc743f1f468e8ab74fa0fa1c695e9bb1793298eb44aab9d8b99bd8e449bcf53c00fa8bad182120fee0b424dcf715b446e4bfdfe67280b SHA512 94e837d5cec4b00971dfb399d61db41f39f3c2f7e5907b04b535617f062be34b7af108bb72878a1608b0635ce60d084c9ad64969b09b089d70dfb2dc74ff17af +MISC metadata.xml 563 BLAKE2B 84e56e99482d2f7bb1e1095d84915b42190ba74fe7242ffdce548c4249a40be17018a29911d32b9b09df8fc5e04d912dcfe6f473e5eb2478f55d317808b24f4b SHA512 27dca35a3b2d5444b712802c3099c595d9b9fda21f29b6b709222e5bb0aad78f353d0170500eb3b632b254935d35cf43fc43d4ecb61722b711799ca4d28211bd diff --git a/dev-util/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml index 5d6c0c23c0d6..1b348ca856b1 100644 --- a/dev-util/mingw64-runtime/metadata.xml +++ b/dev-util/mingw64-runtime/metadata.xml @@ -6,15 +6,9 @@ Gentoo Toolchain Project - - Install idl files. - - - Build extra libraries. - - - Build extra tools. - + Install idl files. + Build extra libraries: mangle, pseh, winpthreads. + Build extra tools: gendef, genidl. mingw-w64 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild new file mode 100644 index 000000000000..59982699b753 --- /dev/null +++ b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 + +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" +# USE=libraries needs working stage2 compiler: bug #665512 +IUSE="headers-only idl libraries tools" +RESTRICT="strip" + +S="${WORKDIR}/mingw-w64-v${PV}" + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} +just_headers() { + use headers-only +} +alt_prefix() { + is_crosscompile && echo /usr/${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_configure() { + CHOST=${CTARGET} strip-unsupported-flags + # Normally mingw-64 does not use dynamic linker. + # But at configure time it uses $LDFLAGS. + # When default -Wl,--hash-style=gnu is passed + # __CTORS_LIST__ / __DTORS_LIST__ is mis-detected + # for target ld and binaries crash at shutdown. + filter-ldflags '-Wl,--hash-style=*' + + 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 + + # By default configure tries to set --sysroot=${prefix}. We disable + # this behaviour with --with-sysroot=no to use gcc's sysroot default. + # That way we can cross-build mingw64-runtime with cross-emerge. + CHOST=${CTARGET} econf \ + --with-sysroot=no \ + --prefix="${EPREFIX}"$(alt_prefix)/usr \ + --with-headers \ + --enable-sdk \ + $(crt_with crt) \ + $(crt_use_enable idl idl) \ + $(crt_use_with libraries libraries) \ + $(crt_use_with tools 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" +} diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild deleted file mode 100644 index 47cd6c8a3d10..000000000000 --- a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 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 - -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="" -IUSE="headers-only idl libraries tools" -RESTRICT="strip" - -S="${WORKDIR}/mingw-w64-v${PV}" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} -just_headers() { - use headers-only -} -alt_prefix() { - is_crosscompile && echo /usr/${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_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 - - # By default configure tries to set --sysroot=${prefix}. We disable - # this behaviour with --with-sysroot=no to use gcc's sysroot default. - # That way we can cross-build mingw64-runtime with cross-emerge. - CHOST=${CTARGET} econf \ - --with-sysroot=no \ - --prefix="${EPREFIX}"$(alt_prefix)/usr \ - --with-headers \ - --enable-sdk \ - $(crt_with crt) \ - $(crt_use_enable idl idl) \ - $(crt_use_with libraries libraries) \ - $(crt_use_with tools 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" -} -- cgit v1.2.3