Merge pull request #22780 from lrusak/depends-native-fixes

9 files changed, 24 insertions, 44 deletions

diff --git a/tools/depends/native/JsonSchemaBuilder/Makefile b/tools/depends/native/JsonSchemaBuilder/Makefile
index e1c42b6e85..e01a035616 100644
--- a/tools/depends/native/JsonSchemaBuilder/Makefile
+++ b/tools/depends/native/JsonSchemaBuilder/Makefile
@@ -1,19 +1,8 @@
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
--include ../../Makefile.include
-DEPS=Makefile
-
-ifeq ($(NATIVEPREFIX),)
-  PREFIX = $(ROOT_DIR)
-else
-  PREFIX = $(NATIVEPREFIX)
-endif
-
-ifeq ($(NATIVEPLATFORM),)
-  PLATFORM = native
-else
-  PLATFORM = $(NATIVEPLATFORM)
-  DEPS += ../../Makefile.include
-endif
+include ../../Makefile.include
+PREFIX=$(NATIVEPREFIX)
+PLATFORM=$(NATIVEPLATFORM)
+DEPS =../../Makefile.include Makefile
 
 SOURCE=$(ROOT_DIR)/src
 
diff --git a/tools/depends/native/TexturePacker/Makefile b/tools/depends/native/TexturePacker/Makefile
index ec7178d786..fb1a0b6398 100644
--- a/tools/depends/native/TexturePacker/Makefile
+++ b/tools/depends/native/TexturePacker/Makefile
@@ -1,20 +1,8 @@
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
--include ../../Makefile.include
-DEPS=Makefile
-
-ifeq ($(NATIVEPREFIX),)
-  PREFIX = $(ROOT_DIR)
-else
-  PREFIX = $(NATIVEPREFIX)
-endif
-
-ifeq ($(NATIVEPLATFORM),)
-  PLATFORM = native
-  EXTRA_CONFIGURE = --enable-static
-else
-  PLATFORM = $(NATIVEPLATFORM)
-  DEPS += ../../Makefile.include
-endif
+include ../../Makefile.include
+PREFIX=$(NATIVEPREFIX)
+PLATFORM=$(NATIVEPLATFORM)
+DEPS =../../Makefile.include Makefile
 
 ifeq ($(NATIVE_OS), linux)
   EXTRA_CONFIGURE = --enable-static
diff --git a/tools/depends/target/crossguid/Makefile b/tools/depends/target/crossguid/Makefile
index da01c39e25..52319e9aed 100644
--- a/tools/depends/target/crossguid/Makefile
+++ b/tools/depends/target/crossguid/Makefile
@@ -4,6 +4,10 @@ DEPS = Makefile CROSSGUID-VERSION ../../download-files.include \
                                   001-fix-unused-function.patch \
                                   002-disable-Wall-error.patch
 
+CMAKE_OPTIONS=-DCROSSGUID_TESTS=OFF \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DDISABLE_WALL=ON
+
 ifeq ($(CROSS_COMPILING), yes)
   DEPS += ../../Makefile.include
 else
@@ -19,16 +23,12 @@ else
     ARCHIVE_TOOL := tar
     ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf
     CMAKE := cmake
-    CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_OPTIONS)
+    CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_INSTALL_LIBDIR=lib $(CMAKE_OPTIONS)
     HASH_TOOL = sha512sum
     HASH_TOOL_FLAGS = -c --status
   endif
 endif
 
-CMAKE_OPTIONS=-DCROSSGUID_TESTS=OFF \
-              -DCMAKE_BUILD_TYPE=Release \
-              -DDISABLE_WALL=ON
-
 LIBDYLIB=$(PLATFORM)/$(BYPRODUCT)
 
 include ../../download-files.include
diff --git a/tools/depends/target/dav1d/Makefile b/tools/depends/target/dav1d/Makefile
index 4c26dd61a2..dd0ce558fb 100644
--- a/tools/depends/target/dav1d/Makefile
+++ b/tools/depends/target/dav1d/Makefile
@@ -22,7 +22,7 @@ else
     TARBALLS_LOCATION = $(ROOT_DIR)
     HASH_TOOL = sha512sum
     HASH_TOOL_FLAGS = -c --status
-    DAV1D_INSTALL_PREFIX = --prefix $(PREFIX)
+    DAV1D_INSTALL_PREFIX = --prefix $(PREFIX) --libdir $(PREFIX)/lib
     MESON = meson
     NINJA = ninja
   endif
diff --git a/tools/depends/target/flatbuffers/Makefile b/tools/depends/target/flatbuffers/Makefile
index bb857c0410..556c0d475b 100644
--- a/tools/depends/target/flatbuffers/Makefile
+++ b/tools/depends/target/flatbuffers/Makefile
@@ -13,7 +13,7 @@ ifeq ($(PLATFORM),)
 	ARCHIVE_TOOL := tar
 	ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf
 	CMAKE := cmake
-	CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_OPTIONS)
+	CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_INSTALL_LIBDIR=lib $(CMAKE_OPTIONS)
 	BUILD_FLATC=ON
 	HASH_TOOL := sha512sum
 	HASH_TOOL_FLAGS = -c --status
diff --git a/tools/depends/target/fmt/Makefile b/tools/depends/target/fmt/Makefile
index 23abe8e47b..642d8c8583 100644
--- a/tools/depends/target/fmt/Makefile
+++ b/tools/depends/target/fmt/Makefile
@@ -19,7 +19,7 @@ else
     ARCHIVE_TOOL := tar
     ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf
     CMAKE := cmake
-    CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_OPTIONS)
+    CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_INSTALL_LIBDIR=lib $(CMAKE_OPTIONS)
     HASH_TOOL := sha512sum
   endif
 endif
diff --git a/tools/depends/target/spdlog/Makefile b/tools/depends/target/spdlog/Makefile
index d89fef49d4..9e8b36d401 100644
--- a/tools/depends/target/spdlog/Makefile
+++ b/tools/depends/target/spdlog/Makefile
@@ -24,7 +24,7 @@ else
     RETRIEVE_TOOL_FLAGS := -LsS --create-dirs --retry 10 --retry-connrefused -o
     ARCHIVE_TOOL := tar
     ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf
-    CMAKE := cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_PREFIX_PATH=$(PREFIX)
+    CMAKE := cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_PREFIX_PATH=$(PREFIX)
     HASH_TOOL := sha512sum
     HASH_TOOL_FLAGS = -c --status
   endif
diff --git a/tools/depends/target/wayland-protocols/Makefile b/tools/depends/target/wayland-protocols/Makefile
index 67781e81e2..0364867fdf 100644
--- a/tools/depends/target/wayland-protocols/Makefile
+++ b/tools/depends/target/wayland-protocols/Makefile
@@ -7,7 +7,6 @@ VERSION=1.24
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
 SHA512=4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
-include ../../download-files.include
 
 ifeq ($(PLATFORM),)
 	# Building stand-alone
@@ -19,6 +18,7 @@ ifeq ($(PLATFORM),)
 	RETRIEVE_TOOL_FLAGS := -LsS --create-dirs --retry 10 --retry-connrefused -o
 	ARCHIVE_TOOL := tar
 	ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf
+	AUTORECONF := autoreconf
 else
 	# Building as part of depends
 	DEPS += ../../Makefile.include
@@ -36,6 +36,7 @@ CONFIGURE = $(PYTHON) $(MESON) $(NATIVEPREFIX)/bin/meson \
 	--buildtype=$(MESON_BUILD_TYPE) \
 	-Dtests=false
 
+include ../../download-files.include
 all: .installed-$(PLATFORM)
 
 $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
@@ -51,6 +52,7 @@ endif
 
 .installed-$(PLATFORM): $(PLATFORM)
 	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v install
+	mkdir -p $(PREFIX)/lib/pkgconfig
 	ln -sf $(PREFIX)/share/pkgconfig/wayland-protocols.pc $(PREFIX)/lib/pkgconfig/wayland-protocols.pc
 	touch $@
 
diff --git a/tools/depends/target/waylandpp/Makefile b/tools/depends/target/waylandpp/Makefile
index 7eedeedb9e..4631a4668e 100644
--- a/tools/depends/target/waylandpp/Makefile
+++ b/tools/depends/target/waylandpp/Makefile
@@ -7,7 +7,6 @@ VERSION=0.2.8
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 SHA512=bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
-include ../../download-files.include
 
 LIBDYLIB=$(PLATFORM)/build/libwayland-client++.so
 
@@ -22,7 +21,7 @@ ifeq ($(PLATFORM),)
 	ARCHIVE_TOOL := tar
 	ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf
 	CMAKE := cmake
-	CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DBUILD_SCANNER=ON $(CMAKE_OPTIONS)
+	CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SCANNER=ON $(CMAKE_OPTIONS)
 else
 	# Building as part of depends
 	DEPS += ../../Makefile.include
@@ -32,6 +31,7 @@ endif
 CMAKE_OPTIONS := -DBUILD_DOCUMENTATION=OFF -DBUILD_LIBRARIES=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF $(CMAKE_OPTIONS)
 BUILDDIR = $(PLATFORM)/build
 
+include ../../download-files.include
 all: .installed-$(PLATFORM)
 
 
@@ -52,9 +52,10 @@ $(LIBDYLIB): $(PLATFORM)
 
 .installed-$(PLATFORM): $(LIBDYLIB)
 	$(MAKE) -C $(BUILDDIR) install
-
+ifneq ($(PLATFORM), native)
 	# We want to use the native wayland-scanner++
 	ln -sf $(NATIVEPREFIX)/lib/pkgconfig/wayland-scanner++.pc $(PREFIX)/lib/pkgconfig/wayland-scanner++.pc
+endif
 	touch $@
 
 clean: