diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2017-10-12 14:30:37 +0100 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2017-10-12 14:30:37 +0100 |
| commit | b5236c6cea1d1ca764a67a7569e1afb3c7e92dca (patch) | |
| tree | 6cada6e0e19a19fadd4d30ebb64cf0416b423943 /local/etc/portage | |
| parent | Add sys-devel/gdb-8.0.1 (diff) | |
| download | srcshelton-b5236c6cea1d1ca764a67a7569e1afb3c7e92dca.tar.gz srcshelton-b5236c6cea1d1ca764a67a7569e1afb3c7e92dca.tar.bz2 srcshelton-b5236c6cea1d1ca764a67a7569e1afb3c7e92dca.zip | |
Update file local/etc/portage/bashrc to handle vasnprintf() code in 'gnulib' directories as well as in 'lib'
Diffstat (limited to 'local/etc/portage')
| -rw-r--r-- | local/etc/portage/bashrc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/local/etc/portage/bashrc b/local/etc/portage/bashrc index 1005abba..c9bdb255 100644 --- a/local/etc/portage/bashrc +++ b/local/etc/portage/bashrc @@ -36,7 +36,7 @@ darwin_epatch_vasnprintf() { if [[ "${PWD}" =~ /(dev-util/pkgconfig|dev-vcs/cvs)- ]]; then einfo "Skipping vasnprintf() patching for specifically patched package ${CATEGORY}/${PN}" - elif type -pf patch >/dev/null 2>&1 && [[ -r "${EPREFIX:-}"/etc/portage/patches/all/vasnprintf.patch ]]; then + elif type -pf patch >/dev/null 2>&1 && [[ -r "${EPREFIX:-}"/etc/portage/patches/All/vasnprintf.patch ]]; then ebegin "Checking source for 'vasnprintf()' source" local d f @@ -45,13 +45,13 @@ darwin_epatch_vasnprintf() { eend 1 "vasnprintf source found" ewarn "Found vasnprintf.c in directory '$( readlink -e "${d}" 2>/dev/null || echo "${d}" )'" if pushd "${d}" >/dev/null 2>&1; then - if patch -stNp2 --dry-run -i "${EPREFIX:-}"/etc/portage/patches/all/vasnprintf.patch; then + if patch -stNp2 --dry-run -i "${EPREFIX:-}"/etc/portage/patches/All/vasnprintf.patch; then ebegin "Applying 'vasnprintf()' patch for macOS High Sierra" - patch -stNp2 --backup-if-mismatch -i "${EPREFIX:-}"/etc/portage/patches/all/vasnprintf.patch + patch -stNp2 --backup-if-mismatch -i "${EPREFIX:-}"/etc/portage/patches/All/vasnprintf.patch eend ${?} "'vasnprintf()' patch failed to apply in directory '$( pwd )'" # && #echo "${CATEGORY}/${PVR} patched" >> "${EPREFIX:-}"/etc/portage/patches/vasnprintf.log else - eerror "'vasnprintf()' patch for macOS High Sierra at '${EPREFIX:-}/etc/portage/patches/all/vasnprintf.patch' is not compatible with code in directory '$( pwd )'" + eerror "'vasnprintf()' patch for macOS High Sierra at '${EPREFIX:-}/etc/portage/patches/All/vasnprintf.patch' is not compatible with code in directory '$( pwd )'" #echo "${CATEGORY}/${PVR} incompatible" >> "${EPREFIX:-}"/etc/portage/patches/vasnprintf.log fi popd >/dev/null 2>&1 || die "Could not store original directory" @@ -61,7 +61,7 @@ darwin_epatch_vasnprintf() { else eend 0 "No instance of 'vasnprintf.c' found" fi - done < <( find . -type d -name lib -print ) + done < <( find . -type d -name lib -or -name gnulib -print ) else eerror "Cannot find pre-requisites required to patch 'vasnprintf()' source for macOS High Sierra" fi |