diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /app-portage/prefix-toolkit | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'app-portage/prefix-toolkit')
| -rw-r--r-- | app-portage/prefix-toolkit/Manifest | 2 | ||||
| -rw-r--r-- | app-portage/prefix-toolkit/prefix-toolkit-5.ebuild (renamed from app-portage/prefix-toolkit/prefix-toolkit-3.ebuild) | 26 |
2 files changed, 23 insertions, 5 deletions
diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest index 677af425da8f..d23dc40d946a 100644 --- a/app-portage/prefix-toolkit/Manifest +++ b/app-portage/prefix-toolkit/Manifest @@ -1,3 +1,3 @@ -EBUILD prefix-toolkit-3.ebuild 18363 BLAKE2B a5a805882f0e654dab5da79ba18940949591272e6ae5f81d11d6ba751faac22a8c39230aecf40df315731e696e86ff5a3861c8ff8aa3302db95ba507b5d85d9b SHA512 6053e11f3c5bb8aaee05da82efa6c78019f32872188da3a0cf6fab1585923241e108f089a7084feaded48827f60397b7d10af8471329d62a75fcfbdae4f19350 EBUILD prefix-toolkit-4.ebuild 18547 BLAKE2B 927a0ba2788c00a605f7ecc826b28b4889c1f2317278eb9dff37c62d3e25526fc2d617cc50e61da2e65d9ac7b2aa7170eb126084f33762cf337377f0e766372d SHA512 c4ed8da3e01565350d67c4eafeebd9cb72a17d1a1e9588bf95b8eb6f7326196a7be2ffbdd222510bd1f132ad4302ad1104cea2cdcceda7589246856685c1b429 +EBUILD prefix-toolkit-5.ebuild 19280 BLAKE2B f74ccb86f632f61da0fabf5f5ce0c82b1ac911aac3d066815da31f98e41ba31d76218eba28dc743ec66a1d260ea58ba96084f799262ffe699f0c9f5545e28747 SHA512 3c0fd65d10e911a6810b6a3e21678e89d684cf198f8076dea251d8395fac73f1a926b22602f395bc777810ebb37db534129dc7fd80eb782baf1f6c518d73d5e5 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9 diff --git a/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild index e4719f87c3a9..62f94528cc11 100644 --- a/app-portage/prefix-toolkit/prefix-toolkit-3.ebuild +++ b/app-portage/prefix-toolkit/prefix-toolkit-5.ebuild @@ -239,6 +239,15 @@ RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL" [[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK" # if we're on some X terminal, makes sense to inherit that too [[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY" +if [[ -d /proc/registry ]]; then # we're on Cygwin + # crucial to Windows but cannot be restored, see + # https://cygwin.com/ml/cygwin/2019-08/msg00072.html + [[ -n ${SYSTEMDRIVE} ]] && RETAIN+=" SYSTEMDRIVE=$SYSTEMDRIVE" + # COMSPEC is to native Windows what SHELL is to *nix + [[ -n ${COMSPEC} ]] && RETAIN+=" COMSPEC=$COMSPEC" + # some Windows programs (e.g. devenv.exe) need TMP or TEMP + [[ -n ${TEMP} ]] && RETAIN+=" TEMP=$TEMP" +fi # do it! if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then '@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l @@ -412,6 +421,7 @@ eend_exit() { ebegin "creating directory structure" ( set -e + mkdir -p "${CHILD_EPREFIX}"/var/tmp/portage mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force mkdir -p "${CHILD_EPREFIX}"/etc/portage/env @@ -427,11 +437,11 @@ ebegin "creating make.conf" ( set -e echo "#" - echo "# The following values where taken from the parent prefix's" - echo "# environment. Feel free to adopt them as you like." + echo "# These are sane default compiler flags, feel free to adopt them as you like." + echo "# Extending the flags is done to respect flags probably set by some profile." echo "#" - echo "CFLAGS=\"$(portageq envvar CFLAGS)\"" - echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\"" + echo "CFLAGS=\"\${CFLAGS} -O2 -pipe\"" + echo "CXXFLAGS=\"${CXXFLAGS} -O2 -pipe\"" echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\"" niceness=$(portageq envvar PORTAGE_NICENESS || true) [[ -n ${niceness} ]] && @@ -445,6 +455,10 @@ ebegin "creating make.conf" echo "EPREFIX=\"${CHILD_EPREFIX}\"" echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\"" echo "BROOT=\"${PARENT_EPREFIX}\"" + echo "PORTAGE_TMPDIR=\"\${EPREFIX}/var/tmp\"" + # Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6. + # We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only. + echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\"" if [[ -n ${CHILD_CHOST} ]] ; then echo "CHOST=\"${CHILD_CHOST}\"" fi @@ -463,6 +477,10 @@ ebegin "creating env/host-cc.conf" cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM CC=${PARENT_CHOST}-gcc CXX=${PARENT_CHOST}-g++ + # Inherited compiler flags from parent prefix, + # as the child prefix may have a different compiler. + CFLAGS="$(portageq envvar CFLAGS)" + CXXFLAGS="$(portageq envvar CXXFLAGS)" EOM eend_exit $? |