commit: c871254beb58794d1098fd2c12b05b7c9c646e6e Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu May 25 19:58:18 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu May 25 19:58:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c871254b
profiles: remove x64-cygwin/windows Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> profiles/prefix/windows/cygwin/eapi | 1 - profiles/prefix/windows/cygwin/make.defaults | 11 - profiles/prefix/windows/cygwin/package.mask | 23 -- profiles/prefix/windows/cygwin/package.unmask | 6 - profiles/prefix/windows/cygwin/package.use | 14 -- profiles/prefix/windows/cygwin/package.use.mask | 6 - profiles/prefix/windows/cygwin/packages | 6 - profiles/prefix/windows/cygwin/parent | 1 - profiles/prefix/windows/cygwin/profile.bashrc | 211 ---------------- profiles/prefix/windows/cygwin/use.force | 5 - profiles/prefix/windows/cygwin/use.mask | 5 - profiles/prefix/windows/cygwin/x64/eapi | 1 - profiles/prefix/windows/cygwin/x64/make.defaults | 17 -- profiles/prefix/windows/cygwin/x64/parent | 1 - profiles/prefix/windows/eapi | 1 - profiles/prefix/windows/package.mask | 6 - profiles/prefix/windows/package.use.mask | 7 - profiles/prefix/windows/parent | 3 - profiles/prefix/windows/use.force | 5 - profiles/prefix/windows/use.mask | 8 - profiles/prefix/windows/winnt/eapi | 1 - profiles/prefix/windows/winnt/make.defaults | 10 - profiles/prefix/windows/winnt/package.mask | 2 - profiles/prefix/windows/winnt/package.use.mask | 7 - profiles/prefix/windows/winnt/packages | 37 --- profiles/prefix/windows/winnt/parent | 1 - profiles/prefix/windows/winnt/profile.bashrc | 305 ----------------------- profiles/prefix/windows/winnt/use.force | 5 - profiles/prefix/windows/winnt/use.mask | 66 ----- profiles/prefix/windows/winnt/x64/eapi | 1 - profiles/prefix/windows/winnt/x64/make.defaults | 28 --- profiles/prefix/windows/winnt/x64/parent | 1 - profiles/prefix/windows/winnt/x86/eapi | 1 - profiles/prefix/windows/winnt/x86/make.defaults | 28 --- profiles/prefix/windows/winnt/x86/parent | 1 - profiles/profiles.desc | 7 - 36 files changed, 839 deletions(-) diff --git a/profiles/prefix/windows/cygwin/eapi b/profiles/prefix/windows/cygwin/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/windows/cygwin/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/windows/cygwin/make.defaults b/profiles/prefix/windows/cygwin/make.defaults deleted file mode 100644 index d7ba076a8812..000000000000 --- a/profiles/prefix/windows/cygwin/make.defaults +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# System-wide defaults for all Cygwin profiles -# This file should rarely need to be changed - -# 'Sane' defaults -ELIBC="Cygwin" - -# no scanelf -FEATURES="nostrip" diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask deleted file mode 100644 index ee0e3ad4aacc..000000000000 --- a/profiles/prefix/windows/cygwin/package.mask +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner <ha...@gentoo.org> (2019-06-07) -# Breaks due to weak functions and object file order on linkline, -# see https://cygwin.com/ml/cygwin/2019-06/msg00092.html ->=app-portage/portage-utils-0.80_pre - -# Michael Haubenwallner <ha...@gentoo.org> (2019-06-07) -# Cygwin does not provide this new version yet in it's repo. ->=sys-devel/gcc-8.4 - -# Michael Haubenwallner <ha...@gentoo.org> (2019-02-13) -# see upstream report https://savannah.gnu.org/bugs/index.php?55708 -=sys-apps/groff-1.22.4 - -# Michael Haubenwallner <ha...@gentoo.org> (2019-01-30) -# Cygwin does not have updated patches yet, is not trivial ->=sys-apps/coreutils-8.30 - -# Michael Haubenwallner <ha...@gentoo.org> (2016-05-20) -# Does not work with Cygwin. -sys-apps/man-db diff --git a/profiles/prefix/windows/cygwin/package.unmask b/profiles/prefix/windows/cygwin/package.unmask deleted file mode 100644 index 0037a47423bd..000000000000 --- a/profiles/prefix/windows/cygwin/package.unmask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner <ha...@gentoo.org> (2019-02-13) -# A little less broken on Cygwin than openssl-1.1.0j. -=dev-libs/openssl-1.1.1* diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use deleted file mode 100644 index e42eadac8934..000000000000 --- a/profiles/prefix/windows/cygwin/package.use +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner <ha...@gentoo.org> (2018-05-14) -# stack protector does not fully work on Cygwin yet -sys-devel/gcc -ssp - -# Michael Haubenwallner <ha...@gentoo.org> (2017-03-23) -# Using nettle hides a conflict between wincrypt and openssl. -app-arch/libarchive nettle - -# Michael Haubenwallner <ha...@gentoo.org> (2016-04-18) -# Cygwin coreutils provide kill as gkill -sys-apps/coreutils kill diff --git a/profiles/prefix/windows/cygwin/package.use.mask b/profiles/prefix/windows/cygwin/package.use.mask deleted file mode 100644 index a964e7ff0cf3..000000000000 --- a/profiles/prefix/windows/cygwin/package.use.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Fabian Groffen <grob...@gentoo.org> (2020-08-04) -# missing keywords on deps -dev-util/ninja doc test diff --git a/profiles/prefix/windows/cygwin/packages b/profiles/prefix/windows/cygwin/packages deleted file mode 100644 index f3e9e76142f4..000000000000 --- a/profiles/prefix/windows/cygwin/packages +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -*app-admin/cygwin-rebase -*sys-devel/binutils -*sys-libs/cygwin-crypt diff --git a/profiles/prefix/windows/cygwin/parent b/profiles/prefix/windows/cygwin/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/windows/cygwin/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc deleted file mode 100644 index 4b1478682762..000000000000 --- a/profiles/prefix/windows/cygwin/profile.bashrc +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -if [[ ${CATEGORY}/${PN} == app-arch/xz-utils - && ${EBUILD_PHASE} == setup - && ${CPPFLAGS} == *-isystem* -]]; then - # During bootstrap-prefix.sh we set CPPFLAGS="-isystem $EPREFIX/usr/include", - # but on Cygwin xz-utils eventually does use the windres compiler, - # which fails to understand -isystem. - # As xz-utils has no need for -isystem here, we can use -I instead. - CPPFLAGS=${CPPFLAGS//-isystem /-I} -fi - -post_pkg_preinst() { - cygwin-post_pkg_preinst -} - -pre_pkg_postinst() { - cygwin-pre_pkg_postinst -} - -post_pkg_prerm() { - cygwin-post_pkg_prerm -} - -cygwin-post_pkg_preinst() { - cygwin-rebase-post_pkg_preinst -} - -cygwin-pre_pkg_postinst() { - cygwin-rebase-pre_pkg_postinst -} - -cygwin-post_pkg_prerm() { - cygwin-rebase-post_pkg_prerm -} - -############################################################################### -# To allow a Windows DLL to reside in memory just once for multiple processes, -# each process needs to be able to map that DLL at the same base address, -# without the need for a dynamic rebase. However, this requires the DLL's -# base address to be unique across all DLLs potentially loaded into a single -# process. Hence the PE/COFF binary format allows to define a preferred base -# address for DLLs, but leaves it up to the package manager to maintain that -# base address to be unique across all DLLs related together. -# (Not sure how exactly ASLR plays in here, though.) -# -# Furthermore, for the Cygwin fork, it is crucial that the child process is -# able to reload a DLL at the very same address as in the parent process. -# Having unique preferred base addresses across all related DLLs does help -# here as well. -# -# The Cygwin rebase utility does maintain some database holding the size and -# preferred base address for each DLL, and allows to update a DLL's preferred -# base address to not conflict with already installed DLLs. -# -# As updating the preferred base address for a DLL in use is a bad idea, we -# need to update the base address while the DLL is in staging directory, and -# update the rebase database after merging the DLL to the live file system. -# -# This allows to define a new preferred base address for a DLL that would -# replace an existing one, because during fork we really want to use the -# old version in the child process, which is verified using the preferred -# base address value to be identical in parent and child process. -# -# Otherwise, the new DLL may have identical size and preferred base address -# as the old DLL, and we may not detect a different DLL in the fork child. -# -# For unmerging a DLL: The Cygwin rebase utility does check if a DLL found -# in the database does still exist, removing that database entry otherwise. -############################################################################### - -cygwin-rebase-get_pendingdir() { - echo "var/db/rebase/pending" -} - -cygwin-rebase-get_mergeddir() { - echo "var/db/rebase/merged" -} - -cygwin-rebase-get_listname() { - echo "dlls_${CATEGORY}_${P}${PR:+-}${PR}" -} - -cygwin-rebase-get_rebase_program() { - [[ ${CHOST} == "${CBUILD}" ]] || return 1 - local pfx - for pfx in "${EPREFIX}" "${BROOT:-${PORTAGE_OVERRIDE_EPREFIX}}" - do - [[ -x ${pfx}/usr/bin/rebase ]] || continue - echo "${pfx}/usr/bin/rebase" - return 0 - done - return 1 -} - -cygwin-rebase-post_pkg_preinst() { - # Ensure database is up to date for when dlls were merged but - # subsequent cygwin-rebase-merge-pending was not executed. - einfo "Cygwin: Merging pending files into rebase database..." - cygwin-rebase-merge pending - eend $? - - local listname=$(cygwin-rebase-get_listname) - local pendingdir=$(cygwin-rebase-get_pendingdir) - local rebase_program=$(cygwin-rebase-get_rebase_program) - - if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]] - then - local mergeddir=$(cygwin-rebase-get_mergeddir) - keepdir "/${pendingdir}" - keepdir "/${mergeddir}" - fi - - einfo "Cygwin: Rebasing new files..." - ( - set -e - cd "${ED}" - - # The list of suffixes is found in the rebaseall script. - find . -type f \ - '(' -name '*.dll' \ - -o -name '*.so' \ - -o -name '*.oct' \ - ')' \ - | sed -e "s|^\.|${EPREFIX}|" > "${T}/rebase-filelist" - [[ "${PIPESTATUS[*]}" == '0 0' ]] - - # Nothing found to rebase in this package. - [[ -s ${T}/rebase-filelist ]] || exit 0 - - mkdir -p "./${pendingdir}" - cp -f "${T}/rebase-filelist" "./${pendingdir}/${listname}" - - # Without the rebase program, do not perform a rebase. - [[ ${rebase_program} ]] || exit 0 - - sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" "./${pendingdir}/${listname}" \ - | "${rebase_program}" --verbose --oblivious --database --filelist=- - [[ "${PIPESTATUS[*]}" == '0 0' ]] - ) - eend $? -} - -cygwin-rebase-pre_pkg_postinst() { - if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]] - then - einfo "Cygwin: Updating rebase database with installed files..." - cygwin-rebase-merge merged - eend $? - fi - einfo "Cygwin: Merging updated files into rebase database..." - cygwin-rebase-merge pending - eend $? -} - -cygwin-rebase-merge() { - local mode=${1} - - local rebase_program=$(cygwin-rebase-get_rebase_program) - [[ ${rebase_program} ]] || return 0 - - local pendingdir='' - local mergeddir='' - case ${mode} in - pending) - pendingdir=$(cygwin-rebase-get_pendingdir) - mergeddir=$(cygwin-rebase-get_mergeddir) - ;; - merged) - pendingdir=$(cygwin-rebase-get_mergeddir) - mergeddir='' - ;; - *) - die "Invalid mode '${mode}'." - ;; - esac - - ( - set -e - cd "${EROOT}" - - [[ -r ./${pendingdir}/. ]] - [[ -r ./${mergeddir}/. ]] - - find ./"${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \ - -exec sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" {} + \ - | "${rebase_program}" --verbose --merge-files --database --filelist=- - [[ "${PIPESTATUS[*]}" == '0 0' ]] - - [[ ${mode} == 'pending' ]] || exit 0 - - find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \ - -exec mv -f -t "./${mergeddir}/" {} + - ) - [[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed." -} - -cygwin-rebase-post_pkg_prerm() { - # The pending list is registered as being installed with the package, but - # the merged list is not. Just remove the unregistered one. - local mergeddir=$(cygwin-rebase-get_mergeddir) - local listname=$(cygwin-rebase-get_listname) - ( - set -e - cd "${EROOT}" - [[ -w ./${mergeddir}/. ]] - rm -f "./${mergeddir}/${listname}" - ) -} diff --git a/profiles/prefix/windows/cygwin/use.force b/profiles/prefix/windows/cygwin/use.force deleted file mode 100644 index e5b3845e4e0f..000000000000 --- a/profiles/prefix/windows/cygwin/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Cygwin's libc -elibc_Cygwin diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask deleted file mode 100644 index 12139b1f5195..000000000000 --- a/profiles/prefix/windows/cygwin/use.mask +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Cygwin's libc --elibc_Cygwin diff --git a/profiles/prefix/windows/cygwin/x64/eapi b/profiles/prefix/windows/cygwin/x64/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/windows/cygwin/x64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/windows/cygwin/x64/make.defaults b/profiles/prefix/windows/cygwin/x64/make.defaults deleted file mode 100644 index 118f797c4e3f..000000000000 --- a/profiles/prefix/windows/cygwin/x64/make.defaults +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ARCH="x64-cygwin" -CHOST="x86_64-pc-cygwin" -ACCEPT_KEYWORDS="~x64-cygwin" - -# We don't have lib64 in prefix so, remove it here. -SYMLINK_LIB="" -LIBDIR_amd64="lib" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="amd64" -DEFAULT_ABI="amd64" -ABI="amd64" -IUSE_IMPLICIT="abi_x86_64" -LIBDIR_amd64="lib" diff --git a/profiles/prefix/windows/cygwin/x64/parent b/profiles/prefix/windows/cygwin/x64/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/windows/cygwin/x64/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/windows/eapi b/profiles/prefix/windows/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/windows/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/windows/package.mask b/profiles/prefix/windows/package.mask deleted file mode 100644 index ddb46a9cba64..000000000000 --- a/profiles/prefix/windows/package.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner <ha...@gentoo.org> (2016-05-19) -# No point for util-linux on Windows -sys-apps/util-linux diff --git a/profiles/prefix/windows/package.use.mask b/profiles/prefix/windows/package.use.mask deleted file mode 100644 index a7308f8b5f20..000000000000 --- a/profiles/prefix/windows/package.use.mask +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner <ha...@gentoo.org> (2019-07-31) -# KERNEL=Winnt needs term-driver, which conflicts with termlib -sys-libs/ncurses tinfo -sys-libs/ncurses-compat tinfo diff --git a/profiles/prefix/windows/parent b/profiles/prefix/windows/parent deleted file mode 100644 index 8f6bb2022d1e..000000000000 --- a/profiles/prefix/windows/parent +++ /dev/null @@ -1,3 +0,0 @@ -../../base -../../arch/base -.. diff --git a/profiles/prefix/windows/use.force b/profiles/prefix/windows/use.force deleted file mode 100644 index 6dfa2704237a..000000000000 --- a/profiles/prefix/windows/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Windows kernel -kernel_Winnt diff --git a/profiles/prefix/windows/use.mask b/profiles/prefix/windows/use.mask deleted file mode 100644 index 2d725b48a334..000000000000 --- a/profiles/prefix/windows/use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Windows kernel --kernel_Winnt - -# linux-exclusive feature -inotify diff --git a/profiles/prefix/windows/winnt/eapi b/profiles/prefix/windows/winnt/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/windows/winnt/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/windows/winnt/make.defaults b/profiles/prefix/windows/winnt/make.defaults deleted file mode 100644 index bd1924d2c0ef..000000000000 --- a/profiles/prefix/windows/winnt/make.defaults +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# System-wide defaults for all Windows profiles -# This file should rarely need to be changed - -# 'Sane' defaults -ELIBC="Winnt" - -FEATURES="nostrip" diff --git a/profiles/prefix/windows/winnt/package.mask b/profiles/prefix/windows/winnt/package.mask deleted file mode 100644 index 0b9c2c933897..000000000000 --- a/profiles/prefix/windows/winnt/package.mask +++ /dev/null @@ -1,2 +0,0 @@ - -# Distributed under the terms of the GNU General Public License v2 diff --git a/profiles/prefix/windows/winnt/package.use.mask b/profiles/prefix/windows/winnt/package.use.mask deleted file mode 100644 index 9a3ad8f5b82c..000000000000 --- a/profiles/prefix/windows/winnt/package.use.mask +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner <ha...@gentoo.org> (2017-10-02) -# requires nasm, which is hard to use via parity atm -dev-libs/openssl asm -dev-libs/openssl-compat asm diff --git a/profiles/prefix/windows/winnt/packages b/profiles/prefix/windows/winnt/packages deleted file mode 100644 index 4e74d788041a..000000000000 --- a/profiles/prefix/windows/winnt/packages +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# those are packages not available/required on winnt, since -# winnt can be a child EPREFIX only, which tears it's DEPENDS -# from a parent (e.g. x64-cygwin) prefix. - --*sys-apps/grep --*app-arch/gzip --*sys-devel/libtool --*virtual/man --*sys-devel/patch --*sys-devel/flex --*sys-apps/gawk --*app-arch/tar --*sys-apps/sed --*sys-devel/bison --*sys-apps/file --*app-arch/bzip2 --*net-misc/rsync --*sys-devel/automake --*virtual/editor --*sys-apps/coreutils --*sys-devel/make --*sys-apps/findutils --*sys-devel/m4 --*net-misc/wget --*sys-apps/which --*virtual/pager --*sys-apps/diffutils --*sys-apps/baselayout-prefix --*app-shells/bash:0 --*virtual/package-manager --*virtual/ssh --*sys-devel/autoconf --*sys-devel/gnuconfig --*sys-devel/gcc diff --git a/profiles/prefix/windows/winnt/parent b/profiles/prefix/windows/winnt/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/windows/winnt/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc deleted file mode 100644 index 3b61ad73d6dc..000000000000 --- a/profiles/prefix/windows/winnt/profile.bashrc +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# On windows, binary files (executables, shared libraries) in use -# cannot be replaced during merge. -# But it is possible to rename them and remove lateron when they are -# not used any more by any running program. -# -# This is a workaround for portage bug#199868, -# and should be dropped once portage does sth. like this itself. -# - -####################################################################### -# -# Unix aware build tools may provide (e.g. pkg-config) and accept -# (e.g. gcc) the -lNAME linker option. While they create libNAME.so -# as the import library, they may be unaware of the additional dll. -# The dllhelper wrappers take care of copying the real dll when -# copying the libNAME.so. -# -# Cygwin and MinGW aware build tools may create the import library -# as libNAME.dll.a or libNAME.dll.lib, and are aware of the dll, -# while a subsequent linker step still receives the -lNAME option. -# -# MSVC aware build tools may provide (e.g. icu-config) and accept -# (e.g. cl.exe) the NAME.lib linker option, maybe with full path, -# and are aware of the dll. -# -# Libtool does accept both the Unix and MSVC variants now, but does -# search for the libNAME(.la|.dll|.so|.a) file upon -lNAME, in order. -# -# As Gentoo ebuilds may remove libNAME.la, we need the libNAME.so -# because we don't want to have libNAME.dll as an import library. -# -# The static library may be created as libNAME.a, libNAME.lib or even -# NAME.lib - the latter we need to check for static or import library. -# -# For whatever import library file we find, make sure there is both the -# NAME.lib and the libNAME.so for dynamic linkability via all the -# -lNAME, the NAME.lib and the libNAME.so linker option. -# -# For whatever static library file we find, make sure there is both the -# libNAME.lib and the libNAME.a for static linkability via all the -# -lNAME, the libNAME.lib and the libNAME.a linker option. -# -####################################################################### - -winnt_setup_dllhelper() { - case ${CATEGORY}/${PN} in - sys-libs/zlib |\ - '') - # When a package build system does not know about Windows at all, - # still it can be built for Windows using Gentoo Parity. - # But as there is another file to install (the real dll), - # and installation is done using cp, we override cp to - # additionally copy the dll when the library is copied. - ebegin "Setting up wrapper to copy the DLL along the LIB" - winnt_setup_dllhelper_cp - eend $? - ;; - esac -} - -post_src_install() { - winnt_post_src_install -} - -winnt_post_src_install() { - cd "${ED}" || return 0 - # - # File names being treated as import library: - # libNAME.so - # NAME.lib if CHOST-dumpbin yields 'DLL name' - # libNAME.dll.lib - # libNAME.dll.a - # - # File names being treated as static library: - # libNAME.lib - # NAME.lib if CHOST-dumpbin lacks 'DLL name' - # libNAME.a - # - # File names being warned about as suspect: - # NAME.so - # NAME.a - # NAME.dll.lib - # NAME.dll.a - # - find . -name '*.so' -o -name '*.lib' -o -name '*.a' | - while read f - do - f=${f#./} - libdir=$(dirname "${f}") - libfile=${f##*/} - libname= - NAMElib= # import lib to create - libNAMEso= # import lib to create - libNAMElib= # static lib to create - libNAMEa= # static lib to create - case ${libfile} in - lib*.so) # found import library - libname=${libfile%.so} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - *.so) ;; # warn - lib*.dll.lib) # found import library - libname=${libfile%.dll.lib} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - *.dll.lib) ;; # warn - *.lib) # found static or import library - ${CHOST}-dumpbin.exe /headers "./${libdir}/${libfile}" | grep -q 'DLL name' - case "${PIPESTATUS[*]}" in - '0 0') # found import library - libname=${libfile%.lib} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - '0 1') # found static library - libname=${libfile%.lib} - libname=${libname#lib} - libNAMEa=lib${libname}.a - libNAMElib=lib${libname}.lib - ;; - *) - die "Cannot run ${CHOST}-dumpbin on ${libdir}/${libfile}" - ;; - esac - ;; - lib*.dll.a) # found import library - libname=${libfile%.dll.a} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - *.dll.a) ;; # warn - lib*.a) # found static library - libname=${libfile%.a} - libname=${libname#lib} - libNAMEa=lib${libname}.a - libNAMElib=lib${libname}.lib - ;; - *.a) ;; # warn - esac - if [[ -z ${libname} ]]; then - ewarn "Ignoring suspect file with library extension: ${f}" - continue - fi - - if [[ ${NAMElib} && ! -e ./${libdir}/${NAMElib} ]]; then - ebegin "creating ${NAMElib} from ${libfile} for MSVC linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${NAMElib}" || die - eend $? - fi - if [[ ${libNAMElib} && ! -e ./${libdir}/${libNAMElib} ]]; then - ebegin "creating ${libNAMElib} from ${libfile} for MSVC linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${libNAMElib}" || die - eend $? - fi - if [[ ${libNAMEso} && ! -e ./${libdir}/${libNAMEso} ]]; then - ebegin "creating ${libNAMEso} from ${f##*/} for POSIX linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${libNAMEso}" || die - eend $? - fi - if [[ ${libNAMEa} && ! -e ./${libdir}/${libNAMEa} ]]; then - ebegin "creating ${libNAMEa} from ${f##*/} for POSIX linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${libNAMEa}" || die - eend $? - fi - done - if [[ -d usr/$(get_libdir) ]] - then - # The native loader does not understand symlinks to dlls, - # seen to be created by dev-libs/icu eventually. For any - # dll we find in usr/lib we need to perform a real copy to - # usr/bin, to resolve potential symlinks (seen from icu), - # and perform the remove from usr/lib afterwards, to not - # break symlinks later on discovered by find. - local toremove=() - local f - while read f - do - [[ -f usr/bin/${f##*/} ]] && continue - ebegin "moving ${f} to usr/bin for the native loader" - dodir usr/bin || die - cp -f "${f}" usr/bin/ || die - eend $? - toremove=( "${toremove[@]}" "${f}" ) - done < <(find usr/$(get_libdir) -maxdepth 1 -name '*.dll') - if [[ ${#toremove[@]} -gt 0 ]] - then - rm -f "${toremove[@]}" || die "removing dlls from usr/$(get_libdir) failed" - fi - fi -} - -winnt_setup_dllhelper_cp() { - if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]] - then - mkdir -p "${T}/dllhelper" - cat > "${T}/dllhelper/cp" <<'EOCP' -#!/usr/bin/env bash - -mysrcs=() -myopts=() -mydest= -force_dest_file_opt= - -nextargs=( "$@" ) - -while [[ $# -gt 0 ]] -do - arg=${1} - shift - case ${arg} in - --) - mysrcs+=( "${@}" ) - break - ;; - -S) - myopts+=( "${arg}" ${1+"$1"} ) - ${1:+shift} - ;; - -t) - mydest="${1-}" - ${1:+shift} - ;; - -T) - force_dest_file_opt=${arg} - ;; - -*) - myopts+=( "${arg}" ) - ;; - *) - mysrcs+=( "${arg}" ) - ;; - esac -done - -me=${0##*/} -nextPATH= -oIFS=$IFS -IFS=: -for p in ${PATH} -do - [[ ${p}/${me} -ef ${0} ]] && continue - nextPATH+=${nextPATH:+:}${p} -done -IFS=${oIFS} - -PATH=${nextPATH} - -${me} "${nextargs[@]}" -ret=$? -[[ ${ret} == 0 ]] || exit ${ret} - -if [[ -z ${mydest} ]] -then - [[ ${#mysrcs[@]} -lt 2 ]] && exit 0 - : "${mysrcs[@]}" "${#mysrcs[@]}" - mydest=${mysrcs[${#mysrcs[@]}-1]} - unset mysrcs[${#mysrcs[@]}-1] -elif [[ ${#mysrcs[@]} == 0 ]] -then - exit 0 -fi - -for src in ${mysrcs[@]} -do - ret=0 - [[ ${src##*/} != lib*.so* ]] && continue - for ext in dll pdb - do - [[ ${src##*/} == *.${ext} ]] && continue - [[ -f ${src} && -f ${src}.${ext} ]] || continue - if [[ -d ${mydest} && ! -n ${force_dest_file_opt} ]] - then - # When copying to directory we keep the basename. - ${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}/${src##*/}.${ext}" - ret=$? - elif [[ ${mydest##*/} == ${src##*/} ]] - then - # Copy the dll only when we keep the basename. - ${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}.${ext}" - ret=$? - fi - [[ ${ret} == 0 ]] || exit ${ret} - done -done - -exit 0 -EOCP - chmod +x "${T}/dllhelper/cp" - PATH="${T}/dllhelper:${PATH}" - fi -} - -if [[ ${EBUILD_PHASE} == 'setup' ]] -then - winnt_setup_dllhelper -fi diff --git a/profiles/prefix/windows/winnt/use.force b/profiles/prefix/windows/winnt/use.force deleted file mode 100644 index 4dbfdde651d7..000000000000 --- a/profiles/prefix/windows/winnt/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Winnt libc -elibc_Winnt diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask deleted file mode 100644 index 5466fd4b5e09..000000000000 --- a/profiles/prefix/windows/winnt/use.mask +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Winnt libc --elibc_Winnt - -# CURL_SSL=winssl is allowd on Winnt libc --curl_ssl_winssl - -# these will more than likely never work on Windows -3dfx -acpi -alsa -apm -bluetooth -caps -cdr -coreaudio -dga -djbfft -dri -dvdr -# emacs USE flag is masked because of missing implementation for unexec() -emacs -fbcon -ggi -glut -gpm -gps -hardened -hddtemp -ibm -ieee1394 -ipod -ipv6 -lm-sensors -ncurses -opengl -oss -pcmcia -pda -rtc -selinux -scanner -smartcard -svga -unicode -usb -v4l -wifi - -# these are USE flags that don't _currently_ work, but may will in the future. -ffmpeg -fftw -flac -jack -joystick -ladspa -# opennmp is not working yet on interix -openmp -portaudio -pulseaudio -readline -# libtiff only static, so avoid the tiff USE flag! -tiff -timidity diff --git a/profiles/prefix/windows/winnt/x64/eapi b/profiles/prefix/windows/winnt/x64/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/windows/winnt/x64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/windows/winnt/x64/make.defaults b/profiles/prefix/windows/winnt/x64/make.defaults deleted file mode 100644 index 1200225e1069..000000000000 --- a/profiles/prefix/windows/winnt/x64/make.defaults +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This profile is designed for use as Stacked Prefix, set up using -# prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin -# Prefix (Guest only), having sys-devel/parity installed (wraps MSVC). -# -# CHOST is left unset on purpose. It is set by prefix-stack-setup -# using some --chost=x86_64-msvc16-winnt argument, selecting the -# Visual Studio version and runtime variant (static|debug) to use. -# -# Sample CHOST values for the runtime variant using x64 Visual Studio 2019, -# as provided by parity-2.0.0 (multithreaded only): -# x86_64-msvc16-winnt dynamic runtime (cl.exe /MD for MSVCRT.DLL) -# x86_64-msvcd16-winnt dynamic debug runtime (cl.exe /MDd for MSVCRTD.DLL) -# x86_64-libcmt16-winnt static runtime (cl.exe /MT for LIBCMT.LIB) -# x86_64-libcmtd16-winnt static debug runtime (cl.exe /MTd for LIBCMTD.LIB) -# - -ARCH="x64-winnt" -ACCEPT_KEYWORDS="~x64-winnt" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="amd64" -DEFAULT_ABI="amd64" -ABI="amd64" -IUSE_IMPLICIT="abi_x86_64" -LIBDIR_amd64="lib" diff --git a/profiles/prefix/windows/winnt/x64/parent b/profiles/prefix/windows/winnt/x64/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/windows/winnt/x64/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/prefix/windows/winnt/x86/eapi b/profiles/prefix/windows/winnt/x86/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/windows/winnt/x86/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/windows/winnt/x86/make.defaults b/profiles/prefix/windows/winnt/x86/make.defaults deleted file mode 100644 index 223c275acc77..000000000000 --- a/profiles/prefix/windows/winnt/x86/make.defaults +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This profile is designed for use as Stacked Prefix, set up using -# prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin -# Prefix (Guest only), having sys-devel/parity installed (wraps MSVC). -# -# CHOST is left unset on purpose. It is set by prefix-stack-setup -# using some --chost=i686-msvc16-winnt argument, selecting the -# Visual Studio version and runtime variant (static|debug) to use. -# -# Sample CHOST values for the runtime variant using x86 Visual Studio 2019, -# as provided by parity-2.0.0 (multithreaded only): -# i686-msvc16-winnt dynamic runtime (cl.exe /MD for MSVCRT.DLL) -# i686-msvcd16-winnt dynamic debug runtime (cl.exe /MDd for MSVCRTD.DLL) -# i686-libcmt16-winnt static runtime (cl.exe /MT for LIBCMT.LIB) -# i686-libcmtd16-winnt static debug runtime (cl.exe /MTd for LIBCMTD.LIB) -# - -ARCH="x86-winnt" -ACCEPT_KEYWORDS="~x86-winnt" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="x86" -DEFAULT_ABI="x86" -ABI="x86" -IUSE_IMPLICIT="abi_x86_32" -LIBDIR_x86="lib" diff --git a/profiles/prefix/windows/winnt/x86/parent b/profiles/prefix/windows/winnt/x86/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/prefix/windows/winnt/x86/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 70f5ae6795f4..8b0d598560b9 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -408,13 +408,6 @@ arm64-macos prefix/darwin/macos/13.0/arm64/gcc exp # Solaris Profiles x64-solaris prefix/sunos/solaris/5.11/x64 exp -# Windows Profiles -x86-winnt prefix/windows/winnt/x86 exp -x64-winnt prefix/windows/winnt/x64 exp - -# Cygwin Profiles -x64-cygwin prefix/windows/cygwin/x64 exp - # vim: set ts=8 noet ft=conf: # Local Variables:
