diff --git a/archiver/xz/0002-opensde-use-automake-1.11.patch b/archiver/xz/0002-opensde-use-automake-1.11.patch deleted file mode 100644 index be6016f5c..000000000 --- a/archiver/xz/0002-opensde-use-automake-1.11.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../xz/0002-opensde-use-automake-1.11.patch -# Copyright (C) 2013 - 2015 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -OpenSDE specific workaround because we are using automake 1.11.x on master -at this moment, which doesn't support the 'serial-tests' option. - ---- ./configure.ac.orig 2014-12-21 19:49:36.000000000 +0100 -+++ ./configure.ac 2015-02-04 10:28:46.658258635 +0100 -@@ -486,7 +486,7 @@ - # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354 - # The -Wno-unsupported is used to silence warnings about missing - # "subdir-objects". --AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests -Wno-unsupported]) -+AM_INIT_AUTOMAKE([1.11 foreign tar-v7 filename-length-max=99 -Wno-unsupported]) - AC_PROG_LN_S - - AC_PROG_CC_C99 diff --git a/archiver/xz/xz.conf b/archiver/xz/xz.conf index 17ae8c005..1dbbb20d3 100644 --- a/archiver/xz/xz.conf +++ b/archiver/xz/xz.conf @@ -12,8 +12,6 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -# we patch autotools file like configure.ac -autogen=1 - var_append GCC_WRAPPER_APPEND ' ' '-std=gnu99' var_append SYSGCC_WRAPPER_APPEND ' ' '-std=gnu99' +var_append makeopt ' ' 'CFLAGS="-std=gnu99"' diff --git a/archiver/xz/xz.desc b/archiver/xz/xz.desc index 0b5398724..6cb03cc3d 100644 --- a/archiver/xz/xz.desc +++ b/archiver/xz/xz.desc @@ -30,7 +30,7 @@ [L] PublicDomain [S] Stable -[V] 5.2.1 +[V] 5.2.2 [P] X 01---5---9 106.000 -[D] 1482163543 xz-5.2.1.tar.bz2 http://tukaani.org/xz/ +[D] 1318972224 xz-5.2.2.tar.bz2 http://tukaani.org/xz/