build-essentials: Remove leading epoch when epoch equals zero.

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index e226c9e212f844af9a2949d901746f4d51465dc6..67b5e89aeb15956849d78cf5de029a48640b513b 100644 (file)
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 16
+PKG_REL        = 17
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
 

diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
index a649885edbbfc850a4b3b5cd272ca26a0cf41084..e506d6a2da1686a78024944b8cdf1d1645fe3a00 100644 (file)
--- a/pkgs/build-essentials/buildsystem/Constants
+++ b/pkgs/build-essentials/buildsystem/Constants
@@ -106,9 +106,12 @@ PKG_EPOCH      = 0
 PKG_RELEASE    = $(PKG_REL).$(DISTRO_DISTTAG)
 PKG_ARCH       = $(DISTRO_ARCH)
 
+# Helper variable that says if EPOCH was set to another value than 0.
+HAVE_EPOCH     = $(filter-out $(EPOCH),0)
+
 # Shortcut to package name + version
 THISAPP        = $(PKG_NAME)-$(PKG_VER)
-THISVER        = $(PKG_EPOCH):$(PKG_VER)-$(PKG_RELEASE)
+THISVER        = $(if $(HAVE_EPOCH),$(PKG_EPOCH):)$(PKG_VER)-$(PKG_RELEASE)
 
 #  All packages depend on gcc and headers by default.
 PKG_BUILD_DEPS+= gcc glibc-devel kernel-headers