diff options
| -rw-r--r-- | mk/vars.mk | 2 | ||||
| -rw-r--r-- | package/ed/Makefile | 9 | ||||
| -rw-r--r-- | package/ed/patches/patch-configure | 26 | ||||
| -rw-r--r-- | package/lzip/Makefile | 28 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 4 |
5 files changed, 56 insertions, 13 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 771a63d86..de0ac964a 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -409,6 +409,8 @@ EXTRACT_CMD= PATH='${HOST_PATH}'; mkdir -p ${WRKDIR}; \ bzip2 -dc $$file | cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ + *.tar.lz | *.tlz) \ + lzip -dc $$file | tar -xf - ;; \ *.zip) \ cat $$file | cpio -id -H zip ;; \ *.arm|*.jar|*.ids.gz) \ diff --git a/package/ed/Makefile b/package/ed/Makefile index a2c037a34..04093acab 100644 --- a/package/ed/Makefile +++ b/package/ed/Makefile @@ -4,16 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ed -PKG_VERSION:= 1.5 -PKG_RELEASE:= 2 -PKG_HASH:= 97dd34a49ebc9c97e414b90a087d63eafc41377a340848c97e75a9cba187fba1 +PKG_VERSION:= 1.13 +PKG_RELEASE:= 1 +PKG_HASH:= cd66c54a53cd6ef35a217556e7b2b2fdd973ca2708f4fc41636b0bc06388c7d3 PKG_DESCR:= unix editor PKG_SECTION:= app/editor +PKG_BUILDDEP+= lzip-host PKG_URL:= http://www.gnu.org/software/ed/ed.html PKG_SITES:= ${MASTER_SITE_GNU:=ed/} PKG_BB:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.lz include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/ed/patches/patch-configure b/package/ed/patches/patch-configure index e9574dcbf..594a9a524 100644 --- a/package/ed/patches/patch-configure +++ b/package/ed/patches/patch-configure @@ -1,17 +1,25 @@ ---- ed-1.5.orig/configure 2010-08-30 16:34:49.000000000 +0200 -+++ ed-1.5/configure 2011-12-05 13:26:17.990045908 +0100 -@@ -26,10 +26,10 @@ infodir='$(datadir)/info' - mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' +--- ed-1.13.orig/configure 2016-01-24 18:54:47.000000000 +0100 ++++ ed-1.13/configure 2016-04-08 23:14:47.326189488 +0200 +@@ -14,17 +14,17 @@ srctrigger=doc/${pkgname}.texi + LC_ALL=C + export LC_ALL + srcdir= +-prefix=/usr/local ++prefix=/usr + exec_prefix='$(prefix)' + bindir='$(exec_prefix)/bin' + datarootdir='$(prefix)/share' + infodir='$(datarootdir)/info' + mandir='$(datarootdir)/man' program_prefix= --CC= +-CC=gcc -CPPFLAGS= -CFLAGS='-Wall -W -O2' -LDFLAGS= -+CC?= ++CC?=gcc +CPPFLAGS?= +CFLAGS?='-Wall -W -O2' +LDFLAGS?= - # Loop over all args - while [ -n "$1" ] ; do + # checking whether we are using GNU C. + ${CC} --version > /dev/null 2>&1 diff --git a/package/lzip/Makefile b/package/lzip/Makefile new file mode 100644 index 000000000..0dc46da3c --- /dev/null +++ b/package/lzip/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= lzip +PKG_VERSION:= 1.17 +PKG_RELEASE:= 1 +PKG_HASH:= 9443855e0a33131233b22cdb6c62c9313a483f16cc7415efe88d4a494cea0352 +PKG_DESCR:= compression utility +PKG_SECTION:= app/archive +PKG_URL:= http://www.nongnu.org/lzip/lzip.html +PKG_SITES:= http://download.savannah.gnu.org/releases/lzip/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,LZIP,lzip,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,LZIP,lzip,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +lzip-install: + $(INSTALL_DIR) $(IDIR_LZIP)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/lzip $(IDIR_LZIP)/usr/bin + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 09d44a0a4..60958f2ff 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -150,6 +150,10 @@ config ADK_HOST_NEED_LZOP bool default n +config ADK_HOST_BUILD_LZIP + bool + default n + config ADK_HOST_BUILD_LZOP bool default n |