Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Patchelf #42800

Merged
merged 1 commit into from
Oct 31, 2021
+9 −8
Merged

Update Patchelf #42800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/Versions.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deps/checksums/patchelf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions deps/patchelf.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down