From d3dc77c5b9bdebacf58e2d6f50e0f90240b12441 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 9 Sep 2024 08:30:41 +0800 Subject: [PATCH] Bump XZ to 5.6.2, and remove version specifiers from patch names. --- Makefile | 6 +++--- patch/{mpdecimal-4.0.0.patch => mpdecimal.patch} | 0 patch/{xz-5.4.7.patch => xz.patch} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename patch/{mpdecimal-4.0.0.patch => mpdecimal.patch} (100%) rename patch/{xz-5.4.7.patch => xz.patch} (100%) diff --git a/Makefile b/Makefile index 7fc5c5a..18961f0 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ BUILD_NUMBER=custom BZIP2_VERSION=1.0.8 -XZ_VERSION=5.4.7 +XZ_VERSION=5.6.2 # Preference is to use OpenSSL 3; however, Cryptography 3.4.8 (and # probably some other packages as well) only works with 1.1.1, so @@ -237,7 +237,7 @@ $$(XZ_SRCDIR-$(target))/configure: downloads/xz-$(XZ_VERSION).tar.gz mkdir -p $$(XZ_SRCDIR-$(target)) tar zxf $$< --strip-components 1 -C $$(XZ_SRCDIR-$(target)) # Patch the source to add support for new platforms - cd $$(XZ_SRCDIR-$(target)) && patch -p1 < $(PROJECT_DIR)/patch/xz-$(XZ_VERSION).patch + cd $$(XZ_SRCDIR-$(target)) && patch -p1 < $(PROJECT_DIR)/patch/xz.patch # Touch the configure script to ensure that Make identifies it as up to date. touch $$(XZ_SRCDIR-$(target))/configure @@ -365,7 +365,7 @@ $$(MPDECIMAL_SRCDIR-$(target))/configure: downloads/mpdecimal-$(MPDECIMAL_VERSIO mkdir -p $$(MPDECIMAL_SRCDIR-$(target)) tar zxf $$< --strip-components 1 -C $$(MPDECIMAL_SRCDIR-$(target)) # Patch the source to add support for new platforms - cd $$(MPDECIMAL_SRCDIR-$(target)) && patch -p1 < $(PROJECT_DIR)/patch/mpdecimal-$(MPDECIMAL_VERSION).patch + cd $$(MPDECIMAL_SRCDIR-$(target)) && patch -p1 < $(PROJECT_DIR)/patch/mpdecimal.patch # Touch the configure script to ensure that Make identifies it as up to date. touch $$(MPDECIMAL_SRCDIR-$(target))/configure diff --git a/patch/mpdecimal-4.0.0.patch b/patch/mpdecimal.patch similarity index 100% rename from patch/mpdecimal-4.0.0.patch rename to patch/mpdecimal.patch diff --git a/patch/xz-5.4.7.patch b/patch/xz.patch similarity index 100% rename from patch/xz-5.4.7.patch rename to patch/xz.patch