tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

runit: fix -Werror failure for i686

Browse Source 
Fix a warning about the wrong type short being used for
getgroups(2) and setgroups(2) parameter 2 which causes the
i686 build to fail here, probably because of -Werror.

Also "modernize" the template's indentation and use
vbin, vman ...
This commit is contained in:
Jürgen Buchmüller 2015-08-28 16:38:13 +02:00
parent 479445b042
commit 0da738d1ec
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
srcpkgs/runit/template
View File

@ -1,7 +1,7 @@
# Template file for 'runit' # Template file for 'runit'
pkgname=runit pkgname=runit
version=2.1.2 version=2.1.2
revision=5 revision=6
wrksrc="admin" wrksrc="admin"
short_desc="A UNIX init scheme with service supervision" short_desc="A UNIX init scheme with service supervision"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
@ -14,36 +14,42 @@ build_pie=yes
build_options="static" build_options="static"
do_build() { do_build() {
cd ${pkgname}-${version}/src cd ${pkgname}-${version}/src
if [ "$build_option_static" ]; then if [ "$build_option_static" ]; then
CFLAGS+=" -static" CFLAGS+=" -static"
LDFLAGS+=" -static" LDFLAGS+=" -static"
fi fi
sed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h sed -e 's,sbin/runit,usr/bin/runit,g' -i runit.h
echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc echo "$CC -D_GNU_SOURCE $CFLAGS" >conf-cc
echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld echo "$CC $LDFLAGS -Wl,-z -Wl,noexecstack" >conf-ld
# set default service path to /var/service # set default service path to /var/service
sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c sed -i -e 's:^char \*varservice ="/service/";$:char \*varservice ="/var/service/";:' sv.c
# change type short to gid_t for getgroups(2) and setgroups(2)
sed -i -e 's:short x\[4\];$:gid_t x[4];:' chkshsgr.c
make ${makejobs} make ${makejobs}
} }
do_install() { do_install() {
cd ${pkgname}-${version}/src cd ${pkgname}-${version}/src
# default services # default services
vmkdir var vmkdir var
ln -s ../run/runit/runsvdir/current ${DESTDIR}/var/service ln -s ../run/runit/runsvdir/current ${DESTDIR}/var/service
vmkdir usr/bin local f
install -m0755 {chpst,runit,runit-init,runsv,runsvchdir,runsvdir,sv,svlogd,utmpset} ${DESTDIR}/usr/bin for f in chpst runit runit-init runsv runsvchdir runsvdir \
sv svlogd utmpset; do
vbin $f
done
cd .. cd ..
vmkdir usr/share/man/man8 for f in man/*; do
install -m0644 man/* ${DESTDIR}/usr/share/man/man8 vman $f
done
vinstall ${FILESDIR}/_sv 644 usr/share/zsh/site-functions vinstall ${FILESDIR}/_sv 644 usr/share/zsh/site-functions
} }