[Astlinux-commits] SF.net SVN: astlinux:[7167] branches/1.0/package/logrotate

[<abe...@us...>]

Revision: 7167
          http://sourceforge.net/p/astlinux/code/7167
Author:   abelbeck
Date:     2015-07-30 16:58:17 +0000 (Thu, 30 Jul 2015)
Log Message:
-----------
logrotate, version bump to 3.9.1

Modified Paths:
--------------
    branches/1.0/package/logrotate/logrotate.mk

Added Paths:
-----------
    branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch

Added: branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch
===================================================================
--- branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch	                        (rev 0)
+++ branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch	2015-07-30 16:58:17 UTC (rev 7167)
@@ -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 <ben...@gm...>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,5 +2,5 @@
+ 
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ AC_DEFINE(_GNU_SOURCE)
+ 
+ AM_EXTRA_RECURSIVE_TARGETS([test])
+

Modified: branches/1.0/package/logrotate/logrotate.mk
===================================================================
--- branches/1.0/package/logrotate/logrotate.mk	2015-07-30 16:02:35 UTC (rev 7166)
+++ branches/1.0/package/logrotate/logrotate.mk	2015-07-30 16:58:17 UTC (rev 7167)
@@ -3,31 +3,35 @@
 # logrotate
 #
 #############################################################
-LOGROTATE_VERSION = 3.8.7
+LOGROTATE_VERSION = 3.9.1
 LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
 LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate
 
-LOGROTATE_DEPENDENCIES = popt
+LOGROTATE_DEPENDENCIES = popt host-pkg-config
 
-define LOGROTATE_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" LDFLAGS="$(LDFLAGS)" -C $(@D)
-endef
+# tarball does not have a generated configure script
+LOGROTATE_AUTORECONF = YES
 
-define LOGROTATE_INSTALL_TARGET_CMDS
-	$(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install
+LOGROTATE_CONF_OPT = --without-selinux
+
+ifeq ($(BR2_PACKAGE_ACL),y)
+LOGROTATE_DEPENDENCIES += acl
+LOGROTATE_CONF_OPT += --with-acl
+else
+LOGROTATE_CONF_OPT += --without-acl
+endif
+
+define LOGROTATE_INSTALL_TARGET_CONF
 	$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
 	if [ ! -d $(TARGET_DIR)/etc/logrotate.d ]; then \
 		$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d; \
 	fi
 endef
+LOGROTATE_POST_INSTALL_TARGET_HOOKS += LOGROTATE_INSTALL_TARGET_CONF
 
 define LOGROTATE_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/logrotate
 	rm -f $(TARGET_DIR)/etc/logrotate.conf
 endef
 
-define LOGROTATE_CLEAN_CMDS
-	-$(MAKE) -C $(@D) clean
-endef
-
-$(eval $(call GENTARGETS,package,logrotate))
+$(eval $(call AUTOTARGETS,package,logrotate))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.