Merge pull request #5737 from punchagan/release-openbsd

release: Workaround missing -O option to tar on OpenBSD
ocaml · Dec 12, 2023 · ddee072 · ddee072
2 parents 57c305e + b29086c
commit ddee072
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/master_changes.md b/master_changes.md
@@ -73,6 +73,7 @@ users)
 
 ## Release scripts
   * Workaround incorrect `NGROUPS_MAX` in `<limits.h>` in musl for release builds [#5383 @dra27]
+  * Fix check for adding `-lsha_stubs` only on `master` on OpenBSD [#5733 @punchagan]
 
 ## Admin
 

diff --git a/release/Makefile b/release/Makefile
@@ -52,7 +52,7 @@ build/%.image: build/Dockerfile.%
 	docker build -t opam-build-$* -f $^ build
 	touch $@
 
-SHA_LINK = $(if $(shell tar xOf "$(OUTDIR)/opam-full-$(VERSION).tar.gz" opam-full-$(VERSION)/src_ext/Makefile.sources | grep -F URL_sha),-lsha_stubs)
+SHA_LINK = $(if $(shell mkdir -p build/tmp_extract && tar xzf "$(OUTDIR)/opam-full-$(VERSION).tar.gz" -C build/tmp_extract && grep -F URL_sha build/tmp_extract/opam-full-$(VERSION)/src_ext/Makefile.sources),-lsha_stubs)
 
 # Actually, this is for alpine 3.13, and varies
 CLINKING_linux = \