Changeset 108322 in vbox

Timestamp:

Feb 21, 2025 11:38:25 AM (3 weeks ago)

Author:

vboxsync

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

167668

Message:

libs/xpcom18a4: Replace xpidl with xpidl-new which enables us to drop the dreaded libIDL dependency (library is dead for well over a decade), bugref:10321

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (4 diffs)
• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)
• src/libs/xpcom18a4/xpcom/typelib/xpidl (moved) (moved from trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl-new )

trunk/Config.kmk

@@ -2745 +2745 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
- ifneq ($(KBUILD_TARGET),os2)
-  # libIDL-config (for xpcom18a4)
-  ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
-   ifeq ($(KBUILD_HOST),solaris)
-    VBOX_LIBIDL_CONFIG_FALLBACK = $(lastword $(wildcard $(KBUILD_DEVTOOLS)/solaris.amd64/libIDL/*/bin/libIDL-config-2))
-   endif
-   export VBOX_LIBIDL_CONFIG := $(firstword $(which libIDL-config-2 libIDL-config) $(VBOX_LIBIDL_CONFIG_FALLBACK) libIDL-config-2-not-found)
-  endif
- endif
 endif
 

trunk/configure

@@ -91 +91 @@
 WITH_JAVA=1
 WITH_VMMRAW=1
-WITH_LIBIDL=1
 WITH_QT6=1
 WITH_SDL=1
@@ -768 +767 @@
 
 #
-# Check for libIDL, needed by xpcom
-#
-check_libidl()
-{
-  test_header libIDL
-
-  if which_wrapper libIDL-config-2 > /dev/null; then
-    libidl_ver=`libIDL-config-2 --version`
-    if [ $? -ne 0 ]; then
-      log_failure "libIDL-config-2 not working"
-      fail
-    else
-      log_success "found version $libidl_ver"
-      cnf_append "VBOX_LIBIDL_CONFIG" \
-        "PKG_CONFIG_PATH=`libIDL-config-2 --prefix`/$LIB/pkgconfig `which_wrapper libIDL-config-2`"
-    fi
-  elif check_avail "libIDL-config" libIDL-config; then
-    libidl_ver=`libIDL-config --version`
-    if [ $? -ne 0 ]; then
-      log_failure "libIDL-config not working"
-      fail
-    else
-      log_success "found version $libidl_ver"
-      cnf_append "VBOX_LIBIDL_CONFIG" "`which_wrapper libIDL-config`"
-    fi
-  fi
-}
-
-
-#
 # Check for libdevmapper, needed by the VBoxVolInfo
 #
@@ -2612 +2581 @@
   WITH_DBUS=0
   WITH_KMODS=0
-  WITH_LIBIDL=0
   WITH_XPCOM=0
   BUILD_LIBXSLT=1
@@ -3000 +2968 @@
   [ "$OS" != "darwin"  ] && check_pthread
   check_libxml2
-  [ $WITH_LIBIDL -eq 1 ] && check_libidl
   check_z
   check_lzf

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -313 +313 @@
         xpcom/typelib/xpt/src/xpt_arena.c \
         xpcom/typelib/xpt/src/xpt_struct.c \
-        xpcom/typelib/xpt/src/xpt_xdr.c
-
-# We do these ONCE.
-libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
-libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
-xpidl_CFLAGS = \
-        $(libIDL_config_cflags)
-if1of ($(KBUILD_HOST), linux solaris)
- xpidl_LDFLAGS = \
-        $(filter-out -l%,$(libIDL_config_libs))
- xpidl_LIBS.$(KBUILD_HOST) += \
-        $(subst -l,,$(filter -l%,$(libIDL_config_libs)))
-else
- ifeq ($(KBUILD_HOST),darwin)
-  # Need to put the SDK /usr/lib before the libIDL path to make it pick the system iconv
-  xpidl_LDFLAGS = \
-        -L$(VBOX_PATH_MACOSX_SDK)/usr/lib \
-        $(libIDL_config_libs)
- else
-  xpidl_LDFLAGS = \
-        $(libIDL_config_libs)
- endif
-endif
-xpidl_LDFLAGS.linux = \
-        $(VBOX_LD_as_needed)
+        xpcom/typelib/xpt/src/xpt_xdr.c \
+        ../../VBox/Runtime/common/script/scriptlex.cpp
+
 
 #