aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>2015-03-30 02:32:36 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-30 21:21:51 +0200
commite759a07939cbd4204212d787520b60b66c6e8011 (patch)
tree1afd125f60435d239e864b8789abc69c31cb435b /package
parent129f852c9bd2f3c995013ef6c71a936333ec800c (diff)
downloadbuildroot-e759a07939cbd4204212d787520b60b66c6e8011.tar.gz
buildroot-e759a07939cbd4204212d787520b60b66c6e8011.tar.bz2
logrotate: bump version to 3.8.9
This version comes with a new build system based on autoconf/automake, so we switch from generic-package to autotools-package. However, since the tarball does not contain a pre-generated configure script, we have to set LOGROTATE_AUTORECONF = YES. [Thomas: - add comment explaining why AUTORECONF = YES is needed - expand commit log - use --without/--with instead of --with=yes/--with=no - fix indentation in the ACL condition] Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/logrotate/0001-make-autoreconfable.patch20
-rw-r--r--package/logrotate/logrotate.mk24
2 files changed, 34 insertions, 10 deletions
diff --git a/package/logrotate/0001-make-autoreconfable.patch b/package/logrotate/0001-make-autoreconfable.patch
new file mode 100644
index 0000000000..89759d07fe
--- /dev/null
+++ b/package/logrotate/0001-make-autoreconfable.patch
@@ -0,0 +1,20 @@
+Make the package autoreconfigurable
+
+Adjust a minor detail in configure.ac in order to make the package
+compatible with the autoconf/automake versions we are using in
+Buildroot.
+
+Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ AC_INIT([logrotate],[3.8.9])
+
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ AC_DEFINE(_GNU_SOURCE)
+
+ AM_EXTRA_RECURSIVE_TARGETS([test])
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index c1bca48f8a..0af7f4aa3e 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -4,23 +4,27 @@
#
################################################################################
-LOGROTATE_VERSION = 3.8.7
+LOGROTATE_VERSION = 3.8.9
LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate
LOGROTATE_LICENSE = GPLv2+
LOGROTATE_LICENSE_FILES = COPYING
-
LOGROTATE_DEPENDENCIES = popt host-pkgconf
+# tarball does not have a generated configure script
+LOGROTATE_AUTORECONF = YES
+LOGROTATE_CONF_ENV = LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs popt)"
+LOGROTATE_CONF_OPTS = --without-selinux
-define LOGROTATE_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- LOADLIBES="$(shell $(PKG_CONFIG_HOST_BINARY) --libs popt)" \
- -C $(@D)
-endef
+ifeq ($(BR2_PACKAGE_ACL),y)
+LOGROTATE_DEPENDENCIES += acl
+LOGROTATE_CONF_OPTS += --with-acl
+else
+LOGROTATE_CONF_OPTS += --without-acl
+endif
-define LOGROTATE_INSTALL_TARGET_CMDS
- $(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install
+define LOGROTATE_INSTALL_TARGET_CONF
$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
endef
+LOGROTATE_POST_INSTALL_TARGET_HOOKS += LOGROTATE_INSTALL_TARGET_CONF
-$(eval $(generic-package))
+$(eval $(autotools-package))