commit: fc4f467eb98b7eff140bb472bf74d76aa99daa72 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Apr 29 04:16:51 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Apr 29 09:42:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4f467e
dev-util/mingw64-runtime: drop 8.0.0-r3, 9.0.0-r2 Do not believe these versions should be needed anymore, please report if you believe there's a still a reason. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-util/mingw64-runtime/Manifest | 2 - .../files/mingw64-runtime-8.0.0-__rdtsc.patch | 25 ---- .../files/mingw64-runtime-8.0.0-udivmod.patch | 26 ---- .../mingw64-runtime-8.0.0-r3.ebuild | 146 --------------------- .../mingw64-runtime-9.0.0-r2.ebuild | 144 -------------------- 5 files changed, 343 deletions(-) diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest index 7efd990ea87d..30bd166abe51 100644 --- a/dev-util/mingw64-runtime/Manifest +++ b/dev-util/mingw64-runtime/Manifest @@ -1,3 +1 @@ DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516 -DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e -DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-__rdtsc.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-__rdtsc.patch deleted file mode 100644 index df06f041c8c2..000000000000 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-__rdtsc.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/786549 - -gcc-11 defines __rdtsc as a macro: - // include/ia32intrin.h:110 - #define __rdtsc() __builtin_ia32_rdtsc () -and causes build failure: - intrincs/rdtsc.c:15:30: error: macro "__rdtsc" passed 1 arguments, but takes just 0 - 15 | unsigned __int64 __rdtsc(void) - | ^ - -Let's avoid __rdtsc definition on systems with #define __rdtsc present. - -There is still a chance that it might be a '#define __rdtsc __rdtsc'. -We'll revisit it then. ---- a/mingw-w64-crt/intrincs/rdtsc.c -+++ b/mingw-w64-crt/intrincs/rdtsc.c -@@ -11,7 +11,7 @@ - #define __has_builtin(x) 0 - #endif - --#if !__has_builtin(__rdtsc) -+#if !__has_builtin(__rdtsc) && !defined(__rdtsc) - unsigned __int64 __rdtsc(void) - { - #ifdef _WIN64 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch deleted file mode 100644 index dcbe99878f05..000000000000 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-8.0.0-udivmod.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/787662 -https://sourceforge.net/p/mingw-w64/mingw-w64/ci/ab0fa5ad3c67d634fd7754d9473d1bb7051f9bf0/tree/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c?diff=6a0e9165008f731bccadfc41a59719cf7c8efc02 ---- a/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c -+++ b/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c -@@ -121,6 +121,7 @@ - u_quad_t __umoddi3(u_quad_t a, u_quad_t b); - int __ucmpdi2(u_quad_t a, u_quad_t b); - quad_t __divmoddi4(quad_t a, quad_t b, quad_t *rem); -+u_quad_t __udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem); - - #endif /* !_LIBKERN_QUAD_H_ */ - -@@ -573,6 +574,12 @@ - return (negq ? -uq : uq); - } - -+u_quad_t -+__udivmoddi4(u_quad_t a, u_quad_t b, u_quad_t *rem) -+{ -+ return __qdivrem(a, b, rem); -+} -+ - #else - static int __attribute__((unused)) dummy; - #endif /*deined (_X86_) && !defined (__x86_64__)*/ - diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild deleted file mode 100644 index caa50883a838..000000000000 --- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Free Win64 runtime and import library definitions" -HOMEPAGE="https://www.mingw-w64.org/"; -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" -S="${WORKDIR}/mingw-w64-v${PV}" - -LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# USE=libraries needs working stage2 compiler: bug #665512 -IUSE="headers-only idl libraries tools" -RESTRICT="strip" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch - "${FILESDIR}"/${P}-__rdtsc.patch - "${FILESDIR}"/${P}-udivmod.patch -) - -pkg_setup() { - : ${CBUILD:=${CHOST}} - : ${CTARGET:=${CHOST}} - [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]] && - CTARGET=${CATEGORY#cross-} - - [[ ${CHOST} != ${CTARGET} ]] && MW_CROSS=true || MW_CROSS=false - - [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] && - die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw"; -} - -mingw-foreach_tool() { - use !tools || use headers-only && return - - local tool=widl - if use !amd64 && use !x86 && use !arm64 && use !arm; then - einfo "Skipping widl due to unsupported platform" #853250 - tool= - fi - - for tool in gendef genidl ${tool}; do - # not using top-level --with-tools given it skips widl - pushd mingw-w64-tools/${tool} >/dev/null || die - "${@}" - popd >/dev/null || die - done -} - -src_configure() { - # native tools, see #644556 - local toolsconf=() - # normally only widl is prefixed, but avoids clash with other targets - ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) - - mingw-foreach_tool econf "${toolsconf[@]}" - - MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it - - # likely cross-compiling from here, update toolchain variables - if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then - unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP - filter-flags '-fstack-clash-protection' #758914 - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - fi - local CHOST=${CTARGET} - strip-unsupported-flags - - # Normally mingw64 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=*' - - local prefix=${EPREFIX}/usr - ${MW_CROSS} && prefix+=/${CTARGET}/usr - - local conf=( - --prefix="${prefix}" - --libdir="${prefix}"/lib - $(use_with !headers-only crt) - - # 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. - --with-sysroot=no - ) - - if use !headers-only; then - conf+=( - $(use_enable idl) - $(use_with libraries) - ) - - # prefer tuple to determine if should do 32 or 64bits, but fall - # back to cpp test if missing (bug #584858, see also #840662) - local b32=true - case ${CHOST} in - x86_64-*) b32=false;; - i*86-*) ;; - *) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;; - esac - ${b32} && - conf+=( --enable-lib32 --disable-lib64 ) || - conf+=( --disable-lib32 --enable-lib64 ) - - # prepare temporary headers install to build against same-version - mkdir ../headers || die - pushd ../headers >/dev/null || die - ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt - popd >/dev/null || die - - append-cppflags "-I${T}/root/include" - fi - - econf "${conf[@]}" -} - -src_compile() { - use headers-only || emake -C ../headers install - emake - mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}" -} - -src_install() { - default - - mingw-foreach_tool emake DESTDIR="${D}" install - - if ${MW_CROSS}; 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 - - rm -r "${ED}"/usr/share || die -} diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild deleted file mode 100644 index 7f9b3697a13d..000000000000 --- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Free Win64 runtime and import library definitions" -HOMEPAGE="https://www.mingw-w64.org/"; -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2" -S="${WORKDIR}/mingw-w64-v${PV}" - -LICENSE="ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain tools? ( GPL-3+ )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -# USE=libraries needs working stage2 compiler: bug #665512 -IUSE="headers-only idl libraries tools" -RESTRICT="strip" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch -) - -pkg_setup() { - : ${CBUILD:=${CHOST}} - : ${CTARGET:=${CHOST}} - [[ ${CTARGET} == ${CHOST} && ${CATEGORY} == cross-* ]] && - CTARGET=${CATEGORY#cross-} - - [[ ${CHOST} != ${CTARGET} ]] && MW_CROSS=true || MW_CROSS=false - - [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] && - die "Invalid configuration, please see: https://wiki.gentoo.org/wiki/Mingw"; -} - -mingw-foreach_tool() { - use !tools || use headers-only && return - - local tool=widl - if use !amd64 && use !x86 && use !arm64 && use !arm; then - einfo "Skipping widl due to unsupported platform" #853250 - tool= - fi - - for tool in gendef genidl ${tool}; do - # not using top-level --with-tools given it skips widl - pushd mingw-w64-tools/${tool} >/dev/null || die - "${@}" - popd >/dev/null || die - done -} - -src_configure() { - # native tools, see #644556 - local toolsconf=() - # normally only widl is prefixed, but avoids clash with other targets - ${MW_CROSS} && toolsconf+=( --program-prefix=${CTARGET}- ) - - mingw-foreach_tool econf "${toolsconf[@]}" - - MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it - - # likely cross-compiling from here, update toolchain variables - if ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]]; then - unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP - filter-flags '-fstack-clash-protection' #758914 - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - filter-flags '-mfunction-return=thunk*' #878849 - fi - local CHOST=${CTARGET} - strip-unsupported-flags - - # Normally mingw64 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=*' - - local prefix=${EPREFIX}/usr - ${MW_CROSS} && prefix+=/${CTARGET}/usr - - local conf=( - --prefix="${prefix}" - --libdir="${prefix}"/lib - $(use_with !headers-only crt) - - # 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. - --with-sysroot=no - ) - - if use !headers-only; then - conf+=( - $(use_enable idl) - $(use_with libraries) - ) - - # prefer tuple to determine if should do 32 or 64bits, but fall - # back to cpp test if missing (bug #584858, see also #840662) - local b32=true - case ${CHOST} in - x86_64-*) b32=false;; - i*86-*) ;; - *) [[ $($(tc-getCPP) -dM - <<<'') =~ __MINGW64__ ]] && b32=false;; - esac - ${b32} && - conf+=( --enable-lib32 --disable-lib64 ) || - conf+=( --disable-lib32 --enable-lib64 ) - - # prepare temporary headers install to build against same-version - mkdir ../headers || die - pushd ../headers >/dev/null || die - ECONF_SOURCE=${S} econf --prefix="${T}"/root --without-crt - popd >/dev/null || die - - append-cppflags "-I${T}/root/include" - fi - - econf "${conf[@]}" -} - -src_compile() { - use headers-only || emake -C ../headers install - emake - mingw-foreach_tool emake LDFLAGS="${MW_LDFLAGS}" -} - -src_install() { - default - - mingw-foreach_tool emake DESTDIR="${D}" install - - if ${MW_CROSS}; 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 - - rm -r "${ED}"/usr/share || die -}
