Changeset 98013 in vbox

Timestamp:

Jan 6, 2023 6:53:06 PM (2 years ago)

Author:

vboxsync

Message:

libs/curl: Use the correct curl_config.h file for the VBox-libcurl-x86 target. Use INSTALL_STAGING rather than CP to copy it, so it can be hard linked (saves space and time).

File:

• trunk/src/libs/curl-7.83.1/Makefile.kmk (modified) (3 diffs)

trunk/src/libs/curl-7.83.1/Makefile.kmk

@@ -52 +52 @@
         CURL_DISABLE_SMTP \
         CURL_DISABLE_TELNET
-VBox-libcurl_DEPS           = $(VBox-libcurl_0_OUTDIR)/lib/curl_config.h
-VBox-libcurl_CLEAN          = $(VBox-libcurl_DEPS)
 VBox-libcurl_CFLAGS.win    += -wd4826 # formdata.c(390) : warning C4826: Conversion from 'char *' to 'curl_off_t' is sign-extended. This may cause unexpected runtime behavior.
 VBox-libcurl_CFLAGS.win    += -wd4310 # warnless.c(189) : warning C4310: cast truncates constant value
@@ -60 +58 @@
  VBox-libcurl_CFLAGS.win   += -wd4774 # mprintf.c(949): warning C4774: 'sprintf' : format string expected in argument 2 is not a string literal
 endif
-VBox-libcurl_INCS           = include $(VBox-libcurl_0_OUTDIR)/lib $(VBOX_PATH_LIBCURL)/lib
+VBox-libcurl_INCS           = \
+        include \
+        $(VBox-libcurl_0_OUTDIR)/lib \
+        $(VBOX_PATH_LIBCURL)/lib
 VBox-libcurl_SOURCES        = \
         lib/base64.c \
@@ -147 +148 @@
         lib/version_win32.c
 
+# Use checked in config.h instead of running ./configure for it.
+VBox-libcurl_DEPS  = $(VBox-libcurl_0_OUTDIR)/lib/curl_config.h
+VBox-libcurl_CLEAN = $(VBox-libcurl_DEPS)
+$$(VBox-libcurl_0_OUTDIR)/lib/curl_config.h: $(VBOX_PATH_LIBCURL)/config.h.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) | $$(dir $$@)
+        $(INSTALL_STAGING) -- "$^" "$@"
+
 ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
  LIBRARIES += VBox-libcurl-x86
  VBox-libcurl-x86_TEMPLATE = VBoxR3DllNonPedantic-x86
- VBox-libcurl-x86_EXTENDS = VBox-libcurl
+ VBox-libcurl-x86_EXTENDS  = VBox-libcurl
+ VBox-libcurl-x86_INCS     = \
+        include \
+        $(VBox-libcurl-x86_0_OUTDIR)/lib \
+        $(VBOX_PATH_LIBCURL)/lib
+ VBox-libcurl-x86_DEPS     = $(VBox-libcurl-x86_0_OUTDIR)/lib/curl_config.h
+ VBox-libcurl-x86_CLEAN    = $(VBox-libcurl-x86_DEPS)
+ $$(VBox-libcurl-x86_0_OUTDIR)/lib/curl_config.h: $(VBOX_PATH_LIBCURL)/config.h.$(KBUILD_TARGET).x86 | $$(dir $$@)
+        $(INSTALL_STAGING) -- "$^" "$@"
+
 endif
 
 include $(FILE_KBUILD_SUB_FOOTER)
 
-#
-# Use checked in config.h instead of running ./configure for it.
-#
-libcurl_config.h.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(VBOX_PATH_LIBCURL)/config.h.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
 
-$$(VBox-libcurl_0_OUTDIR)/lib/curl_config.h: $(libcurl_config.h.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) | $$(dir $$@)
-        $(CP) -f $^ $@
-