From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0BC4B13829C for ; Mon, 13 Jun 2016 22:55:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5DB1E0935; Mon, 13 Jun 2016 22:55:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 314E6E0935 for ; Mon, 13 Jun 2016 22:55:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC22A33FEDE for ; Mon, 13 Jun 2016 22:55:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02AF7963 for ; Mon, 13 Jun 2016 22:55:32 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1465857816.5af5d12f3e56f9f2ff232d124d27c856fd66f551.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: mk/ X-VCS-Repository: proj/openrc X-VCS-Files: mk/os-prefix.mk mk/os.mk mk/sys.mk X-VCS-Directories: mk/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 5af5d12f3e56f9f2ff232d124d27c856fd66f551 X-VCS-Branch: master Date: Mon, 13 Jun 2016 22:55:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 70fb54a2-b0df-48ff-8374-2dda154ffb9f X-Archives-Hash: bbfac40fd04514f6a6d7f4da96b45d1d commit: 5af5d12f3e56f9f2ff232d124d27c856fd66f551 Author: Benda Xu gentoo org> AuthorDate: Mon Jun 13 22:43:36 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Jun 13 22:43:36 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5af5d12f Fix PATH for Prefix. 1. remove default /bin:/sbin:/usr/bin:/usr/sbin 2. PKG_PREFIX should be defaulted to $(PREFIX)/usr 3. LOCAL_PREFIX should be defaulted to $(PREFIX)/usr/local X-Gentoo-Bug:583634 X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=583634 mk/os-prefix.mk | 2 ++ mk/os.mk | 2 +- mk/sys.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mk/os-prefix.mk b/mk/os-prefix.mk index c546a86..af08c99 100644 --- a/mk/os-prefix.mk +++ b/mk/os-prefix.mk @@ -3,4 +3,6 @@ ifeq (${MKPREFIX},yes) CPPFLAGS+= -DPREFIX +PKG_PREFIX?= $(PREFIX)/usr +SED_EXTRA= -e '/_PATH=.*usr.bin/d' endif diff --git a/mk/os.mk b/mk/os.mk index 20b4382..bac0388 100644 --- a/mk/os.mk +++ b/mk/os.mk @@ -13,7 +13,7 @@ _OS_SH= uname -s | tr '/' '-' _OS:= $(shell ${_OS_SH}) OS?= ${_OS} -include ${MK}/os-${OS}.mk include ${MK}/os-prefix.mk +include ${MK}/os-${OS}.mk RC_LIB= /$(LIBNAME)/rc diff --git a/mk/sys.mk b/mk/sys.mk index 76f0b78..948ec1d 100644 --- a/mk/sys.mk +++ b/mk/sys.mk @@ -26,7 +26,7 @@ ifeq (${MKPREFIX},yes) UPREFIX= ${PREFIX}/usr endif endif -LOCAL_PREFIX= /usr/local +LOCAL_PREFIX= $(UPREFIX)/local PICFLAG?= -fPIC