[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     d21141eec6d5f2d0645e17b77f94ed4224ee604b
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Wed Dec  7 11:01:55 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 12:11:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21141ee

eclass/freebsd.eclass: Changed to apply upstream patch on WORKDIR

 eclass/freebsd.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8f6b204..7741470 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -141,7 +141,13 @@ freebsd_do_patches() {
                        epatch "${x}"
                done
        fi
-       [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] && epatch 
$(freebsd_upstream_patches -s)
+
+       # Upstream patches need to be applied on WORKDIR.
+       if [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] ; then
+               cd "${WORKDIR}" || die
+               epatch $(freebsd_upstream_patches -s)
+               cd "${S}" || die
+       fi
        epatch_user
 }