From a985c8ace4428264c6fac42f8ce497f28c2e8313 Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Mon, 25 Oct 2021 15:06:19 -0400 Subject: [PATCH] Update Patchelf to 0.13 Co-authored-by: Jameson Nash --- deps/Versions.make | 2 +- deps/checksums/patchelf | 4 ++-- deps/patchelf.mk | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/deps/Versions.make b/deps/Versions.make index 7a05556d67301..083dc0b48a1b8 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -89,7 +89,7 @@ OPENLIBM_VER := 0.7.3 OPENLIBM_JLL_NAME := OpenLibm # Patchelf (we don't ship this or even use a JLL, we just always build it) -PATCHELF_VER := 0.9 +PATCHELF_VER := 0.13 # p7zip P7ZIP_VER := 16.2.0 diff --git a/deps/checksums/patchelf b/deps/checksums/patchelf index d30c53e73a1ac..a7122c400749a 100644 --- a/deps/checksums/patchelf +++ b/deps/checksums/patchelf @@ -1,2 +1,2 @@ -patchelf-0.9.tar.gz/md5/3c265508526760f233620f35d79c79fc -patchelf-0.9.tar.gz/sha512/715db21156e6bd91cfa626f5201b32a6619e51532f5635ef52396da8193738ba66113485b61cc1e218b16737e66f72cc2e4bb3a7a33e73061ac2ef2c6330a299 +patchelf-0.13.tar.bz2/md5/d387eee9325414be0b1a80c8fbd2745f +patchelf-0.13.tar.bz2/sha512/43c3f99fe922e2f34d860389165bcc2b0f3f3317e124eb8443017f71b1f223d96a7c815dc81f51b14958b7dc316f75c4ab367ccc287cd99c82abe890b09a478d diff --git a/deps/patchelf.mk b/deps/patchelf.mk index f9e343dabc21c..38a045ccb7116 100644 --- a/deps/patchelf.mk +++ b/deps/patchelf.mk @@ -1,15 +1,16 @@ ## patchelf ## -$(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.gz: | $(SRCCACHE) - $(JLDOWNLOAD) $@ https://nixos.org/releases/patchelf/patchelf-$(PATCHELF_VER)/patchelf-$(PATCHELF_VER).tar.gz +$(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2: | $(SRCCACHE) + $(JLDOWNLOAD) $@ https://github.com/NixOS/patchelf/releases/download/$(PATCHELF_VER)/patchelf-$(PATCHELF_VER).tar.bz2 -$(SRCCACHE)/patchelf-$(PATCHELF_VER)/source-extracted: $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.gz +$(SRCCACHE)/patchelf-$(PATCHELF_VER)/source-extracted: $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2 $(JLCHECKSUM) $< - cd $(dir $<) && $(TAR) zxf $< + mkdir $(dir $@) + cd $(dir $@) && $(TAR) jxf $< --strip-components=1 touch -c $(SRCCACHE)/patchelf-$(PATCHELF_VER)/configure # old target echo 1 > $@ -checksum-patchelf: $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.gz +checksum-patchelf: $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2 $(JLCHECKSUM) $< $(BUILDDIR)/patchelf-$(PATCHELF_VER)/build-configured: CC:=$(HOSTCC)