Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: /, mk/
Date: Fri, 31 Aug 2012 15:53:55
Message-Id: 1346427647.9e88d73aaaba93d716ecd49767dfcdf3ffdbff30.WilliamH@OpenRC
1 commit: 9e88d73aaaba93d716ecd49767dfcdf3ffdbff30
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Fri Aug 31 14:22:12 2012 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 31 15:40:47 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9e88d73a
7
8 add MKPREFIX flag to build system
9
10 This allows building OpenRC for a Gentoo Prefix installation.
11
12 ---
13 README | 3 +++
14 mk/os-prefix.mk | 6 ++++++
15 mk/os.mk | 1 +
16 3 files changed, 10 insertions(+), 0 deletions(-)
17
18 diff --git a/README b/README
19 index 8244b04..2740f54 100644
20 --- a/README
21 +++ b/README
22 @@ -12,6 +12,7 @@ LIBNAME=lib64
23 DESTDIR=/tmp/openrc-image
24 MKNET=oldnet
25 MKPAM=pam
26 +MKPREFIX=yes
27 MKPKGCONFIG=no
28 MKSELINUX=yes
29 MKSTATICLIBS=no
30 @@ -25,6 +26,8 @@ We don't support building a static OpenRC with PAM.
31 You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
32 If you debug memory under valgrind, add -DDEBUG_MEMORY to your CPPFLAGS
33 so that all malloc memory should be freed at exit.
34 +If you are building OpenRC for a Gentoo Prefix installation, add
35 +MKPREFIX=yes.
36
37 You can also brand OpenRC if you so wish like so
38 BRANDING=\"Gentoo/$(uname -s)\"
39
40 diff --git a/mk/os-prefix.mk b/mk/os-prefix.mk
41 new file mode 100644
42 index 0000000..94fda96
43 --- /dev/null
44 +++ b/mk/os-prefix.mk
45 @@ -0,0 +1,6 @@
46 +# Copyright (c) 2012 William Hubbs <w.d.hubbs@×××××.com>
47 +# Released under the 2-clause BSD license.
48 +
49 +ifeq (${MKPREFIX},yes}
50 +CPPFLAGS+= -DPREFIX
51 +endif
52
53 diff --git a/mk/os.mk b/mk/os.mk
54 index c306f05..3e18962 100644
55 --- a/mk/os.mk
56 +++ b/mk/os.mk
57 @@ -7,5 +7,6 @@ _OS_SH= uname -s
58 _OS:= $(shell ${_OS_SH})
59 OS?= ${_OS}
60 include ${MK}/os-${OS}.mk
61 +include ${MK}/os-prefix.mk
62
63 RC_LIB= /$(LIBNAME)/rc