Makefile: add PATCHELF

Freetz-NG · Feb 2, 2023 · d419503 · d419503
1 parent 09898bd
commit d419503
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -94,6 +94,7 @@ CHECK_PREREQ_TOOL:=$(TOOLS_DIR)/prerequisites
 GENERATE_IN_TOOL:=$(TOOLS_DIR)/genin
 TAR:=$(TOOLS_DIR)/tar-gnu
 SED:=sed
+PATCHELF:=patchelf
 PYTHON3=python3
 MESON=meson
 CMAKE=cmake

diff --git a/make/libs/libctlmgr/libctlmgr.mk b/make/libs/libctlmgr/libctlmgr.mk
@@ -26,8 +26,8 @@ $($(PKG)_DIR)/.compiled: $($(PKG)_DIR)/.configured
 		CPPFLAGS="$(strip $(LIBCTLMGR_CPPFLAGS))" \
 		LIB_VERSION="$(LIBCTLMGR_VERSION)" \
 		all
-	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || patchelf --remove-rpath "$(LIBCTLMGR_BINARY)"
-	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || patchelf --replace-needed "libc.so.0" "$(call qstrip,$(FREETZ_AVM_HAS_LIBC_FILE))" "$(LIBCTLMGR_BINARY)"
+	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || $(PATCHELF) --remove-rpath "$(LIBCTLMGR_BINARY)"
+	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || $(PATCHELF) --replace-needed "libc.so.0" "$(call qstrip,$(FREETZ_AVM_HAS_LIBC_FILE))" "$(LIBCTLMGR_BINARY)"
 	@touch "$@"
 
 $($(PKG)_BINARY): $($(PKG)_DIR)/.compiled

diff --git a/make/libs/libmultid/libmultid.mk b/make/libs/libmultid/libmultid.mk
@@ -32,8 +32,8 @@ $($(PKG)_DIR)/.compiled: $($(PKG)_DIR)/.configured
 		CPPFLAGS="$(strip $(LIBMULTID_CPPFLAGS))" \
 		LIB_VERSION="$(LIBMULTID_VERSION)" \
 		all
-	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || patchelf --remove-rpath "$(LIBMULTID_BINARY)"
-	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || patchelf --replace-needed "libc.so.0" "$(call qstrip,$(FREETZ_AVM_HAS_LIBC_FILE))" "$(LIBMULTID_BINARY)"
+	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || $(PATCHELF) --remove-rpath "$(LIBMULTID_BINARY)"
+	[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || $(PATCHELF) --replace-needed "libc.so.0" "$(call qstrip,$(FREETZ_AVM_HAS_LIBC_FILE))" "$(LIBMULTID_BINARY)"
 	@touch "$@"
 
 $($(PKG)_BINARY): $($(PKG)_DIR)/.compiled

diff --git a/make/pkgs/Makefile.in b/make/pkgs/Makefile.in
@@ -320,7 +320,7 @@ endef
 define INSTALL_BINARY_STRIP
 $(INSTALL_FILE) \
 $(TARGET_STRIP) $@; \
-[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || patchelf --set-interpreter $(FREETZ_LIBRARY_DIR)/ld-uClibc.so.1 $@ ;
+[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" != "y" ] || $(PATCHELF) --set-interpreter $(FREETZ_LIBRARY_DIR)/ld-uClibc.so.1 $@ ;
 endef
 define INSTALL_LIBRARY__INT
 chmod 755 $<; \

diff --git a/make/pkgs/python/python.mk b/make/pkgs/python/python.mk
@@ -108,7 +108,7 @@ $($(PKG)_DIR)/.installed: $($(PKG)_DIR)/.compiled
 		\
 		find usr/lib/python$(PYTHON_MAJOR_VERSION)/ -name "*.pyo" -delete; \
 		\
-		[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" == "y" ] && $(FREETZ_BASE_DIR)/$(TOOLS_DIR)/patchelf --set-interpreter /usr/lib/freetz/ld-uClibc.so.1 usr/bin/python$(PYTHON_MAJOR_VERSION); \
+		[ "$(FREETZ_SEPARATE_AVM_UCLIBC)" == "y" ] && $(PATCHELF) --set-interpreter /usr/lib/freetz/ld-uClibc.so.1 usr/bin/python$(PYTHON_MAJOR_VERSION); \
 		\
 		$(TARGET_STRIP) \
 			usr/bin/python$(PYTHON_MAJOR_VERSION) \