[gentoo-commits] proj/openrc:master commit in: mk/

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     aaaea44d224016bccfd008d0b904961f788d8189
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 20:57:10 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 04:26:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=aaaea44d

use make conditional for -cstd flag

cc.mk was using ashell call to determine the value of the cstd variable.
This reworks that code so it uses a make conditional.

---
 mk/cc.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/cc.mk b/mk/cc.mk
index 74a816e..06556f0 100644
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -5,9 +5,9 @@ CFLAGS?=	-O2
 
 # Default to using the C99 standard
 CSTD?=		c99
-_CSTD_SH=	if test -n "${CSTD}"; then echo "-std=${CSTD}"; else echo ""; fi
-_CSTD:=		$(shell ${_CSTD_SH})
-CFLAGS+=	${_CSTD}
+ifneq (${CSTD},)
+CFLAGS+=	-std=${CSTD}
+endif
 
 # Try and use some good cc flags if we're building from git
 # We don't use -pedantic as it will warn about our perfectly valid

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     a2e9cde737ede93502a80fe50e62b0aea50643dc
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 22:42:17 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 04:28:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a2e9cde7

remove BSD make code to handle including .depend

---
 mk/depend-.mk      |    2 --
 mk/depend-gmake.mk |    3 ---
 mk/depend.mk       |    7 +------
 3 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/mk/depend-.mk b/mk/depend-.mk
deleted file mode 100644
index 9d13b52..0000000
--- a/mk/depend-.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# This space left intentionally blank because gmake does not load .depend
-# by default

diff --git a/mk/depend-gmake.mk b/mk/depend-gmake.mk
deleted file mode 100644
index 947843e..0000000
--- a/mk/depend-gmake.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tell gmake to include the optional dependency file.
-# This sucks, but I don't know any other way of portably making this work.
--include .depend

diff --git a/mk/depend.mk b/mk/depend.mk
index 067c1ef..44af378 100644
--- a/mk/depend.mk
+++ b/mk/depend.mk
@@ -10,9 +10,4 @@ IGNOREFILES+=	.depend
 
 depend: .depend extra_depend
 
-# Nasty hack. depend-.mk is a blank file, depend-gmake.mk has a gmake specific
-# command to optionally include .depend.
-# Someone should patch gmake to optionally include .depend if it exists.
-_INC_DEP=	$(shell if ${MAKE} --version | grep -q "^GNU "; then \
-		echo "gmake"; else echo ""; fi)
-include ${MK}/depend-${_INC_DEP}.mk
+-include .depend

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     67640d2d97623cb3ddc6753a719eadd790c4fec9
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 22:32:12 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 22:32:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=67640d2d

remove hard coded directory paths from link flags

Currently, we do not see a reason for these, and it causes an issue for
cross compilation.

X-Gentoo-Bug: 361465
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=361465

---
 mk/lib.mk |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/mk/lib.mk b/mk/lib.mk
index a5682dd..280cf96 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -31,8 +31,6 @@ lib${LIB}.a:	${OBJS} ${STATICOBJS}
 
 ${SHLIB_NAME}: ${VERSION_MAP}
 LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
-# We need to ensure we use libraries in /lib
-LDFLAGS+=	-L/${LIBNAME} -Wl,-rpath=/${LIBNAME}
 
 ${SHLIB_NAME}:	${SOBJS}
 	@${ECHO} building shared library $@

[gentoo-commits] proj/openrc:master commit in: mk/

[Mike Frysinger]

commit:     98d3b407fefeba04a143c53d4f5faf48acd0f665
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat May 28 16:00:13 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat May 28 16:00:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=98d3b407

cc.mk: enable -g by default

Can do no harm!

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 mk/cc.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mk/cc.mk b/mk/cc.mk
index 06556f0..4192b34 100644
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -1,7 +1,7 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 
 # Setup some good default CFLAGS
-CFLAGS?=	-O2
+CFLAGS?=	-O2 -g
 
 # Default to using the C99 standard
 CSTD?=		c99

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     ea696b47c875755a28ffd5dea15680172db1f50d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 19:47:20 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 19:47:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ea696b47

fix typo

---
 mk/os-prefix.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mk/os-prefix.mk b/mk/os-prefix.mk
index 94fda96..c546a86 100644
--- a/mk/os-prefix.mk
+++ b/mk/os-prefix.mk
@@ -1,6 +1,6 @@
 # Copyright (c) 2012 William Hubbs <w.d.hubbs@gmail.com>
 # Released under the 2-clause BSD license.
 
-ifeq (${MKPREFIX},yes}
+ifeq (${MKPREFIX},yes)
 CPPFLAGS+=	-DPREFIX
 endif

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     8e4169e29e419bfd986455bb809463a3fa433afb
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 20:54:52 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 21:50:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8e4169e2

Fix UPREFIX for Gentoo Prefix installations

Make sure UPREFIX in our make files gets set correctly when
MKPREFIX=yes. In this situation, UPREFIX should be ${PREFIX}/usr.

Reported-by: <heroxdb <AT> gentoo.org>
X-Gentoo-Bug: 415899
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=415899

---
 mk/sys.mk |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mk/sys.mk b/mk/sys.mk
index efa478c..251287f 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -11,9 +11,14 @@ SED?=			sed
 SH=			/bin/sh
 
 PREFIX?=
-_UPREFIX_SH=		case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac
-_UPREFIX:=		$(shell ${_UPREFIX_SH})
-UPREFIX=		${_UPREFIX}
+ifeq (${PREFIX},)
+UPREFIX= /usr
+else
+UPREFIX= ${PREFIX}
+ifeq (${MKPREFIX},yes)
+UPREFIX= ${PREFIX}/usr
+endif
+endif
 LOCAL_PREFIX=		/usr/local
 
 PICFLAG?=		-fPIC

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     549cbadd2ccc3d0f11b5b1802175ca7afcdcb6a4
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Feb 23 20:04:09 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 23:10:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=549cbadd

build: use pkg-config to find ncurses libraries if it is available

If ncurses was built with the --with-termlib switch enabled, tgoto, tgetent
and tgetstr move to libtinfo. Fortunately, ncurses provides a pkg-config
file which we can use if pkg-config is installed. If it is not, we still
link to -lncurses for now, so pkg-config is not a hard requirement.

Reported-by: jan.paesmans <AT> gmail.com
X-Gentoo-Bug: 455912
X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=455912

---
 mk/termcap.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/mk/termcap.mk b/mk/termcap.mk
index b716276..6f590da 100644
--- a/mk/termcap.mk
+++ b/mk/termcap.mk
@@ -1,5 +1,10 @@
 ifeq (${MKTERMCAP},ncurses)
+	LTERMCAP:=	$(shell pkg-config ncurses --libs 2> /dev/null)
+ifeq ($(LTERMCAP),)
 LIBTERMCAP?=	-lncurses
+else
+LIBTERMCAP?= $(LTERMCAP)
+endif
 CPPFLAGS+=	-DHAVE_TERMCAP
 LDADD+=		${LIBTERMCAP}
 else ifeq (${MKTERMCAP},termcap)

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     9eb06745126de85d032d2f5d65ea713065f03c3d
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 17 06:21:09 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 02:30:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9eb06745

add SBINDIR variable to sys.mk

BINDIR was pointing to PREFIX/sbin which was confusing and inconsistent
with src/rc/Makefile.  Add SBINDIR and redefine BINDIR appropriately.

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 mk/sys.mk |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/mk/sys.mk b/mk/sys.mk
index 251287f..ce9e8ea 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -29,9 +29,12 @@ CONFDIR?=		${SYSCONFDIR}/conf.d
 LOCALDIR?=		${SYSCONFDIR}/local.d
 SYSCTLDIR?=		${SYSCONFDIR}/sysctl.d
 
-BINDIR?=		${PREFIX}/sbin
+BINDIR?=		${PREFIX}/bin
 BINMODE?=		0755
 
+SBINDIR?=		${PREFIX}/sbin
+SBINMODE?=		0755
+
 INCDIR?=		${UPREFIX}/include
 INCMODE?=		0444
 

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     4a1afa694cd8ebd6591d5a825ee35e4f57c98469
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 15 16:38:02 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 16:38:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4a1afa69

Add SELinux support to the build system

X-Gentoo-Bug: 516956
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516956

---
 mk/os-Linux.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index 40d9c34..dc76b96 100644
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -6,3 +6,9 @@ PKG_PREFIX?=	/usr
 
 CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl
