From: Michał Górny Date: Sun, 22 Feb 2015 14:16:03 +0000 (+0000) Subject: Fix support for FreeBSD 10.0. Force /usr/share/mk there, and fix version comparison... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80deb9558416d3477d378b72cb14724920b0cd3a;p=gentoo.git Fix support for FreeBSD 10.0. Force /usr/share/mk there, and fix version comparison for install commands. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/36 by nigoro. --- diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 7254282b3cec..db4318c854f1 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1548 2015/02/21 13:51:34 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1549 2015/02/22 14:16:03 mgorny Exp $ + + 22 Feb 2015; Michał Górny freebsd.eclass: + Fix support for FreeBSD 10.0. Force /usr/share/mk there, and fix version + comparison for install commands. + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/36 by nigoro. 21 Feb 2015; Michael Palimaka kde4-base.eclass: Add new and remove old SRC_URI. Update live ebuild branching. diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index f293e4b4ef98..d708b4b266fd 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.35 2013/08/28 15:56:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.36 2015/02/22 14:16:03 mgorny Exp $ # # Diego Pettenò @@ -129,6 +129,12 @@ freebsd_rename_libraries() { freebsd_src_unpack() { if [[ ${MY_PV} == *9999* ]]; then S="${WORKDIR}" subversion_src_unpack + + # When share/mk exists in ${WORKDIR}, it is used on FreeBSD 10.0 + # Removed "${WORKDIR}"/share/mk/*.mk, use to force /usr/share/mk. + if [[ ${PN} != freebsd-mk-defs ]] ; then + [[ -e "${WORKDIR}"/share/mk ]] && rm -rf "${WORKDIR}"/share/mk/*.mk + fi else unpack ${A} fi @@ -141,7 +147,7 @@ freebsd_src_unpack() { # Starting from FreeBSD 9.2, its install command supports the -l option and # they now use it. Emulate it if we are on a system that does not have it. - if [[ ${RV} > 9.1 ]] && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then + if version_is_at_least 9.2 ${RV} && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then export INSTALL_LINK="ln -f" export INSTALL_SYMLINK="ln -fs" fi