liblogging: update to 1.0.4.

This commit is contained in:
Eivind Uggedal 2014-09-16 21:27:57 +00:00
parent 3927173ce4
commit 53ba793b7b
2 changed files with 38 additions and 11 deletions

View file

@ -0,0 +1,29 @@
From f8f35f7656d618b3263a51250b6a32a0ea10de96 Mon Sep 17 00:00:00 2001
From: Eivind Uggedal <eivind@uggedal.com>
Date: Tue, 16 Sep 2014 21:08:32 +0000
Subject: [PATCH] Fix man page detection when cross compiling.
AC_CHECK_FILE(S) is meant for checks of files on the native system and does
not work when cross compiling.
---
configure.ac | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5e1392e..90e836f 100644
--- configure.ac
+++ configure.ac
@@ -127,10 +127,9 @@ AC_ARG_ENABLE(man-pages,
if test "x$enable_man_pages" = "xyes"; then
AC_CHECKING([if all man pages already exist])
have_to_generate_man_pages="no"
- AC_CHECK_FILES(["stdlog/stdlog.3" "stdlog/stdlogctl.1"],
- [],
- [have_to_generate_man_pages="yes"]
- )
+ if test ! -r "stdlog/stdlog.3" || test ! -r "stdlog/stdlogctl.1"; then
+ have_to_generate_man_pages="yes"
+ fi
if test "x$have_to_generate_man_pages" = "xyes"; then
AC_MSG_RESULT([Some man pages are missing. We need rst2man to generate the missing man pages from source... Alternatively, use --disable-man-pages to build without them.])
else

View file

@ -1,26 +1,24 @@
# Template file for 'liblogging'
pkgname=liblogging
version=1.0.2
revision=2
version=1.0.4
revision=1
build_style=gnu-configure
configure_args="--disable-static --enable-cached-man-pages"
hostmakedepends="pkg-config"
configure_args="--disable-static $(vopt_enable systemd journal)"
hostmakedepends="pkg-config automake libtool"
makedepends="$(vopt_if systemd systemd-devel)"
short_desc="Easy to use, portable, open source library for system logging"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
homepage="http://www.liblogging.org/"
distfiles="http://download.rsyslog.com/liblogging/${pkgname}-${version}.tar.gz"
checksum=1fecfdc506ee937c21c30d868c76842506dc34ea5eb168b81fd11eb9483e4388
checksum=aceb5d2aa8bdc771ff66f407f9adf4176b654db63e34a8605795b68be537b81c
# Package build options
build_options="systemd"
if [ "$build_option_systemd" ]; then
configure_args+=" --enable-journal"
makedepends+=" systemd-devel"
else
configure_args+=" --disable-journal"
fi
pre_configure() {
autoreconf -fi
}
liblogging-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"