diff options
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/Manifest.gz | bin | 182093 -> 182100 bytes | |||
| -rw-r--r-- | profiles/features/prefix/standalone/profile.bashrc | 35 | ||||
| -rw-r--r-- | profiles/use.local.desc | 4 |
3 files changed, 2 insertions, 37 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz Binary files differindex a7f30b4375d1..98e28b83302b 100644 --- a/profiles/Manifest.gz +++ b/profiles/Manifest.gz diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc index fd95e43f7f30..d46933210dcc 100644 --- a/profiles/features/prefix/standalone/profile.bashrc +++ b/profiles/features/prefix/standalone/profile.bashrc @@ -1,5 +1,5 @@ # -*- mode: shell-script; -*- -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # RAP specific patches pending upstream: @@ -9,38 +9,7 @@ # Disable RAP trick during bootstrap stage2 [[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0 -if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; then - cd "${S}" - einfo "Prefixifying dynamic linkers..." - for h in gcc/config/*/*linux*.h; do - ebegin " Updating $h" - if [[ "${h}" == gcc/config/rs6000/linux*.h ]]; then - sed -i -r "s,(DYNAMIC_LINKER_PREFIX\s+)\"\",\1\"${EPREFIX}\",g" $h - else - sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h - fi - eend $? - done - - # use sysroot of toolchain to get correct include and library at compile time - EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}" - - ebegin "remove --sysroot call on ld for native toolchain" - sed -i 's/--sysroot=%R//' gcc/gcc.c* - eend $? -elif [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]]; then - ebegin "Use ${EPREFIX} as default sysroot" - sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt - eend $? - pushd "${S}/lib/Driver/ToolChains" >/dev/null - ebegin "Use dynamic linker from ${EPREFIX}" - sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp - eend $? - ebegin "Remove --sysroot call on ld for native toolchain" - sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp - eend $? - popd >/dev/null -elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then +if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then ebegin "Prefixifying native library path" sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \ "${S}"/ld/configure.tgt diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 81b63e3081d8..55ecb1bf0c9c 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -7102,11 +7102,7 @@ sci-electronics/splat:hires - Builds additional high resolution application 'rfs sci-geosciences/gmt:gdal - Enable sci-libs/gdal library support sci-geosciences/gmt:geos - Enable sci-libs/geos library support sci-geosciences/gmt:gmttria - Non GNU triangulation method, more efficient -sci-geosciences/gmt:gshhg - Install coastline database sci-geosciences/gmt:htmldoc - Install html documentation -sci-geosciences/gmt:metric - Use SI (cm) units instead of US (inches) ones -sci-geosciences/gmt:mex - Enable compilation of mex supplement which requires Octave/Matlab -sci-geosciences/gmt:octave - Enable octave support sci-geosciences/gmt:pcre2 - Use dev-libs/libpcre2 for regular expressions sci-geosciences/gmt:tutorial - Install data files for tutorial sci-geosciences/gpsd:dbus - export gpsd data over dbus connections |