+
+ifeq (${MKSELINUX},yes)
+CPPFLAGS+= -DHAVE_SELINUX
+LIBSELINUX= -lselinux
+LDADD += $(LIBSELINUX)
+endif

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     ba0a11fc94d303e208dd364b06c1c2a75bcdd62b
Author:     Johan Bergström <bugs <AT> bergstroem <DOT> nu>
AuthorDate: Wed Oct 22 22:59:57 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 18:04:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ba0a11fc

Pass ncurses cflags to build

Fixes #25
Note from William Hubbs:
The original patch overwrote CFLAGS. I modified this patch to add the
ncurses cflags to CPPFLAGS instead of overwriting CFLAGS.

---
 mk/termcap.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mk/termcap.mk b/mk/termcap.mk
index 6f590da..2d6ad01 100644
--- a/mk/termcap.mk
+++ b/mk/termcap.mk
@@ -1,11 +1,12 @@
 ifeq (${MKTERMCAP},ncurses)
-	LTERMCAP:=	$(shell pkg-config ncurses --libs 2> /dev/null)
+TERMCAP_CFLAGS:=	$(shell pkg-config ncurses --cflags 2> /dev/null)
+LTERMCAP:=			$(shell pkg-config ncurses --libs 2> /dev/null)
 ifeq ($(LTERMCAP),)
 LIBTERMCAP?=	-lncurses
 else
 LIBTERMCAP?= $(LTERMCAP)
 endif
-CPPFLAGS+=	-DHAVE_TERMCAP
+CPPFLAGS+=	-DHAVE_TERMCAP ${TERMCAP_CFLAGS}
 LDADD+=		${LIBTERMCAP}
 else ifeq (${MKTERMCAP},termcap)
 LIBTERMCAP?=	-ltermcap

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     3647db7a27f7a5ca14b33b14effeb945fd986210
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Dec  7 23:16:48 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Dec  7 23:16:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3647db7a

Add target to create ChangeLog

This was added by request because some users are requesting a ChangeLog.

This fixes #29.

---
 mk/dist.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mk/dist.mk b/mk/dist.mk
index 82fb8cb..6c37dc8 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -8,12 +8,17 @@ DISTFILE?=	${DISTPREFIX}.tar.bz2
 
 CLEANFILES+=	${NAME}-*.tar.bz2
 
+CHANGELOG_LIMIT?= --after=$(shell date --utc --date="1 year ago" +%Y-%m-%d)
+
 _SNAP_SH=	date -u +%Y%m%d%H%M
 _SNAP:=		$(shell ${_SNAP_SH})
 SNAP=		${_SNAP}
 SNAPDIR=	${DISTPREFIX}-${SNAP}
 SNAPFILE=	${SNAPDIR}.tar.bz2
 
+changelog:
+	git log ${CHANGELOG_LIMIT} --format=medium > ChangeLog
+
 dist:
 	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
 

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     6a9679377f4de257f02de1d16a513df14b4c25ba
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Dec  8 15:47:42 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec  8 15:47:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6a967937

Do not call the shell to evaluate CHANGELOG_LIMIT

The git log command understands dates such as "1 year ago", so there is
no need to use the date command.

---
 mk/dist.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 6c37dc8..4f7babb 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -8,7 +8,7 @@ DISTFILE?=	${DISTPREFIX}.tar.bz2
 
 CLEANFILES+=	${NAME}-*.tar.bz2
 
-CHANGELOG_LIMIT?= --after=$(shell date --utc --date="1 year ago" +%Y-%m-%d)
+CHANGELOG_LIMIT?= --after="1 year ago"
 
 _SNAP_SH=	date -u +%Y%m%d%H%M
 _SNAP:=		$(shell ${_SNAP_SH})

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     423f82bae9f91f1f5a27d30a2542d8884c6f757a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Feb 18 18:46:51 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 18:47:19 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=423f82ba

ChangeLog: show authors and committers

---
 mk/dist.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 4f7babb..aa07dbb 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -17,7 +17,7 @@ SNAPDIR=	${DISTPREFIX}-${SNAP}
 SNAPFILE=	${SNAPDIR}.tar.bz2
 
 changelog:
