Backport p7zip_jll infrastructure changes from f03e9c3

Bring over the p7zip_jll handling improvements from f03e9c3 ([deps] enable zstd support):
- Move p7zip binary from bindir to private_libexecdir
- Add Windows DLL handling for binary builder installs
- Simplify p7zip_jll.jl by removing LIBPATH handling
- Add P7ZIP_BUILD_OPTS variable for consistent build flags

These changes prepare for the p7zip 17.7.0 upgrade and ensure p7zip
is installed in the correct location.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: KristofferC

Makefile

@@ -204,6 +204,9 @@ endif
 
 # private libraries, that are installed in $(prefix)/lib/julia
 JL_PRIVATE_LIBS-0 := libccalltest libccalllazyfoo libccalllazybar libllvmcalltest
+JL_PRIVATE_LIBS-1 := # libraries from USE_SYSTEM=1
+JL_PRIVATE_EXES := 7z
+JL_PRIVATE_TOOLS := lld$(EXE) dsymutil$(EXE)
 ifeq ($(JULIA_BUILD_MODE),release)
 JL_PRIVATE_LIBS-0 += libjulia-internal libjulia-codegen
 else ifeq ($(JULIA_BUILD_MODE),debug)
@@ -325,9 +328,6 @@ endif
 	-$(INSTALL_M) $(wildcard $(build_private_libdir)/*.a) $(DESTDIR)$(private_libdir)/
 	-rm -f $(DESTDIR)$(private_libdir)/sys-o.a
 
-	# We have a single exception; we want 7z.dll to live in private_libexecdir,
-	# not bindir, so that 7z.exe can find it.
-	-mv $(DESTDIR)$(bindir)/7z.dll $(DESTDIR)$(private_libexecdir)/
 	-$(INSTALL_M) $(build_bindir)/libopenlibm.dll.a $(DESTDIR)$(libdir)/
 	-$(INSTALL_M) $(build_libdir)/libssp.dll.a $(DESTDIR)$(libdir)/
 else
@@ -384,14 +384,12 @@ endif
 		done \
 	done
 endif
-	# Install `7z` into private_libexecdir
-	$(INSTALL_M) $(build_bindir)/7z$(EXE) $(DESTDIR)$(private_libexecdir)/
-
-	# Install `lld` into private_libexecdir
-	$(INSTALL_M) $(build_depsbindir)/lld$(EXE) $(DESTDIR)$(private_libexecdir)/
-
-	# Install `dsymutil` into private_libexecdir/
-	$(INSTALL_M) $(build_depsbindir)/dsymutil$(EXE) $(DESTDIR)$(private_libexecdir)/
+	for exe in $(JL_PRIVATE_EXES) ; do \
+		$(INSTALL_M) $(build_private_libexecdir)/$$exe $(DESTDIR)$(private_libexecdir) || exit 1; \
+	done
+	for exe in $(JL_PRIVATE_TOOLS) ; do \
+		$(INSTALL_M) $(build_depsbindir)/$$exe $(DESTDIR)$(private_libexecdir) || exit 1; \
+	done
 
 	# Copy public headers
 	cp -R -L $(build_includedir)/julia/* $(DESTDIR)$(includedir)/julia

deps/p7zip.mk

@@ -3,6 +3,8 @@ include $(SRCDIR)/p7zip.version
 
 ifneq ($(USE_BINARYBUILDER_P7ZIP),1)
 
+P7ZIP_BUILD_OPTS := bindir=$(build_private_libexecdir) CC="$(CC)" CXX="$(CXX)"
+
 $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz: | $(SRCCACHE)
 	$(JLDOWNLOAD) $@ https://github.com/p7zip-project/p7zip/archive/refs/tags/v$(P7ZIP_VER).tar.gz
 
@@ -17,21 +19,21 @@ checksum-p7zip: $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz
 
 $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/source-extracted
 $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-compiled: $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured
-	$(MAKE) -C $(dir $<) $(MAKE_COMMON) CC="$(CC)" CXX="$(CXX)" 7za
+	$(MAKE) -C $(dir $<) $(MAKE_COMMON) $(P7ZIP_BUILD_OPTS) 7za$(EXE)
 	echo 1 > $@
 
 define P7ZIP_INSTALL
-	mkdir -p $2/$$(build_bindir)
-	cp -a $1/bin/7za $2/$$(build_bindir)/7z
+	mkdir -p $2/$$(build_private_libexecdir)/
+	cp -a $1/bin/7za$(EXE) $2/$$(build_private_libexecdir)/7z$(EXE)
 endef
 $(eval $(call staged-install, \
 	p7zip,p7zip-$(P7ZIP_VER), \
 	P7ZIP_INSTALL,,,))
 
 clean-p7zip:
 	-rm -f $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-configured $(BUILDDIR)/p7zip-$(P7ZIP_VER)/build-compiled
-	-rm -f $(build_bindir)/7za
-	-$(MAKE) -C $(BUILDDIR)/p7zip-$(P7ZIP_VER) clean
+	-rm -f $(build_bindir)/7z$(EXE) $(build_bindir)/7z$(EXE) $(build_private_libexecdir)/7z$(EXE)
+	-$(MAKE) -C $(BUILDDIR)/p7zip-$(P7ZIP_VER) $(MAKE_COMMON) $(P7ZIP_BUILD_OPTS) clean
 
 distclean-p7zip:
 	rm -rf $(SRCCACHE)/p7zip-$(P7ZIP_VER).tar.gz $(SRCCACHE)/p7zip-$(P7ZIP_VER) $(BUILDDIR)/p7zip-$(P7ZIP_VER)
@@ -48,5 +50,23 @@ check-p7zip: compile-p7zip
 else # USE_BINARYBUILDER_P7ZIP
 
 $(eval $(call bb-install,p7zip,P7ZIP,false))
+# move from bindir to shlibdir, where we expect to install it
+install-p7zip: post-install-p7zip
+uninstall-p7zip: pre-uninstall-p7zip
+post-install-p7zip: $(build_prefix)/manifest/p7zip
+	mkdir -p $(build_private_libexecdir)/
+	[ ! -e $(build_bindir)/7z$(EXE) ] || mv $(build_bindir)/7z$(EXE) $(build_private_libexecdir)/7z$(EXE)
+	[ -e $(build_private_libexecdir)/7z$(EXE) ]
+ifeq ($(OS),WINNT)
+	[ ! -e $(build_bindir)/7z.dll ] || mv $(build_bindir)/7z.dll $(build_private_libexecdir)/7z.dll
+	[ -e $(build_private_libexecdir)/7z.dll ]
+endif
+pre-uninstall-p7zip:
+	-rm -f $(build_private_libexecdir)/7z$(EXE)
+ifeq ($(OS),WINNT)
+	-rm -f $(build_private_libexecdir)/7z.dll
+endif
+
+.PHONY: post-install-p7zip pre-uninstall-p7zip
 
 endif

stdlib/p7zip_jll/src/p7zip_jll.jl

@@ -4,14 +4,10 @@
 baremodule p7zip_jll
 using Base
 
-const PATH_list = String[]
-const LIBPATH_list = String[]
-
 export p7zip
 
 # These get calculated in __init__()
 const PATH = Ref("")
-const LIBPATH = Ref("")
 artifact_dir::String = ""
 p7zip_path::String = ""
 if Sys.iswindows()
@@ -21,71 +17,44 @@ else
 end
 
 if Sys.iswindows()
-    const LIBPATH_env = "PATH"
-    const LIBPATH_default = ""
     const pathsep = ';'
 elseif Sys.isapple()
-    const LIBPATH_env = "DYLD_FALLBACK_LIBRARY_PATH"
-    const LIBPATH_default = "~/lib:/usr/local/lib:/lib:/usr/lib"
     const pathsep = ':'
 else
-    const LIBPATH_env = "LD_LIBRARY_PATH"
-    const LIBPATH_default = ""
     const pathsep = ':'
 end
 
-function adjust_ENV!(env::Dict{keytype(Base.EnvDict),valtype(Base.EnvDict)}, PATH::String, LIBPATH::String, adjust_PATH::Bool, adjust_LIBPATH::Bool)
-    if adjust_LIBPATH
-        LIBPATH_base = get(env, LIBPATH_env, expanduser(LIBPATH_default))
-        if !isempty(LIBPATH_base)
-            env[LIBPATH_env] = string(LIBPATH, pathsep, LIBPATH_base)
-        else
-            env[LIBPATH_env] = LIBPATH
-        end
-    end
-    if adjust_PATH && (LIBPATH_env != "PATH" || !adjust_LIBPATH)
-        if adjust_PATH
-            if !isempty(get(env, "PATH", ""))
-                env["PATH"] = string(PATH, pathsep, env["PATH"])
-            else
-                env["PATH"] = PATH
-            end
-        end
-    end
-    return env
+function adjust_ENV()
+    addPATH = PATH[]
+    oldPATH = get(ENV, "PATH", "")
+    newPATH = isempty(oldPATH) ? addPATH : "$addPATH$pathsep$oldPATH"
+    return ("PATH"=>newPATH,)
 end
 
-function p7zip(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true)
-    env = adjust_ENV!(copy(ENV), PATH[], LIBPATH[], adjust_PATH, adjust_LIBPATH)
-    withenv(env...) do
-        return f(p7zip_path)
+function p7zip(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true) # deprecated, for compat only
+    withenv((adjust_PATH ? adjust_ENV() : ())...) do
+        return f(p7zip())
     end
 end
-function p7zip(; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true)
-    env = adjust_ENV!(copy(ENV), PATH[], LIBPATH[], adjust_PATH, adjust_LIBPATH)
-    return Cmd(Cmd([p7zip_path]); env)
-end
+# the 7z.exe we ship has no dependencies, so it needs no PATH adjustment
+p7zip(; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true) = `$p7zip_path`
 
 function init_p7zip_path()
     # Prefer our own bundled p7zip, but if we don't have one, pick it up off of the PATH
-    # If this is an in-tree build, `7z` will live in `bindir`.  Otherwise, it'll be in `private_libexecdir`
-    for bundled_p7zip_path in (joinpath(Sys.BINDIR, Base.PRIVATE_LIBEXECDIR, p7zip_exe),
-                               joinpath(Sys.BINDIR, p7zip_exe))
-        if isfile(bundled_p7zip_path)
-            global p7zip_path = abspath(bundled_p7zip_path)
-            return
-        end
+    # Our `7z` lives in `private_libexecdir`
+    bundled_p7zip_path = joinpath(Sys.BINDIR, Base.PRIVATE_LIBEXECDIR, p7zip_exe)
+    if isfile(bundled_p7zip_path)
+        global p7zip_path = abspath(bundled_p7zip_path)
+    else
+        global p7zip_path = something(Sys.which(p7zip_exe), p7zip_exe)
     end
-    global p7zip_path = something(Sys.which(p7zip_exe), p7zip_exe)
 end
 
 function __init__()
     global artifact_dir = dirname(Sys.BINDIR)
     init_p7zip_path()
-    PATH[] = dirname(p7zip_path)
-    push!(PATH_list, PATH[])
-    append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
-    LIBPATH[] = join(LIBPATH_list, pathsep)
+    PATH[] = path = dirname(p7zip_path)
+    nothing
 end
 
 # JLLWrappers API compatibility shims.  Note that not all of these will really make sense.