Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 28 Feb 2016 13:47:52
Message-Id: 1456667249.b363df64dffcea268d5f917899a75eef8ecc4b6f.aballier@gentoo
1 commit: b363df64dffcea268d5f917899a75eef8ecc4b6f
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 13:47:29 2016 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 13:47:29 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b363df64
7
8 eclass/portability.eclass: Make get_bmake return "bmake" on linux instead of "pmake".
9
10 pmake was the debian port of bmake. bmake works fine, pmake cannot be used to cross-build freebsd-lib 10 for example. pmake has been deprecated and replaced by bmake in debian since jessie (current stable), pmake is only present in wheezy (oldstable)
11
12 eclass/portability.eclass | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/eclass/portability.eclass b/eclass/portability.eclass
16 index 2e4e01d..02c7c73 100644
17 --- a/eclass/portability.eclass
18 +++ b/eclass/portability.eclass
19 @@ -98,7 +98,7 @@ dlopen_lib() {
20 # @USAGE:
21 # @RETURN: system version of make
22 # @DESCRIPTION:
23 -# Gets the name of the BSD-ish make command (pmake from NetBSD)
24 +# Gets the name of the BSD-ish make command (bmake from NetBSD)
25 #
26 # This will return make (provided by system packages) for BSD userlands,
27 # or bsdmake for Darwin userlands and pmake for the rest of userlands,
28 @@ -112,7 +112,7 @@ get_bmake() {
29 elif [[ ${USERLAND} == "Darwin" ]]; then
30 echo bsdmake
31 else
32 - echo pmake
33 + echo bmake
34 fi
35 }