-	git log ${CHANGELOG_LIMIT} --format=medium > ChangeLog
+	git log ${CHANGELOG_LIMIT} --format=full > ChangeLog
 
 dist:
 	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     e16b7183e90090ecee539697508582d208859a8b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Mar 22 03:49:56 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 03:49:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e16b7183

mk/os-GNU.mk: fix typo

MAX_PATH should have been PATH_MAX

 mk/os-GNU.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-GNU.mk b/mk/os-GNU.mk
index bbaba2b..826202c 100644
--- a/mk/os-GNU.mk
+++ b/mk/os-GNU.mk
@@ -4,5 +4,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DMAX_PATH=4096
+CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
 LIBDL=		-Wl,-Bdynamic -ldl

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     de93587affb17675e6f7cab2b85613d61e11b98b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Mar 23 14:13:55 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 24 17:46:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=de93587a

Silence warning about _DEFAULT_SOURCE for Linux/glibc

In >=glibc-2.20, the _BSD_SOURCE macro is deprecated in favor of
_DEFAULT_SOURCE. This adds -D_DEFAULT_SOURCE to CPPFLAGS on Linux.

Fixes #44

 mk/os-Linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index bb6fa37..60235b8 100644
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -4,7 +4,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     a27d577da8cf4f1c7f9784a043ecf02d71a81ca6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Apr 30 19:45:42 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 19:45:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a27d577d

Build: fix the dist target

The dist target now creates an archive based on the version setting.
This makes it possible to create an archive identical to the ones github
generates once the release is tagged.

 mk/dist.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index aa07dbb..13ec40a 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -2,7 +2,7 @@
 # Copyright (c) 2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-GITREF?=	HEAD
+GITREF?=	${VERSION}
 DISTPREFIX?=	${NAME}-${VERSION}
 DISTFILE?=	${DISTPREFIX}.tar.bz2
 

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     9225bfa6918cfd488c8f1055cf986b542f1f157e
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri May  1 15:14:31 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri May  1 15:14:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9225bfa6

Build: make snapshot remove .git directory from tarball

 mk/dist.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/dist.mk b/mk/dist.mk
index 13ec40a..a986e60 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -34,7 +34,7 @@ snapshot:
 	mkdir /tmp/${SNAPDIR}
 	cp -RPp * /tmp/${SNAPDIR}
 	(cd /tmp/${SNAPDIR}; make clean)
-	find /tmp/${SNAPDIR} -name .svn -exec rm -rf -- {} \; 2>/dev/null || true
+	rm -rf /tmp/${SNAPDIR}/.git 2>/dev/null || true
 	tar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR}
 	rm -rf /tmp/${SNAPDIR}
 	ls -l ${SNAPFILE}

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     5af5d12f3e56f9f2ff232d124d27c856fd66f551
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 22:43:36 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> 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
 

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     8bca2cd4b3c710809131ac036456b34c223e8d12
Author:     Julian Ospald <hasufell <AT> posteo <DOT> de>
AuthorDate: Wed Jun 29 12:27:37 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:52:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8bca2cd4

Build: fix hardcoded pkg-config invocation

This fixes #89.

 mk/sys.mk     | 1 +
 mk/termcap.mk | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mk/sys.mk b/mk/sys.mk
index 948ec1d..47d9526 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -11,6 +11,7 @@
 
 AR?=			ar
 CP?=			cp
+PKG_CONFIG?=	pkg-config
 ECHO?=			echo
 INSTALL?=		install
 RANLIB?=		ranlib

diff --git a/mk/termcap.mk b/mk/termcap.mk
index 2d6ad01..4890e35 100644
--- a/mk/termcap.mk
+++ b/mk/termcap.mk
@@ -1,6 +1,6 @@
 ifeq (${MKTERMCAP},ncurses)
-TERMCAP_CFLAGS:=	$(shell pkg-config ncurses --cflags 2> /dev/null)
-LTERMCAP:=			$(shell pkg-config ncurses --libs 2> /dev/null)
+TERMCAP_CFLAGS:=	$(shell ${PKG_CONFIG} ncurses --cflags 2> /dev/null)
+LTERMCAP:=			$(shell ${PKG_CONFIG} ncurses --libs 2> /dev/null)
 ifeq ($(LTERMCAP),)
 LIBTERMCAP?=	-lncurses
 else

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     7056b56b3ccc9cbde4ef8297b923919c49c7c242
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 22:09:09 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 22:58:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=7056b56b

Drop the use of the _BSD_SOURCE macro on GNU/Hurd

X-Gentoo-Bug: 604666
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666

 mk/os-GNU.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-GNU.mk b/mk/os-GNU.mk
index 1fbc147..d5c4172 100644
--- a/mk/os-GNU.mk
+++ b/mk/os-GNU.mk
@@ -11,5 +11,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
 LIBDL=		-Wl,-Bdynamic -ldl

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     074d90f5a4e3b66e532a0becde372acf38346397
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 22:11:35 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 22:59:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=074d90f5

Drop the use of the _BSD_SOURCE macro on Linux

X-Gentoo-Bug: 604666
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604666

 mk/os-Linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index 15666fc..3a3c516 100644
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     688566c535111a141f77caf88db12a4338544f7b
Author:     Sergei Trofimovich <slyfox <AT> inbox <DOT> ru>
AuthorDate: Tue May 30 07:51:42 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May 30 07:51:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=688566c5

mk/cc.mk: make implicit function declarations fatal (#136)

Avoids issues with missing prototypes causing truncation of pointers.

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 mk/cc.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mk/cc.mk b/mk/cc.mk
index c9f7f355..6d47aa62 100644
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -26,7 +26,8 @@ _CCFLAGS=	-Wall -Wextra -Wimplicit -Wshadow -Wformat=2 \
 		-Wnested-externs \
 		-Winline -Wwrite-strings -Wcast-align -Wcast-qual \
 		-Wpointer-arith \
-		-Wdeclaration-after-statement -Wsequence-point
+		-Wdeclaration-after-statement -Wsequence-point \
+		-Werror=implicit-function-declaration
 
 # We should be using -Wredundant-decls, but our library hidden proto stuff
 # gives loads of warnings. I don't fully understand it (the hidden proto,

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     109869641f7b58d07819f6b65d7b085abf75083b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Mar  1 17:47:29 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 17:47:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=10986964

fix build on FreeBSD

 mk/os-FreeBSD.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mk/os-FreeBSD.mk b/mk/os-FreeBSD.mk
index 0e4fd101..4bd1a33a 100644
--- a/mk/os-FreeBSD.mk
+++ b/mk/os-FreeBSD.mk
@@ -11,3 +11,5 @@
 # Generic definitions
 
 include ${MK}/os-BSD.mk
+
+CPPFLAGS+=	-D_WITH_GETLINE

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     59a9e53378891be7b12ed304ccb609e27da70751
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 23:03:54 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 23:04:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=59a9e533

Add _POSIX_C_SOURCE macro to FreeBSD build

 mk/os-FreeBSD.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-FreeBSD.mk b/mk/os-FreeBSD.mk
index 4bd1a33a..6a567e30 100644
--- a/mk/os-FreeBSD.mk
+++ b/mk/os-FreeBSD.mk
@@ -12,4 +12,4 @@
 
 include ${MK}/os-BSD.mk
 
-CPPFLAGS+=	-D_WITH_GETLINE
+CPPFLAGS+=	-D_POSIX_C_SOURCE=200809

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     6dc0d0af333592203fabd4746279bb15d2801c0b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 23:14:39 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 23:14:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6dc0d0af

Remove _XOPEN_SOURCE macros from builds

 mk/os-GNU-kFreeBSD.mk | 2 +-
 mk/os-GNU.mk          | 2 +-
 mk/os-Linux.mk        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/os-GNU-kFreeBSD.mk b/mk/os-GNU-kFreeBSD.mk
index 4fc934e0..93b48291 100644
--- a/mk/os-GNU-kFreeBSD.mk
+++ b/mk/os-GNU-kFreeBSD.mk
@@ -13,6 +13,6 @@
 SFX=		.GNU-kFreeBSD.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_BSD_SOURCE
 LIBDL=		-Wl,-Bdynamic -ldl
 LIBKVM?=

diff --git a/mk/os-GNU.mk b/mk/os-GNU.mk
index d5c4172f..adaefd44 100644
--- a/mk/os-GNU.mk
+++ b/mk/os-GNU.mk
@@ -11,5 +11,5 @@
 SFX=		.GNU.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -DMAXPATHLEN=4096 -DPATH_MAX=4096
+CPPFLAGS+=	-D_DEFAULT_SOURCE -DMAXPATHLEN=4096 -DPATH_MAX=4096
 LIBDL=		-Wl,-Bdynamic -ldl

diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index 3a3c5167..2479ff5b 100644
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
+CPPFLAGS+=	-D_DEFAULT_SOURCE
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     71f275b2aa04d9a9323a49d1421796c4d50b1436
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Mar 14 15:45:40 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 15:45:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=71f275b2

typo fix

 mk/os-FreeBSD.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-FreeBSD.mk b/mk/os-FreeBSD.mk
index 6a567e30..f8431bc3 100644
--- a/mk/os-FreeBSD.mk
+++ b/mk/os-FreeBSD.mk
@@ -12,4 +12,4 @@
 
 include ${MK}/os-BSD.mk
 
-CPPFLAGS+=	-D_POSIX_C_SOURCE=200809
+CPPFLAGS+=	-D_POSIX_C_SOURCE=200809L

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     92e6bdee12fa9d87a2535446ceccee261305e87c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Mar 14 18:07:46 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 18:07:46 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=92e6bdee

Use _BSD_SOURCE on FreeBSD

 mk/os-FreeBSD.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-FreeBSD.mk b/mk/os-FreeBSD.mk
index f8431bc3..a4b2bfd3 100644
--- a/mk/os-FreeBSD.mk
+++ b/mk/os-FreeBSD.mk
@@ -12,4 +12,4 @@
 
 include ${MK}/os-BSD.mk
 
-CPPFLAGS+=	-D_POSIX_C_SOURCE=200809L
+CPPFLAGS+=	-D_BSD_SOURCE

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     f4e2142089487b7f5c99da949d7bf8d038724df7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue May  1 18:28:57 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May  1 18:29:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f4e21420

Add _POSIX_C_SOURCE definition to Linux build

We need this to allow builds on uclibc-ng based systems.

X-Gentoo-Bug: 650908
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=650908

 mk/os-Linux.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/os-Linux.mk b/mk/os-Linux.mk
index 2479ff5b..9e8a1485 100644
--- a/mk/os-Linux.mk
+++ b/mk/os-Linux.mk
@@ -11,7 +11,7 @@
 SFX=		.Linux.in
 PKG_PREFIX?=	/usr
 
-CPPFLAGS+=	-D_DEFAULT_SOURCE
+CPPFLAGS+=	-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L
 LIBDL=		-Wl,-Bdynamic -ldl
 
 ifeq (${MKSELINUX},yes)

[gentoo-commits] proj/openrc:master commit in: mk/

[William Hubbs]

commit:     3c53680018c1799d0d804e241a9fa4d3b9423896
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri May 11 20:38:27 2018 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri May 11 20:38:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3c536800

build: standardize installation modes

Gentoo was changing some of our installation modes from 0444 to 0644.
There isn't a reason to install things 0444, so we are switching these
to 0644 so the Gentoo ebuild doesn't need this extra step.

 mk/sys.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/sys.mk b/mk/sys.mk
index db3fb779..92bb55ea 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -45,20 +45,20 @@ SBINDIR?=		${PREFIX}/sbin
 SBINMODE?=		0755
 
 INCDIR?=		${UPREFIX}/include
-INCMODE?=		0444
+INCMODE?=		0644
 
 _LIBNAME_SH=		case `readlink /lib` in /lib64|lib64) echo "lib64";; *) echo "lib";; esac
 _LIBNAME:=		$(shell ${_LIBNAME_SH})
 LIBNAME?=		${_LIBNAME}
 LIBDIR?=		${UPREFIX}/${LIBNAME}
-LIBMODE?=		0444
+LIBMODE?=		0644
 SHLIBDIR?=		${PREFIX}/${LIBNAME}
 
 LIBEXECDIR?=		${PREFIX}/libexec/rc
 
 MANPREFIX?=		${UPREFIX}/share
 MANDIR?=		${MANPREFIX}/man
-MANMODE?=		0444
+MANMODE?=		0644
 
 BASHCOMPDIR?=		${UPREFIX}/share/bash-completion/completions