summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuta Satoh <nigoro.dev@gmail.com>2016-12-07 20:01:55 +0900
committerMichał Górny <mgorny@gentoo.org>2016-12-15 13:11:22 +0100
commitd21141eec6d5f2d0645e17b77f94ed4224ee604b (patch)
treed81963b40e62819603ef76bbe6a37cdc08ca4058
parentdev-python/docker-py: Version bump to 2.0.0 (diff)
downloadgentoo-d21141eec6d5f2d0645e17b77f94ed4224ee604b.tar.gz
gentoo-d21141eec6d5f2d0645e17b77f94ed4224ee604b.tar.bz2
gentoo-d21141eec6d5f2d0645e17b77f94ed4224ee604b.zip
eclass/freebsd.eclass: Changed to apply upstream patch on WORKDIR
-rw-r--r--eclass/freebsd.eclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 8f6b204f1f30..774147007336 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
}