As explained in the title. Here's a patch that would fix this: --- eltpatch.bak 2017-08-25 21:18:36.611098000 +0800 +++ eltpatch 2017-08-25 21:38:42.175824000 +0800 @@ -4,6 +4,18 @@ source "/lib/gentoo/functions.sh" || exit 1 +if [[ -e /usr/bin/gfind ]] ; then + FIND=gfind +else + FIND=find +fi + +if [[ -e /usr/bin/gpatch ]] ; then + PATCH=gpatch +else + PATCH=patch +fi + die() { eerror "${@}" exit 1 @@ -34,11 +46,11 @@ # Save file for permission restoration. `patch` sometimes resets things. # Ideally we'd want 'stat -c %a', but stat is highly non portable and we are # guaranted to have GNU find, so use that instead. - local perms="$(find ${file} -maxdepth 0 -printf '%m')" + local perms="$($FIND ${file} -maxdepth 0 -printf '%m')" # We only support patchlevel of 0 - why worry if its static patches? - if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then + if $PATCH -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then einfo " Applying ${disp} ..." - patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1 + $PATCH -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1 ret=$? ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}" else @@ -86,7 +98,7 @@ pushd "/usr/share/elt-patches" >/dev/null || die "pushd to elt-patch dir failed" # Go through the patches in reverse order (newer version to older) - for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do + for patch in $($FIND "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do tmp="${TMPDIR}/libtool-elt.patch" sed "${sed_args[@]}" "${patch}" > "${tmp}" || die "sed on patch ${patch} failed" if ELT_try_and_apply_patch "${file}" "${tmp}" "${patch}" ; then @@ -186,7 +198,7 @@ [[ -f ${S}/ltmain.sh || -f ${S}/configure ]] && dirs+=( "${S}" ) else [[ ${#dirs[@]} -eq 0 ]] && dirs+=( "${S}" ) - dirs=( $(find "${dirs[@]}" '(' -name ltmain.sh -o -name configure ')' -printf '%h\n' | sort -u) ) + dirs=( $($FIND "${dirs[@]}" '(' -name ltmain.sh -o -name configure ')' -printf '%h\n' | sort -u) ) fi local d p ret
Doesn't Portage provide wrappers for patch & find?
Portage provides only BSD wrapper for sed (bin/ebuild-helpers/bsd/sed). profiles/default/bsd/fbsd/profile.bashrc sets these aliases: type -P gmake > /dev/null && alias make=gmake type -P gpatch > /dev/null && alias patch=gpatch type -P gsed > /dev/null && alias sed=gsed type -P gawk > /dev/null && alias awk=gawk type -P gfind > /dev/null && alias find=gfind type -P gxargs > /dev/null && alias xargs=gxargs Aliases are not exported to subprocesses (which explains why elt-patches handling code was working when it was in eclass).
Created attachment 490530 [details, diff] 0001-Prefer-GNU-tools-on-BSD-systems.patch Could you try the attached patch instead?
@mgorny seems like it doesn't. Eltpatch still calls BSD find. Related output from `emerge -av1 sys-devel/gcc`: * Running elibtoolize in: gcc-6.4.0/ find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator * Applying portage/2.2 patch ... chmod: invalid file mode: find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator chmod: invalid file mode: find: -printf: unknown primary or operator * Applying portage/1.2.0 patch ... chmod: invalid file mode:
That's weird. Could you add 'set -x' above the 'type -P ...' calls added and paste or attach the resulting trace?
Created attachment 490538 [details, diff] 0001-Prefer-GNU-tools-on-BSD-systems.patch [v2] Please disregard my previous request, and try this patch instead. I've been pointed out the obvious mistake I did.
That works. Yet I think add ebuild helpers for all the affected tools works better as I've encountered various packages complaining about malfunctioning find / m4 / tar etc.. Copying the sed helper as those affected tools seems to work.
commit c266e5323bf08c47f09df7eee0e986ba62063022 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: Sat Aug 26 09:18:00 2017 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: Sat Aug 26 09:18:00 2017 app-portage/elt-patches: Remove fbsd keywords from broken versions commit 6df30110505cedaa7f456c6d4cdb7d259d025e2f Author: Michał Górny <mgorny@gentoo.org> AuthorDate: Sat Aug 26 09:14:41 2017 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: Sat Aug 26 09:16:58 2017 app-portage/elt-patches: Bump to fix FreeBSD tools, #628882 As for generic Portage helpers, there are two problems: 1. It would continue being broken until all people upgrade Portage. 2. I'm not sure if we don't have a valid use cases for using native tools, e.g. for building pure-BSD stuff. Having wrappers so that people have to work around them is not a good idea.
(however, feel file to file a Portage bug for it if you think it's useful)
Basically many packages here silently fail with the BSD find with something like unknown command for -print yet still builds, and I'm wondering if there are issues with these packages functioning normally.
Created attachment 490650 [details] build.log with set -x set -x is added to the beginning of /usr/bin/eltpatch.
@mgorny i'm terribly sorry, but seems like the latest version still doesn't work (didn't know why it worked at that time) The build.log with set -x is provided above.
Created attachment 490654 [details, diff] 0001-Use-explicit-tool-vars-instead-of-aliases.patch Ok, please try applying this patch on top of the new release. If possible, please also take a second look if I didn't miss any occurrence.
The patch was rejected. eltpatch.in.rej: --- eltpatch.in +++ eltpatch.in @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 # BSD support; https://bugs.gentoo.org/628882 -# note: this need to happen before function definitions -type -P gfind &>/dev/null && alias find=gfind -type -P gpatch &>/dev/null && alias patch=gpatch -type -P gsed &>/dev/null && alias sed=gsed +type -P gfind &>/dev/null && FIND=gfind || FIND=find +type -P gpatch &>/dev/null && PATCH=gpatch || PATCH=patch +type -P gsed &>/dev/null && SED=gsed || SED=sed source "@ELT_gentoofuncs@" || exit 1
My fault. It works.
commit 88719fa07f682d58834aad94b567fd76b3e87736 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: Sat Aug 26 13:49:35 2017 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: Sat Aug 26 15:36:57 2017 app-portage/elt-patches: Another FreeBSD tool fix bump, #628882
