VirtualBox

Ignore:
Timestamp:
Nov 3, 2023 2:09:53 PM (15 months ago)
Author:
vboxsync
Message:

libs/xpcom/Makefile.kmk: Drop os2 form the Makefile as support won't come back, bugref:10545

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r101727 r101730  
    223223        nsprpub/pr/include/md/_netbsd.h \
    224224        nsprpub/pr/include/md/_openbsd.h \
    225         nsprpub/pr/include/md/_os2_errors.h \
    226         nsprpub/pr/include/md/_os2.h \
    227225        nsprpub/pr/include/md/_pcos.h \
    228226        nsprpub/pr/include/md/_solaris.h \
    … …  
    237235        nsprpub/pr/include/md/_netbsd.cfg \
    238236        nsprpub/pr/include/md/_openbsd.cfg \
    239         nsprpub/pr/include/md/_os2.cfg \
    240237        nsprpub/pr/include/md/_solaris32.cfg \
    241238        nsprpub/pr/include/md/_solaris64.cfg
    … …  
    454451        xpcom/typelib/xpt/src/xpt_xdr.c
    455452
    456 ifeq ($(KBUILD_TARGET),os2)
    457  # glib and libIDL needed by XPCOM on OS/2.
    458  ifeq ($(VBOX_PATH_GLIB),)
    459   VBOX_PATH_GLIB := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/glibidl/*/glibidl/gcc335)))
    460  endif
    461  VBOX_PATH_LIBIDL ?= $(VBOX_PATH_GLIB)
    462  ifeq ($(wildcard $(VBOX_PATH_GLIB)),)
    463   $(warning VBOX_PATH_GLIB is "$(VBOX_PATH_GLIB)" which is not a valid directory!)
    464  endif
    465  ifeq ($(wildcard $(VBOX_PATH_LIBIDL)),)
    466   $(warning VBOX_PATH_LIBIDL is "$(VBOX_PATH_LIBIDL)" which is not a valid directory!)
    467  endif
    468  xpidl_INCS = \
    469         $(VBOX_PATH_LIBIDL)/include \
    470         $(VBOX_PATH_GLIB)/include
    471  xpidl_LIBS = \
    472         $(VBOX_PATH_LIBIDL)/lib/libidl.lib \
    473         $(VBOX_PATH_LIBIDL)/lib/glib.lib
    474  # install necessary DLLs to the same place where xpidl goes
    475  INSTALLS += xpidl-DLLS
    476  xpidl_ORDERDEPS = $(xpidl-DLLS_1_TARGET)
    477  xpidl-DLLS_INST = $(xpidl_INST)
    478  # static libraries of these may be provided instead,
    479  # so copy DLLs only when they are present
    480  xpidl-DLLS_SOURCES += $(wildcard $(VBOX_PATH_GLIB)/lib/glib.dll)
    481  xpidl-DLLS_SOURCES += $(wildcard $(VBOX_PATH_LIBIDL)/lib/libIDL.dll)
     453# We do these ONCE.
     454libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
     455libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
     456xpidl_CFLAGS = \
     457        $(libIDL_config_cflags)
     458if1of ($(KBUILD_HOST), linux solaris)
     459 xpidl_LDFLAGS = \
     460        $(filter-out -l%,$(libIDL_config_libs))
     461 xpidl_LIBS.$(KBUILD_HOST) += \
     462        $(subst -l,,$(filter -l%,$(libIDL_config_libs)))
    482463else
    483  # We do these ONCE.
    484  libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
    485  libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
    486  xpidl_CFLAGS = \
    487         $(libIDL_config_cflags)
    488  if1of ($(KBUILD_HOST), linux solaris)
    489   xpidl_LDFLAGS = \
    490         $(filter-out -l%,$(libIDL_config_libs))
    491   xpidl_LIBS.$(KBUILD_HOST) += \
    492         $(subst -l,,$(filter -l%,$(libIDL_config_libs)))
    493  else
    494   xpidl_LDFLAGS = \
    495         $(libIDL_config_libs)
    496  endif
    497  xpidl_LDFLAGS.linux = \
    498         $(VBOX_LD_as_needed)
    499 endif
     464 xpidl_LDFLAGS = \
     465        $(libIDL_config_libs)
     466endif
     467xpidl_LDFLAGS.linux = \
     468        $(VBOX_LD_as_needed)
    500469
    501470#
    … …  
    552521VBox-xpcom-nspr_DEFS.openbsd = \
    553522        _PR_PTHREADS
    554 VBox-xpcom-nspr_DEFS.os2 =
    555523VBox-xpcom-nspr_DEFS.solaris = \
    556524        HAVE_FCNTL_FILE_LOCKING=1 \
    … …  
    645613VBox-xpcom-nspr_SOURCES.linux.amd64 = nsprpub/pr/src/md/unix/os_Linux_x86_64.s
    646614
    647 VBox-xpcom-nspr_SOURCES.os2 = \
    648         nsprpub/pr/src/io/prdir.c \
    649         nsprpub/pr/src/io/prfile.c \
    650         nsprpub/pr/src/io/prio.c \
    651         nsprpub/pr/src/io/prsocket.c \
    652         nsprpub/pr/src/md/os2/os2misc.c \
    653         nsprpub/pr/src/md/os2/os2sem.c \
    654         nsprpub/pr/src/md/os2/os2inrval.c \
    655         nsprpub/pr/src/md/os2/os2gc.c \
    656         nsprpub/pr/src/md/os2/os2thred.c \
    657         nsprpub/pr/src/md/os2/os2io.c \
    658         nsprpub/pr/src/md/os2/os2cv.c \
    659         nsprpub/pr/src/md/os2/os2sock.c \
    660         nsprpub/pr/src/md/os2/os2_errors.c \
    661         nsprpub/pr/src/md/os2/os2poll.c \
    662         nsprpub/pr/src/md/os2/os2rng.c \
    663         nsprpub/pr/src/threads/prdump.c \
    664         nsprpub/pr/src/threads/prmon.c \
    665         nsprpub/pr/src/threads/prsem.c \
    666         nsprpub/pr/src/threads/prcthr.c \
    667         nsprpub/pr/src/threads/combined/prucpu.c \
    668         nsprpub/pr/src/threads/combined/prucv.c \
    669         nsprpub/pr/src/threads/combined/prulock.c \
    670         nsprpub/pr/src/threads/combined/prustack.c \
    671         nsprpub/pr/src/threads/combined/pruthr.c
    672 # gcc/emx sources
    673 VBox-xpcom-nspr_SOURCES.os2 += \
    674         nsprpub/pr/src/md/os2/os2emx.s \
    675         nsprpub/pr/src/md/os2/os2vaclegacy.s
    676 # IBM VAC sources (not used)
    677 #VBox-xpcom-nspr_SOURCES.os2  += \
    678 #       nsprpub/pr/src/md/os2/os2vacpp.asm
    679 
    680615VBox-xpcom-nspr_SOURCES.solaris = nsprpub/pr/src/md/unix/solaris.c
    681616VBox-xpcom-nspr_SOURCES.solaris.x86 = nsprpub/pr/src/md/unix/os_SunOS_x86.s
    … …  
    822757        xpcom/io/nsLocalFileUnix.cpp
    823758endif
    824 VBox-xpcom-io_SOURCES.os2 = \
    825         xpcom/io/nsLocalFileOS2.cpp
    826759$(evalcall VBOX_XPCOM_X86,VBox-xpcom-io)
    827760
    … …  
    874807VBox-xpcom-xptcall_DEFS                  = _IMPL_NS_COM _IMPL_NS_BASE EXPORT_XPTC_API
    875808VBox-xpcom-xptcall_DEFS.darwin           = KEEP_STACK_16_BYTE_ALIGNED
    876 VBox-xpcom-xptcall_DEFS.os2              = MOZ_NEED_LEADING_UNDERSCORE
    877 VBox-xpcom-xptcall_INCS.os2              = xpcom/reflect/xptcall/src/md/unix
    878809VBox-xpcom-xptcall_SOURCES               = xpcom/reflect/xptcall/src/xptcall.cpp
    879810VBox-xpcom-xptcall_SOURCES.freebsd.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
    … …  
    881812VBox-xpcom-xptcall_SOURCES.linux.x86     = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
    882813        xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
    883 VBox-xpcom-xptcall_SOURCES.os2           = xpcom/reflect/xptcall/src/md/os2/xptcinvoke_gcc_x86_os2.cpp \
    884         xpcom/reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp
    885814VBox-xpcom-xptcall_SOURCES.solaris.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp \
    886815        xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
    … …  
    977906        xpcom/build/nsStringAPI.cpp
    978907VBoxXPCOM_SOURCES.darwin = \
    979         vboxdeps.cpp
    980 VBoxXPCOM_SOURCES.os2 = \
    981908        vboxdeps.cpp
    982909VBoxXPCOM_SOURCES.solaris = \
    … …  
    11631090#
    11641091VBoxXPCOMIPCC_TEMPLATE = XPComIpcDll
    1165 VBoxXPCOMIPCC_NAME.os2 = VBoxIPCC
    11661092VBoxXPCOMIPCC_INST = $(INST_BIN)components/
    11671093#VBoxXPCOMIPCC_DEFS = HAVE_DEPENDENT_LIBS - dependentLibs.h is linux specific, so this cannot be required.
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette