nodenetcdf 4.9.34 → 4.9.35

package/vcpkg/ports/omniorb/portfile.cmake

@@ -0,0 +1,219 @@
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://netcologne.dl.sourceforge.net/project/omniorb/omniORB/omniORB-${VERSION}/omniORB-${VERSION}.tar.bz2"
+    FILENAME "omniORB-${VERSION}.tar.bz2"
+    SHA512 b081c1acbea3c7bee619a288fec209a0705b7d436f8e5fd4743675046356ef271a8c75882334fcbde4ff77d15f54d2da55f6cfcd117b01e42919d04fd29bfe2f
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+set (PATCHES 
+      hardcode_vaargs_for_msvc.patch
+    )
+set (OPTIONS 
+      ac_cv_prog_cc_g=yes
+      ac_cv_prog_cxx_11=no
+      ac_cv_prog_cxx_g=yes
+      omni_cv_sync_add_and_fetch=no
+    )
+endif()
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    PATCHES 
+      fix_dependency.patch
+      def_gen_fix.patch
+      msvc-src-build-fixes.patch
+      release-debug-static.patch
+      add_win_into_autotools.patch
+      python-fixes.patch
+      ${PATCHES}
+)
+
+vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/python3") # port ask python distutils for info.
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  set(ENV{PYTHONPATH} "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/Lib${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/python${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/python")
+endif()
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
+    string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp "${_py3_include_path}")
+    set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}")
+    list(APPEND OPTIONS "PYTHON=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python3.${PYTHON_VERSION_MINOR}")
+endif()
+
+vcpkg_find_acquire_program(FLEX)
+cmake_path(GET FLEX PARENT_PATH FLEX_DIR)
+vcpkg_add_to_path("${FLEX_DIR}")
+
+vcpkg_find_acquire_program(BISON)
+cmake_path(GET BISON PARENT_PATH BISON_DIR)
+vcpkg_add_to_path("${BISON_DIR}")
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  set(z_vcpkg_org_linkage "${VCPKG_LIBRARY_LINKAGE}") 
+  # convoluted build system; shared builds requires 
+  # static library to create def file for symbol export
+  # tools seem to only dynamically link on windows due to make rules!
+  # zlib/zstd deps for ZIOP seem to not work on windows. At least configure
+  # won't run the required checks for some reasons.
+  set(VCPKG_LIBRARY_LINKAGE dynamic)
+  z_vcpkg_get_cmake_vars(cmake_vars_file)
+  include("${cmake_vars_file}")
+  if(VCPKG_BUILD_TYPE)
+    string(APPEND build_info "NoDebugBuild=1\n")
+  endif()
+  string(APPEND build_info "replace-with-per-config-text\n")
+  set(progs C_COMPILER CXX_COMPILER AR
+            LINKER RANLIB OBJDUMP MT
+            STRIP NM DLLTOOL RC_COMPILER)
+  list(TRANSFORM progs PREPEND "VCPKG_DETECTED_CMAKE_")
+  foreach(prog IN LISTS progs)
+      if(${prog})
+          set(path "${${prog}}")
+          unset(prog_found CACHE)
+          get_filename_component(${prog} "${${prog}}" NAME)
+          find_program(prog_found ${${prog}} PATHS ENV PATH NO_DEFAULT_PATH)
+          if(NOT path STREQUAL prog_found)
+              get_filename_component(path "${path}" DIRECTORY)
+              vcpkg_add_to_path(PREPEND ${path})
+          endif()
+      endif()
+  endforeach()
+  configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg.mk" "${SOURCE_PATH}/mk/platforms/vcpkg.mk" @ONLY NEWLINE_STYLE UNIX)
+  file(GLOB_RECURSE wrappers "${SOURCE_PATH}/bin/x86_win32/*")
+  file(COPY ${wrappers} DESTINATION "${SOURCE_PATH}/bin")
+endif()
+
+vcpkg_configure_make(
+  SOURCE_PATH "${SOURCE_PATH}"
+  AUTOCONFIG
+  NO_WRAPPERS
+  COPY_SOURCE
+  OPTIONS
+    ${OPTIONS}
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel//mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoDebugBuild=1")
+  if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/mk/platforms/vcpkg.mk" "replace-with-per-config-text" "NoReleaseBuild=1\nBuildDebugBinary=1")
+    vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "python$(subst .,,$(PYVERSION)).lib" "python$(subst .,,$(PYVERSION))_d.lib")
+    vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tool/omniidl/cxx/dir.mk" "zlib.lib" "zlibd.lib")
+  endif()
+endif()
+
+vcpkg_install_make(
+  MAKEFILE "GNUmakefile"
+  ADD_BIN_TO_PATH
+)
+
+vcpkg_fixup_pkgconfig()
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+  file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/msvcstub.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+  file(GLOB all_libs "${CURRENT_PACKAGES_DIR}/lib/*.lib")
+  set(import_libs "${all_libs}")
+  list(FILTER import_libs INCLUDE REGEX "(_rt.lib$|msvcstub)")
+  if(z_vcpkg_org_linkage STREQUAL "static")
+    file(REMOVE ${import_libs})
+  else()
+    list(REMOVE_ITEM all_libs ${import_libs})
+    file(REMOVE ${all_libs}) # remove installed static libs
+    set(to_copy_and_rename "${import_libs}")
+    list(FILTER to_copy_and_rename INCLUDE REGEX "3(0)?_rt.lib")
+    foreach(cp IN LISTS to_copy_and_rename)
+      string(REGEX REPLACE "3(0)?_rt" "" new_name "${cp}")
+      string(REGEX REPLACE "thread4" "thread" new_name "${new_name}")
+      file(COPY_FILE "${cp}" "${new_name}")
+    endforeach()
+    file(GLOB dll_files "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/*.dll")
+    file(COPY ${dll_files} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
+    foreach(pc_file IN LISTS pc_files)
+      get_filename_component(filename "${pc_file}" NAME_WE)
+      if(filename STREQUAL "omnithread3")
+        vcpkg_replace_string("${pc_file}" "-lomnithread" "-lomnithread_rt")
+      else()
+        vcpkg_replace_string("${pc_file}" "-l${filename}" "-l${filename}_rt" IGNORE_UNCHANGED)
+      endif()
+    endforeach()
+  endif()
+
+  if(NOT VCPKG_BUILD_TYPE) # dbg libs have no install rules so manually copy them.
+    file(GLOB all_libs "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib")
+    set(install_libs "${all_libs}")
+    if(z_vcpkg_org_linkage STREQUAL "static")
+      list(FILTER install_libs EXCLUDE REGEX "(_rtd.lib$|msvcstub)")
+    else() # dynamic lib
+      list(FILTER install_libs INCLUDE REGEX "(_rtd.lib$|msvcstub)")
+      set(to_copy_and_rename "${install_libs}")
+      list(FILTER to_copy_and_rename INCLUDE REGEX "3(0)?_rtd.lib")
+      foreach(cp IN LISTS to_copy_and_rename)
+        string(REGEX REPLACE "3(0)?_rt" "" new_name "${cp}")
+        string(REGEX REPLACE "thread4" "thread" new_name "${new_name}")
+        file(COPY_FILE "${cp}" "${new_name}")
+        list(APPEND install_libs "${new_name}")
+      endforeach()
+      file(GLOB dll_files "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/*.dll")
+      file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+      file(COPY ${dll_files} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+      file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
+      foreach(pc_file IN LISTS pc_files)
+        get_filename_component(filename "${pc_file}" NAME_WE)
+        if(filename STREQUAL "omnithread3")
+          vcpkg_replace_string("${pc_file}" "-lomnithread" "-lomnithread_rtd")
+        else()
+          vcpkg_replace_string("${pc_file}" "-l${filename}" "-l${filename}_rtd" IGNORE_UNCHANGED)
+        endif()
+      endforeach()
+    endif()
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
+    file(COPY ${install_libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+  endif()
+endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LIB") # Lib is LGPL
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" RENAME copyright) # Tools etc are GPL
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+file(COPY
+      "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/omnicpp${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+    DESTINATION
+      "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin"
+    )
+endif()
+
+file(COPY
+      "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/omniidl${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
+    DESTINATION
+      "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin"
+    )
+
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
+
+# Restore old linkage info. 
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+   set(VCPKG_LIBRARY_LINKAGE "${z_vcpkg_org_linkage}")
+endif()
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/omniidl" "${CURRENT_INSTALLED_DIR}" "\"os.path.dirname(__file__)+\"/../../../")
+endif()
+
+set(del_files "")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  file(GLOB del_files "${CURRENT_PACKAGES_DIR}/lib/*.a" "${CURRENT_PACKAGES_DIR}/debug/lib/*.a")
+  if(del_files)
+    file(REMOVE ${del_files})
+  endif()
+else()
+  file(GLOB del_files "${CURRENT_PACKAGES_DIR}/lib/*.so*" "${CURRENT_PACKAGES_DIR}/debug/lib/*.so*")
+  if(del_files)
+    file(REMOVE ${del_files})
+  endif()
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

package/vcpkg/ports/omniorb/python-fixes.patch

@@ -0,0 +1,51 @@
+diff --git a/mk/python.mk b/mk/python.mk
+index 1380018..fb321a5 100644
+--- a/mk/python.mk
++++ b/mk/python.mk
+@@ -3,10 +3,10 @@
+ #############################################################################
+ 
+ PYVERSION := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(".".join(sys.version.split(".")[:2]))')
+-PYPREFIX  := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.exec_prefix.replace("\\","/"))')
+-PYINCDIR  := $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_inc().replace("\\","/"))')
++PYPREFIX  := $(shell $(PYTHON) -c 'import sys; sys.stdout.write(sys.exec_prefix.replace("\\","/").replace(" ","\\ "))')
++PYINCDIR  := $(includedir)/python$(PYVERSION)
+ 
+-PythonSHAREDLIB_SUFFIX = $(shell $(PYTHON) -c 'import sys, distutils.sysconfig; sys.stdout.write((distutils.sysconfig.get_config_var("SO") or ".so").lstrip("."))')
++PythonSHAREDLIB_SUFFIX = $(shell $(PYTHON) -c 'import sys, sysconfig; sys.stdout.write((sysconfig.get_config_var("SO") or ".so").lstrip("."))')
+ 
+ PY_MODULE_SUFFIX := $(shell $(PYTHON) -c 'import sys; sys.stdout.write((sys.hexversion < 0x3000000 and not hasattr(sys, "pypy_version_info")) and "module" or "")')
+ 
+diff --git a/src/tool/omniidl/cxx/idlpython.cc b/src/tool/omniidl/cxx/idlpython.cc
+index 639515105..27ad3ee0e 100644
+--- a/src/tool/omniidl/cxx/idlpython.cc
++++ b/src/tool/omniidl/cxx/idlpython.cc
+@@ -27,8 +27,6 @@
+ 
+ // On Windows, if _DEBUG is defined, some Python versions try to force
+ // use of _d.lib libraries that are not actually present.
+-#undef _DEBUG
+-
+ #include <Python.h>
+ 
+ #include <idlsysdep.h>
+diff --git a/src/tool/omniidl/cxx/dir.mk b/src/tool/omniidl/cxx/dir.mk
+index 84f10ac03..3b5a60b87 100644
+--- a/src/tool/omniidl/cxx/dir.mk
++++ b/src/tool/omniidl/cxx/dir.mk
+@@ -190,13 +190,13 @@ ifdef Win32Platform
+ 
+ DIR_CPPFLAGS += -DMSDOS -DOMNIIDL_EXECUTABLE
+ 
+-PYLIBDIR := $(PYPREFIX)/libs $(PYPREFIX)/lib/x86_win32
++PYLIBDIR := $(libdir)
+ 
+ ifdef MinGW32Build
+ PYLIB     := -lpython$(subst .,,$(PYVERSION))
+ CXXLINKOPTIONS += $(patsubst %,-L%,$(PYLIBDIR))
+ else
+-PYLIB     := python$(subst .,,$(PYVERSION)).lib
++PYLIB     = python$(subst .,,$(PYVERSION)).lib zlib.lib Advapi32.lib
+ CXXLINKOPTIONS += $(patsubst %,-libpath:%,$(PYLIBDIR))
+ endif
+ 

package/vcpkg/ports/omniorb/release-debug-static.patch

@@ -0,0 +1,319 @@
+diff --git a/mk/mklib.mk b/mk/mklib.mk
+index 8f64b14dd..1d73cfdbe 100644
+--- a/mk/mklib.mk
++++ b/mk/mklib.mk
+@@ -16,6 +16,8 @@
+ # are called libfoo.a and libfoo.so.1.3 etc.
+ #
+ 
++ifndef NoReleaseBuild
++
+ all:: mkstatic mkshared
+ 
+ export:: mkstatic mkshared
+@@ -147,9 +149,13 @@ mkshared::
+ 
+ endif
+ 
++endif
++
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
++
+ ifdef Win32Platform
+ 
+ ifdef BuildSharedLibrary
+@@ -231,3 +237,4 @@ veryclean::
+ 
+ endif
+ endif
++endif
+
+diff --git a/src/lib/dir.mk b/src/lib/dir.mk
+index 732f8457c..bff3144f8 100644
+--- a/src/lib/dir.mk
++++ b/src/lib/dir.mk
+@@ -17,9 +17,14 @@ ciao::
+ ifndef EmbeddedSystem
+ ifdef Win32Platform
+ ifndef MinGW32Build
++ifndef NoReleaseBuild
+ export::
+ 	(cd $(EXPORT_TREE)/$(BINDIR); editbin /REBASE:BASE=0x68000000,DOWN *_rt.dll; )
++endif
++ifndef NoDebugBuild
++export::
+ 	(cd $(EXPORT_TREE)/$(BINDIR); editbin /REBASE:BASE=0x68000000,DOWN *_rtd.dll; )
+ endif
+ endif
+ endif
++endif
+diff --git a/src/lib/omnithread/dir.mk b/src/lib/omnithread/dir.mk
+index ed2194c98..adb87adba 100644
+--- a/src/lib/omnithread/dir.mk
++++ b/src/lib/omnithread/dir.mk
+@@ -32,14 +32,6 @@ LIB_VERSION  := $(OMNITHREAD_VERSION)
+ LIB_OBJS     := $(CXXSRCS:.cc=.o)
+ LIB_IMPORTS  := $(OMNITHREAD_PLATFORM_LIB)
+ 
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+-ifdef INSTALLTARGET
+-install:: mkstatic mkshared
+-endif
+-
+ vers := $(subst ., ,$(LIB_VERSION))
+ ifeq ($(words $(vers)), 2)
+   vers  := _ $(vers)
+@@ -50,6 +42,16 @@ endif
+ 
+ namespec := $(LIB_NAME) $(vers)
+ 
++ifndef NoReleaseBuild
++
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++ifdef INSTALLTARGET
++install:: mkstatic mkshared
++endif
++
+ ##############################################################################
+ # Build Static library
+ ##############################################################################
+@@ -158,9 +160,12 @@ mkshared::
+ 
+ endif
+ 
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
++
+ ifdef Win32Platform
+ 
+ ifdef BuildSharedLibrary
+@@ -239,4 +244,4 @@ veryclean::
+ 
+ endif
+ endif
+-
++endif
+diff --git a/src/services/mklib/dynstublib/dir.mk b/src/services/mklib/dynstublib/dir.mk
+index 23573345d..e128aa87a 100644
+--- a/src/services/mklib/dynstublib/dir.mk
++++ b/src/services/mklib/dynstublib/dir.mk
+@@ -12,15 +12,18 @@ COS_DYNSK_SRCS = $(COS_INTERFACES:%=%DynSK.cc)
+ 
+ CXXSRCS = $(COS_DYNSK_SRCS)
+ 
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+ ifdef Win32Platform
+   MSVC_STATICLIB_CXXNODEBUGFLAGS += -D_WINSTATIC
+   MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC
+ endif
+ 
++ifndef NoReleaseBuild
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++
++
+ 
+ ##############################################################################
+ # Build Static library
+@@ -108,10 +111,11 @@ else
+ mkshared::
+ 
+ endif
+-
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+@@ -145,6 +149,7 @@ clean::
+ #####################################################
+ #      DLL debug libraries
+ #####################################################
++
+ shareddbugversion = $(OMNIORB_VERSION)
+ 
+ dynsknamespec   = $(subst ., ,$(COS_DYNSKLIB_NAME).$(shareddbugversion))
+@@ -173,3 +178,4 @@ clean::
+ 	@(dir=shareddebug; $(CleanSharedLibrary))
+ 
+ endif
++endif
+
+diff --git a/src/services/mklib/mkBOAlib/dir.mk b/src/services/mklib/mkBOAlib/dir.mk
+index 1869d083d..18cc38764 100644
+--- a/src/services/mklib/mkBOAlib/dir.mk
++++ b/src/services/mklib/mkBOAlib/dir.mk
+@@ -16,6 +16,8 @@ COS_SK_OBJS = $(COS_INTERFACES:%=%SK.o)
+ COS_SK_SRCS = $(COS_INTERFACES:%=%SK.cc)
+ CXXSRCS = $(COS_SK_SRCS) 
+ 
++ifndef NoReleaseBuild
++
+ all:: mkstatic mkshared
+ 
+ export:: mkstatic mkshared
+@@ -124,10 +126,11 @@ else
+ mkshared::
+ 
+ endif
+-
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifndef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+@@ -190,4 +193,4 @@ clean::
+ 
+ endif
+ 
+-
++endif
+diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk
+index d58027d84..87f7ec22b 100644
+--- a/src/services/mklib/stublib/dir.mk
++++ b/src/services/mklib/stublib/dir.mk
+@@ -12,15 +12,18 @@ COS_SK_SRCS = $(COS_INTERFACES:%=%SK.cc)
+ 
+ CXXSRCS = $(COS_SK_SRCS)
+ 
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+ ifdef Win32Platform
+   MSVC_STATICLIB_CXXNODEBUGFLAGS += -D_WINSTATIC
+   MSVC_STATICLIB_CXXDEBUGFLAGS += -D_WINSTATIC
+ endif
+ 
++ifndef NoReleaseBuild
++
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++
+ 
+ ##############################################################################
+ # Build Static library
+@@ -108,10 +111,11 @@ else
+ mkshared::
+ 
+ endif
+-
++endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
++ifdef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+@@ -173,3 +177,4 @@ clean::
+ 	@(dir=shareddebug; $(CleanSharedLibrary))
+ 
+ endif
++endif
+diff --git a/src/lib/omniORB/orbcore/dir.mk b/src/lib/omniORB/orbcore/dir.mk
+index 634e6b1e2..4370fed07 100644
+--- a/src/lib/omniORB/orbcore/dir.mk
++++ b/src/lib/omniORB/orbcore/dir.mk
+@@ -220,6 +220,7 @@ include $(BASE_OMNI_TREE)/mk/mklib.mk
+ 
+ #########################################################################
+ ifdef Win32Platform
++ifndef NoReleaseBuild
+ 
+ stublib = static/$(patsubst %,$(LibNoDebugPattern),msvcstub)
+ 
+@@ -236,6 +237,8 @@ clean::
+ 
+ veryclean::
+ 	$(RM) $(stublib)
++endif
++ifndef NoDebugBuild
+ 
+ stubdblib = debug/$(patsubst %,$(LibDebugPattern),msvcstub)
+ 
+@@ -254,6 +257,7 @@ veryclean::
+ 	$(RM) $(stubdblib)
+ 
+ endif
++endif
+ 
+ #########################################################################
+ ifdef OPEN_SSL_ROOT
+diff --git a/src/services/mklib/stublib/dir.mk b/src/services/mklib/stublib/dir.mk
+index 87f7ec22b..ce46f6c5f 100644
+--- a/src/services/mklib/stublib/dir.mk
++++ b/src/services/mklib/stublib/dir.mk
+@@ -115,7 +115,7 @@ endif
+ ##############################################################################
+ # Build debug libraries for Win32
+ ##############################################################################
+-ifdef NoDebugBuild
++ifndef NoDebugBuild
+ ifdef Win32Platform
+ 
+ all:: mkstaticdbug mkshareddbug
+diff --git a/mk/mklib.mk b/mk/mklib.mk
+index 1d73cfdbe..e6e8d65fe 100644
+--- a/mk/mklib.mk
++++ b/mk/mklib.mk
+@@ -16,16 +16,6 @@
+ # are called libfoo.a and libfoo.so.1.3 etc.
+ #
+ 
+-ifndef NoReleaseBuild
+-
+-all:: mkstatic mkshared
+-
+-export:: mkstatic mkshared
+-
+-ifdef INSTALLTARGET
+-install:: mkstatic mkshared
+-endif
+-
+ vers := $(subst ., ,$(LIB_VERSION))
+ ifeq ($(words $(vers)), 2)
+   vers  := _ $(vers)
+@@ -36,6 +26,16 @@ endif
+ 
+ namespec := $(LIB_NAME) $(vers)
+ 
++ifndef NoReleaseBuild
++
++all:: mkstatic mkshared
++
++export:: mkstatic mkshared
++
++ifdef INSTALLTARGET
++install:: mkstatic mkshared
++endif
++
+ ##############################################################################
+ # Build Static library
+ ##############################################################################
+

package/vcpkg/ports/omniorb/vcpkg.json

@@ -0,0 +1,23 @@
+{
+  "name": "omniorb",
+  "version": "4.3.0",
+  "port-version": 4,
+  "description": "omniORB is a robust high performance CORBA ORB for C++",
+  "homepage": "https://omniorb.sourceforge.io/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!uwp & !xbox & !((arm | x86) & windows) & !osx",
+  "dependencies": [
+    "openssl",
+    "python3",
+    {
+      "name": "python3",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "zlib",
+    "zstd"
+  ]
+}

package/vcpkg/ports/omniorb/vcpkg.mk

@@ -0,0 +1,89 @@
+#
+# vcpkg.mk - make variables and rules specific to Visual Studio
+#
+
+WindowsNT=1
+x86Processor=1
+
+BINDIR = bin
+LIBDIR = lib
+
+ABSTOP = $(shell cd $(TOP); pwd)
+
+# Windows builds require a shared library build
+BuildSharedLibrary=1
+# This will be replaced
+
+ThreadSystem=NT
+undefine UnixPlatform
+# Windows build requires static lib to generate symbol def file
+undefine NoStaticLibrary
+platform = Win32Platform
+
+@build_info@
+
+# Use the following set of flags to build and use multithreaded DLLs
+#
+MSVC_DLL_CXXNODEBUGFLAGS       = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@
+MSVC_DLL_CXXLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE@ -manifest
+MSVC_DLL_CNODEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE@
+MSVC_DLL_CLINKNODEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE@ -manifest
+#
+MSVC_DLL_CXXDEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG@ -D_DEBUG
+MSVC_DLL_CXXLINKDEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG@ -manifest
+MSVC_DLL_CDEBUGFLAGS           = @VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG@ -D_DEBUG
+MSVC_DLL_CLINKDEBUGOPTIONS     = @VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG@ -manifest
+#
+# Or
+#
+# Use the following set of flags to build and use multithread static libraries
+#
+MSVC_STATICLIB_CXXNODEBUGFLAGS       = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@
+MSVC_STATICLIB_CXXLINKNODEBUGOPTIONS = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE@ -manifest
+MSVC_STATICLIB_CNODEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE@
+MSVC_STATICLIB_CLINKNODEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE@ -manifest
+
+MSVC_STATICLIB_CXXDEBUGFLAGS         = @VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG@ -D_DEBUG
+MSVC_STATICLIB_CXXLINKDEBUGOPTIONS   = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG@ -manifest
+MSVC_STATICLIB_CDEBUGFLAGS           = @VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG@ -D_DEBUG
+MSVC_STATICLIB_CLINKDEBUGOPTIONS     = @VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG@ -manifest
+
+#
+# Include general win32 things
+#
+
+include $(THIS_IMPORT_TREE)/mk/win32.mk
+
+MANIFESTTOOL = @VCPKG_DETECTED_CMAKE_MT@
+RCTOOL       = @VCPKG_DETECTED_CMAKE_RC_COMPILER@
+CLINK        = @VCPKG_DETECTED_CMAKE_LINKER@
+CXXLINK      = @VCPKG_DETECTED_CMAKE_LINKER@
+AR           = @VCPKG_DETECTED_CMAKE_AR@
+RANLIB       = true
+
+# To build ZIOP support, EnableZIOP must be defined and one or both of
+# the zlib and zstd sections must be defined.
+
+#EnableZIOP = 1
+
+#EnableZIOPZLib = 1
+#ZLIB_ROOT = /cygdrive/c/zlib-1.2.11
+#ZLIB_CPPFLAGS = -DOMNI_ENABLE_ZIOP_ZLIB -I$(ZLIB_ROOT)
+#ZLIB_LIB = $(patsubst %,$(LibPathPattern),$(ZLIB_ROOT)) zdll.lib
+
+#EnableZIOPZStd = 1
+#ZSTD_ROOT = /cygdrive/c/zstd
+#ZSTD_CPPFLAGS = -DOMNI_ENABLE_ZIOP_ZSTD -I$(ZSTD_ROOT)/include
+#ZSTD_LIB = $(patsubst %,$(LibPathPattern),$(ZSTD_ROOT)/lib) zstd.lib
+LN_S=cp -pR 
+
+define ExportSharedLibraryToDir
+ $(ExportLibraryToDir); \
+ $(ParseNameSpec); \
+ soname=$(SharedLibraryShortLibName); \
+ libname=$(SharedLibraryLibNameTemplate); \
+ set -x; \
+ cd $$dir; \
+ $(RM) $$soname; \
+ $(LN_S) $(<F) $$soname;
+endef