diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-02-09 05:53:08 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-02-09 05:53:08 +0100 |
commit | 04c36baff7046c5efbef07d2d5df778950c3e40c (patch) | |
tree | 3d35868b9651982758830a53fb4bc004dc78c411 /package/tzdata | |
parent | bec8efcabb936c360f6b725913aa14b01482355c (diff) |
split tzdata and tzcode, using multiple DISTFILES no longer supported
Diffstat (limited to 'package/tzdata')
-rw-r--r-- | package/tzdata/Makefile | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile index bf1b6d136..45c2b5fc7 100644 --- a/package/tzdata/Makefile +++ b/package/tzdata/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tzdata PKG_VERSION:= 2014d PKG_RELEASE:= 1 -PKG_HASH:= 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 e9c775bb76c9700521ada77776277c25f8650a22b56d46c9f00f4147970ef13e +PKG_HASH:= 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 PKG_DESCR:= timezone data (/usr/share/zoneinfo) PKG_SECTION:= base/apps PKG_URL:= http://www.iana.org/time-zones/ @@ -15,36 +15,29 @@ PKG_NOPARALLEL:= 1 PKG_LIBC_DEPENDS:= glibc musl -DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode${PKG_VERSION}.tar.gz -# both archives do not extract into subdirectories -WRKDIST= ${WRKDIR} - -# no use for tzselect, since that is a ksh-script -PKG_SUBPKGS:= TZDATA DATE -PKGSD_DATE:= famous date utility +DISTFILES:= $(PKG_NAME)$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR) include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,TZDATA,tzdata,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION})) +$(eval $(call PKG_template,TZDATA,tzdata,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) CONFIG_STYLE:= manual HOST_CFLAGS+= -DSTD_INSPIRED=1 -DHAVE_STDINT_H=1 TARGET_CFLAGS+= -DHAVE_INTTYPES_H=1 -XAKE_FLAGS+= TZDIR="/usr/share/zoneinfo" cc="${TARGET_CC}" -# the uppercase targets enable building and installation of the date utility +XAKE_FLAGS+= TZDIR="/usr/share/zoneinfo" cc="$(TARGET_CC)" ALL_TARGET:= ALL INSTALL_TARGET:= INSTALL tzdata-install: $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share/zoneinfo $(IDIR_TZDATA)/etc - cd ${WRKINST} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + cd $(WRKINST) && for f in UTC $(ADK_RUNTIME_TIMEZONE); do \ test -s usr/share/zoneinfo/"$$f" || continue; \ echo usr/share/zoneinfo/"$$f" | \ - ${STAGING_HOST_DIR}/usr/bin/cpio -pdu ${IDIR_TZDATA}/; \ + $(STAGING_HOST_DIR)/usr/bin/cpio -pdu $(IDIR_TZDATA)/; \ done tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \ - for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + for f in UTC $(ADK_RUNTIME_TIMEZONE); do \ test -s "$$f" || continue; \ tz=$$f; \ done; if test x"$$tz" = x""; then \ @@ -55,8 +48,4 @@ tzdata-install: $(IDIR_TZDATA)/etc/localtime; \ fi -date-install: - ${INSTALL_DIR} ${IDIR_DATE}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/date ${IDIR_DATE}/usr/bin/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk |