From 394037e6acfa82d8fab33022f13f613d916aebbd Mon Sep 17 00:00:00 2001 From: Rechi Date: Tue, 23 Apr 2019 08:59:26 +0200 Subject: [depends] bump dpkg to 1.19.6 - darwin doesn't have gnu patch - darwin perl version is 5.18.2 - dpkg-deb on ios (jailbreak) can't handle xz compression and gzip compression is bad, therfore allow using lzma compression --- tools/darwin/packaging/ios/mkdeb-ios.sh.in | 2 +- tools/depends/native/Makefile | 1 + tools/depends/native/dpkg-native/01-no-gnu-patch.patch | 10 ++++++++++ tools/depends/native/dpkg-native/02-perl-min-version.patch | 11 +++++++++++ tools/depends/native/dpkg-native/03-lzma-compression.patch | 11 +++++++++++ tools/depends/native/dpkg-native/Makefile | 14 +++++++++----- 6 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 tools/depends/native/dpkg-native/01-no-gnu-patch.patch create mode 100644 tools/depends/native/dpkg-native/02-perl-min-version.patch create mode 100644 tools/depends/native/dpkg-native/03-lzma-compression.patch diff --git a/tools/darwin/packaging/ios/mkdeb-ios.sh.in b/tools/darwin/packaging/ios/mkdeb-ios.sh.in index 00e3363a24..a08ca9b88d 100644 --- a/tools/darwin/packaging/ios/mkdeb-ios.sh.in +++ b/tools/darwin/packaging/ios/mkdeb-ios.sh.in @@ -133,7 +133,7 @@ echo Packaging $PACKAGE export COPYFILE_DISABLE=true export COPY_EXTENDED_ATTRIBUTES_DISABLE=true # -${SUDO} dpkg-deb -bZ lzma $DIRNAME/$PACKAGE $DIRNAME/$ARCHIVE +${SUDO} dpkg-deb -bZ lzma --no-uniform-compression $DIRNAME/$PACKAGE $DIRNAME/$ARCHIVE ${SUDO} chown 501:20 $DIRNAME/$ARCHIVE dpkg-deb --info $DIRNAME/$ARCHIVE dpkg-deb --contents $DIRNAME/$ARCHIVE diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile index ba5b8eba8d..6b06981d42 100644 --- a/tools/depends/native/Makefile +++ b/tools/depends/native/Makefile @@ -40,6 +40,7 @@ all: native # Dependency layout for parallel builds autoconf-native: m4-native automake-native: autoconf-native +dpkg-native: automake-native gettext-native libtool-native pkg-config-native tar-native flatbuffers-native: cmake-native libtool-native: automake-native libpng-native: zlib-native diff --git a/tools/depends/native/dpkg-native/01-no-gnu-patch.patch b/tools/depends/native/dpkg-native/01-no-gnu-patch.patch new file mode 100644 index 0000000000..7536983fee --- /dev/null +++ b/tools/depends/native/dpkg-native/01-no-gnu-patch.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -74,7 +74,6 @@ + DPKG_C_C99 + AC_PROG_CXX + DPKG_CXX_CXX11 +-DPKG_PROG_PATCH + AC_CHECK_PROGS([DOXYGEN], [doxygen]) + AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) + DPKG_PROG_PO4A diff --git a/tools/depends/native/dpkg-native/02-perl-min-version.patch b/tools/depends/native/dpkg-native/02-perl-min-version.patch new file mode 100644 index 0000000000..4fb60eff39 --- /dev/null +++ b/tools/depends/native/dpkg-native/02-perl-min-version.patch @@ -0,0 +1,11 @@ +--- a/m4/dpkg-progs.m4 ++++ b/m4/dpkg-progs.m4 +@@ -7,7 +7,7 @@ + # Locate perl interpreter in the path + AC_DEFUN([DPKG_PROG_PERL], [ + AC_ARG_VAR([PERL], [Perl interpreter])dnl +- m4_define([_PERL_MIN_VERSION], [5.20.2]) ++ m4_define([_PERL_MIN_VERSION], [5.18.2]) + AC_SUBST([PERL_MIN_VERSION], [_PERL_MIN_VERSION]) + AC_CACHE_CHECK([for perl >= _PERL_MIN_VERSION], [ac_cv_path_PERL], [ + AC_PATH_PROGS_FEATURE_CHECK([PERL], [perl], [ diff --git a/tools/depends/native/dpkg-native/03-lzma-compression.patch b/tools/depends/native/dpkg-native/03-lzma-compression.patch new file mode 100644 index 0000000000..c9bf5355e6 --- /dev/null +++ b/tools/depends/native/dpkg-native/03-lzma-compression.patch @@ -0,0 +1,11 @@ +--- a/dpkg-deb/main.c ++++ b/dpkg-deb/main.c +@@ -195,7 +195,7 @@ + if (compress_params.type == COMPRESSOR_TYPE_UNKNOWN) + badusage(_("unknown compression type '%s'!"), value); + if (compress_params.type == COMPRESSOR_TYPE_LZMA) +- badusage(_("obsolete compression type '%s'; use xz instead"), value); ++ warning(_("obsolete compression type '%s'; use xz instead"), value); + if (compress_params.type == COMPRESSOR_TYPE_BZIP2) + badusage(_("obsolete compression type '%s'; use xz or gzip instead"), value); + } diff --git a/tools/depends/native/dpkg-native/Makefile b/tools/depends/native/dpkg-native/Makefile index d2df9f2343..755ac12c44 100644 --- a/tools/depends/native/dpkg-native/Makefile +++ b/tools/depends/native/dpkg-native/Makefile @@ -1,17 +1,17 @@ include ../../Makefile.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) -DEPS= ../../Makefile.include Makefile +DEPS= ../../Makefile.include Makefile 01-no-gnu-patch.patch 02-perl-min-version.patch 03-lzma-compression.patch # lib name, version LIBNAME=dpkg -VERSION=1.14.30 +VERSION=1.19.6 SOURCE=$(LIBNAME)_$(VERSION) -ARCHIVE=$(SOURCE).tar.gz +ARCHIVE=$(SOURCE).tar.xz # configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --enable-static --disable-shared \ - --disable-linker-optimisations --disable-nls --without-dselect --without-start-stop-daemon \ +CONFIGURE=./configure --prefix=$(PREFIX) --enable-static --disable-shared --disable-devel-docs \ + --disable-linker-optimizations --disable-nls --disable-dselect --disable-start-stop-daemon \ ac_cv_header_libintl_h=no LIBDYLIB=$(PLATFORM)/dpkg-deb/dpkg-deb @@ -24,6 +24,10 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 -i ../01-no-gnu-patch.patch + cd $(PLATFORM); patch -p1 -i ../02-perl-min-version.patch + cd $(PLATFORM); patch -p1 -i ../03-lzma-compression.patch + cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) -- cgit v1.2.3