xautolock: unbreak build

This commit is contained in:
Alessio Sergi 2015-06-18 12:22:55 +02:00
parent afcd2928b6
commit 56a0f7421a
2 changed files with 39 additions and 6 deletions

View File

@ -0,0 +1,33 @@
--- src/engine.c.orig 2014-08-28 12:50:56.086307943 +0000
+++ src/engine.c 2014-08-28 12:50:59.496333650 +0000
@@ -209,24 +209,24 @@ evaluateTriggers (Display* d)
{
#else /* VMS */
if (lockerPid)
{
-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+#if (!defined (UTEKV) && !defined (SYSV) && !defined (SVR4)) && defined (__GLIBC__)
union wait status; /* childs process status */
-#else /* !UTEKV && !SYSV && !SVR4 */
+#else /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
int status = 0; /* childs process status */
-#endif /* !UTEKV && !SYSV && !SVR4 */
+#endif /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
if (unlockNow && !disabled)
{
(void) kill (lockerPid, SIGTERM);
}
-#if !defined (UTEKV) && !defined (SYSV) && !defined (SVR4)
+#if (!defined (UTEKV) && !defined (SYSV) && !defined (SVR4)) && defined (__GLIBC__)
if (wait3 (&status, WNOHANG, 0))
-#else /* !UTEKV && !SYSV && !SVR4 */
+#else /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
if (waitpid (-1, &status, WNOHANG))
-#endif /* !UTEKV && !SYSV && !SVR4 */
+#endif /* (!UTEKV && !SYSV && !SVR4) && __GLIBC__ */
{
/*
* If the locker exited normally, we disable any pending kill
* trigger. Otherwise, we assume that it either has crashed or

View File

@ -1,20 +1,20 @@
# Template file for 'xautolock' # Template file for 'xautolock'
pkgname=xautolock pkgname=xautolock
version=2.2 version=2.2
revision=2 revision=3
makedepends="libXScrnSaver-devel xproto"
hostmakedepends="imake xorg-cf-files" hostmakedepends="imake xorg-cf-files"
makedepends="libXScrnSaver-devel xproto"
short_desc="Autolock utility for X" short_desc="Autolock utility for X"
maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>" maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
license="GPL-2" license="GPL-2"
homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/" homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
distfiles="${homepage}/${pkgname}-${version}.tgz" distfiles="${homepage}/${pkgname}-${version}.tgz"
checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2 checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2
build_style=gnu-makefile
pre_build() { do_build() {
xmkmf xmkmf
make CC=$CC CDEBUGFLAGS="-D_DEFAULT_SOURCE ${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
} }
post_install() { do_install() {
make install.man MANSUFFIX=1 MANPATH=/usr/share/man DESTDIR=${DESTDIR} make MANSUFFIX=1 DESTDIR=${DESTDIR} install install.man
} }