diff options
| -rw-r--r-- | package/unzip/Makefile | 46 | ||||
| -rw-r--r-- | package/unzip/patches/patch-unix_Makefile | 28 | ||||
| -rw-r--r-- | package/unzip/patches/patch-unix_configure | 26 | ||||
| -rw-r--r-- | package/xbmc/Makefile | 1 | ||||
| -rw-r--r-- | package/zip/Makefile | 3 |
5 files changed, 102 insertions, 2 deletions
diff --git a/package/unzip/Makefile b/package/unzip/Makefile new file mode 100644 index 000000000..a5b83d4b0 --- /dev/null +++ b/package/unzip/Makefile @@ -0,0 +1,46 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= unzip +PKG_VERSION:= 6.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 62b490407489521db863b523a7f86375 +PKG_DESCR:= zip extraction utility +PKG_SECTION:= archive +PKG_URL:= http://www.info-zip.org/UnZip.html +PKG_SITES:= http://downloads.sourceforge.net/infozip/ + +DISTFILES:= ${PKG_NAME}60.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}60 + +include ${TOPDIR}/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,UNZIP,unzip,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,UNZIP,unzip,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +HOST_STYLE:= manual +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +TARGET_CPPFLAGS+= -DNO_BZIP2_SUPPORT +CONFIGURE_PROG:= unix/configure +MAKE_FILE:= unix/Makefile +ALL_TARGET:= generic_gcc + +host-build: + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${HOST_MAKE_FLAGS} ${ALL_TARGET}) + +unzip-hostinstall: + $(CP) $(WRKBUILD)/unzip \ + $(STAGING_HOST_DIR)/usr/bin + +unzip-install: + $(INSTALL_DIR) $(IDIR_UNZIP)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/unzip $(IDIR_UNZIP)/usr/bin + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/unzip/patches/patch-unix_Makefile b/package/unzip/patches/patch-unix_Makefile new file mode 100644 index 000000000..842ef5493 --- /dev/null +++ b/package/unzip/patches/patch-unix_Makefile @@ -0,0 +1,28 @@ +--- unzip60.orig/unix/Makefile 2009-01-18 23:41:18.000000000 +0100 ++++ unzip60/unix/Makefile 2014-05-27 14:22:34.624111366 +0200 +@@ -42,13 +42,13 @@ + # such as -DDOSWILD). + + # UnZip flags +-CC = cc# try using "gcc" target rather than changing this (CC and LD ++CC ?= cc# try using "gcc" target rather than changing this (CC and LD + LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) + AS = as + LOC = $(D_USE_BZ2) $(LOCAL_UNZIP) + AF = $(LOC) +-CFLAGS = -O +-CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC) ++CFLAGS ?= ++CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(CFLAGS) + CF = $(CFLAGS) $(CF_NOOPT) + LFLAGS1 = + LF = -o unzip$E $(LFLAGS1) +@@ -545,7 +545,7 @@ generic: flags # now try autoconfigur + # make $(MAKEF) unzips CF="${CF} `cat flags`" + + generic_gcc: +- $(MAKE) $(MAKEF) generic CC=gcc IZ_BZIP2="$(IZ_BZIP2)" ++ $(MAKE) $(MAKEF) generic CC=$(CC) IZ_BZIP2="$(IZ_BZIP2)" + + # extensions to perform SVR4 package-creation after compilation + generic_pkg: generic svr4package diff --git a/package/unzip/patches/patch-unix_configure b/package/unzip/patches/patch-unix_configure new file mode 100644 index 000000000..9f8809651 --- /dev/null +++ b/package/unzip/patches/patch-unix_configure @@ -0,0 +1,26 @@ +--- unzip60.orig/unix/configure 2009-04-16 21:25:12.000000000 +0200 ++++ unzip60/unix/configure 2014-05-27 14:26:43.375494965 +0200 +@@ -130,11 +130,9 @@ _EOF_ + fi + fi + +-# optimization flags +-if test -n "${CFLAGS_OPT}"; then +- CFLAGSR="${CFLAGSR} ${CFLAGS_OPT}" +- CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}" +-fi ++CFLAGSR="${CFLAGSR}" ++CFLAGS_BZ="${CFLAGS_BZ}" ++ + + echo Check for the C preprocessor + # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp. +@@ -433,7 +431,7 @@ if [ $? -ne 0 ]; then + if [ ${OPT} ]; then + LFLAGS2="${LFLAGS2} ${OPT}" + else +- CFLAGSR="${CFLAGSR} -DNO_DIR" ++ CFLAGSR="${CFLAGSR}" + fi + fi + diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 13f289458..19a808769 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -27,6 +27,7 @@ PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump eudev PKG_BUILDDEP+= libgpg-error libbluray dbus libxslt libvorbis PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host +PKG_BUILDDEP+= zip-host unzip-host PKG_URL:= http://xbmc.org/ #PKG_SITES:= http://mirrors.xbmc.org/releases/source/ PKG_SITES:= http://openadk.org/distfiles/ diff --git a/package/zip/Makefile b/package/zip/Makefile index a51610e72..0fd973dce 100644 --- a/package/zip/Makefile +++ b/package/zip/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7b74551e63f8ee6aab6fbc86676c0d37 PKG_DESCR:= zip compression utility PKG_SECTION:= archive -PKG_BUILDDEP:= zip-host PKG_URL:= http://www.info-zip.org/Zip.html PKG_SITES:= ftp://ftp.info-zip.org/pub/infozip/src/ @@ -42,7 +41,7 @@ zip-hostinstall: zip-install: ${INSTALL_DIR} ${IDIR_ZIP}/usr/bin - ${CP} ${WRKBUILD}/zip ${IDIR_ZIP}/usr/bin + ${INSTALL_BIN} ${WRKBUILD}/zip ${IDIR_ZIP}/usr/bin include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk |