Changeset 100582 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Jul 14, 2023 2:08:33 PM (21 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158412

Message:

Additions/VBoxClient: Better variable scoping for lib version defines. bugref:10427

File:

• trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -228 +228 @@
  # Note: Solaris does *not* have any of those libs with a version suffix, so simply keep those empty (= unset) then.
  if1of ($(KBUILD_TARGET), linux)
-  LIBX11_VER = 6
-  LIBXT_VER = 6
-  LIBXMU_VER = 6
-  LIBXRANDR_VER = 2
+  VBOX_VBOXCLIENT_LIBX11_VER = 6
+  VBOX_VBOXCLIENT_LIBXT_VER = 6
+  VBOX_VBOXCLIENT_LIBXMU_VER = 6
+  VBOX_VBOXCLIENT_LIBXRANDR_VER = 2
  endif
  ## Dynamic import no. 1: libX11.so.6
- $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libX11.def,libX11,$(LIBX11_VER))
+ $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libX11.def,libX11,$(VBOX_VBOXCLIENT_LIBX11_VER))
  ## Dynamic import no. 2: libXt.so.6
- $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libXt.def,libXt,$(LIBXT_VER))
+ $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libXt.def,libXt,$(VBOX_VBOXCLIENT_LIBXT_VER))
  ## Dynamic import no. 3: libXmu.so.6
- $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libXmu.def,libXmu,$(LIBXMU_VER))
+ $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libXmu.def,libXmu,$(VBOX_VBOXCLIENT_LIBXMU_VER))
  ## Dynamic import no. 4: libXrandr.so.2
- $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libXrandr.def,libXrandr,$(LIBXRANDR_VER))
+ $(evalcall2 def_libToLazyLoad,$(PATH_ROOT)/src/VBox/GuestHost/libXrandr.def,libXrandr,$(VBOX_VBOXCLIENT_LIBXRANDR_VER))
 endif