diff options
| -rw-r--r-- | package/xz/Makefile | 32 | ||||
| -rw-r--r-- | package/xz/patches/patch-build-aux_ltmain_sh | 11 |
2 files changed, 16 insertions, 27 deletions
diff --git a/package/xz/Makefile b/package/xz/Makefile index b18dfcbeb..fb0f4ab87 100644 --- a/package/xz/Makefile +++ b/package/xz/Makefile @@ -1,12 +1,12 @@ # 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 +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xz -PKG_VERSION:= 5.0.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 19d924e066b6fff0bc9d1981b4e53196 +PKG_VERSION:= 5.2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= be585bdf8672e4406632eda3d819e284 PKG_DESCR:= compression utility PKG_SECTION:= app/archive PKG_DEPENDS:= libxz @@ -17,28 +17,28 @@ PKG_LIBNAME:= libxz PKG_OPTS:= dev PKG_BB:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= XZ LIBXZ PKGSD_LIBXZ:= xz compression library PKGSC_LIBXZ:= libs/comp -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBXZ,libxz,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXZ},${PKGSD_LIBXZ},${PKGSC_LIBXZ},${PKG_OPTS})) +$(eval $(call HOST_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call PKG_template,LIBXZ,libxz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LIBXZ),$(PKGSD_LIBXZ),$(PKGSC_LIBXZ),$(PKG_OPTS))) HOST_CONFIGURE_ARGS+= --disable-shared xz-install: - ${INSTALL_DIR} ${IDIR_XZ}/usr/bin - ${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin + $(INSTALL_DIR) $(IDIR_XZ)/usr/bin + $(CP) $(WRKINST)/usr/bin/* $(IDIR_XZ)/usr/bin libxz-install: - ${INSTALL_DIR} ${IDIR_LIBXZ}/usr/lib - ${CP} ${WRKINST}/usr/lib/liblzma.so* ${IDIR_LIBXZ}/usr/lib + $(INSTALL_DIR) $(IDIR_LIBXZ)/usr/lib + $(CP) $(WRKINST)/usr/lib/liblzma.so* $(IDIR_LIBXZ)/usr/lib -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xz/patches/patch-build-aux_ltmain_sh b/package/xz/patches/patch-build-aux_ltmain_sh deleted file mode 100644 index b9ae6dddf..000000000 --- a/package/xz/patches/patch-build-aux_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- xz-5.0.0.orig/build-aux/ltmain.sh 2010-10-23 16:48:07.000000000 +0200 -+++ xz-5.0.0/build-aux/ltmain.sh 2011-01-17 17:54:37.000000000 +0100 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" |