haproxy: update to v2.6.10

[feed/packages.git] / net / chrony / Makefile

diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 99e933d17ab5b85725efbbe3b682557ada085bb4..bf233f3474cf13aff1fc00ce9b0f62995f44712d 100644 (file)
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chrony
-PKG_VERSION:=4.0
-PKG_RELEASE:=2
+PKG_VERSION:=4.3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.tuxfamily.org/chrony/
-PKG_HASH:=be27ea14c55e7a4434b2fa51d53018c7051c42fa6a3198c9aa6a1658bae0c625
+PKG_HASH:=9d0da889a865f089a5a21610ffb6713e3c9438ce303a63b49c2fb6eaff5b8804
 
 PKG_MAINTAINER:=Miroslav Lichvar <mlichvar0@gmail.com>
 PKG_LICENSE:=GPL-2.0
@@ -22,27 +22,31 @@ PKG_CPE_ID:=cpe:/a:tuxfamily:chrony
 
 PKG_BUILD_DEPENDS:=pps-tools
 
-PKG_CONFIG_DEPENDS:= \
-       CONFIG_CHRONY_NTS
-
 include $(INCLUDE_DIR)/package.mk
 
-define Package/chrony
+define Package/chrony/Default
   SUBMENU:=Time Synchronization
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libcap +libpthread +CHRONY_NTS:libgnutls +CHRONY_NTS:ca-bundle
+  DEPENDS:=+libcap +libpthread
   USERID:=chrony=323:chrony=323
   TITLE:=A versatile NTP client and server
   URL:=http://chrony.tuxfamily.org/
+  PROVIDES:=nts
+endef
+
+define Package/chrony
+$(call Package/chrony/Default)
+  TITLE+= (without NTS)
+  VARIANT:=normal
+  CONFLICTS:=chrony-nts
 endef
 
-define Package/chrony/config
-       if PACKAGE_chrony
-               config CHRONY_NTS
-                       bool "Enable NTS support"
-                       default n
-       endif
+define Package/chrony-nts
+$(call Package/chrony/Default)
+  TITLE+= (with NTS)
+  DEPENDS+= +PACKAGE_chrony-nts:libgnutls +PACKAGE_chrony-nts:ca-bundle
+  VARIANT:=with-nts
 endef
 
 define Package/chrony/description
@@ -51,11 +55,15 @@ define Package/chrony/description
        reference clocks, and manual input using wristwatch and keyboard.
 endef
 
+Package/chrony-nts/description = $(Package/chrony/description)
+
 define Package/chrony/conffiles
 /etc/chrony/chrony.conf
 /etc/config/chrony
 endef
 
+Package/chrony-nts/conffiles = $(Package/chrony/conffiles)
+
 CONFIGURE_ARGS+= \
        --host-machine=$(shell echo $(GNU_TARGET_NAME) | sed -e 's/-.*//') \
        --host-release="" \
@@ -63,7 +71,7 @@ CONFIGURE_ARGS+= \
        --sysconfdir=/etc/chrony \
        --prefix=/usr \
        --chronyrundir=/var/run/chrony \
-       $(if $(CONFIG_CHRONY_NTS),,--disable-nts) \
+       $(if $(findstring normal,$(BUILD_VARIANT)),--disable-nts,--enable,nts) \
        --disable-readline \
        --disable-rtc \
        --disable-sechash \
@@ -71,6 +79,9 @@ CONFIGURE_ARGS+= \
 
 CONFIGURE_VARS+=CPPFLAGS=-DNDEBUG
 
+TARGET_CFLAGS += -flto
+TARGET_LDFLAGS += -flto
+
 define Package/chrony/install
        $(INSTALL_DIR) $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/sbin/
@@ -86,4 +97,7 @@ define Package/chrony/install
        $(INSTALL_CONF) ./files/chrony.conf $(1)/etc/chrony/chrony.conf
 endef
 
+Package/chrony-nts/install= $(Package/chrony/install)
+
 $(eval $(call BuildPackage,chrony))
+$(eval $(call BuildPackage,chrony-nts))