Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zeroc-ice] correct windows-static and linux #24169

Merged
merged 5 commits into from
Apr 18, 2022
Merged

[zeroc-ice] correct windows-static and linux #24169

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecc0340
[zeroc-ice] correct windows-static and linux
strega-nil Apr 15, 2022
97e72fc
remove tabs
strega-nil Apr 15, 2022
651bfe9
does this work to fix mcppd?
strega-nil Apr 18, 2022
3b0acf5
remove the ability for zeroc-ice to depend on external libs
strega-nil Apr 18, 2022
2d2b4e7
remove feature supports
strega-nil Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions ports/zeroc-ice/mcppd_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- a/config/Make.project.rules 2022-01-17 10:28:23.000000000
+++ b/config/Make.project.rules 2022-04-18 12:15:19.000000000
@@ -1050,17 +1050,17 @@
#
# $(call make-lib,$1=libname)
#
define make-lib
ifneq ($($1_home),)
# Check for 3rd party libraries either in home/lib<platform specific subdir> or home/lib
-$1_installdir = $$($1_home)/lib$$(call platform-var,installdir,$1,$$($$2_platform),$$($$2_config),$$2)
-$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_installdir)),$$($1_installdir),$$($1_home)/lib))
+$1_installdir = $$($1_home)$$(if $$(filter no,$$(OPTIMIZE)),/debug)/lib$$(call platform-var,installdir,$1,$$($$2_platform),$$($$2_config),$$2)
+$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_installdir)),$$($1_installdir),$$($1_home)$$(if $$(filter no,$$(OPTIMIZE)),/debug)/lib))
$1_includedir ?= $$($1_home)/include
endif
-$1_ldflags ?= -l$1
+$1_ldflags ?= -l$$(if $$(and $$(filter mcpp,$1),$$(filter no,$$(OPTIMIZE))),$1d,$1)
endef

#
# $(call repathfromdir,path)
#
# Returns reversed relative path for directory (e.g.: test/Ice/operations
22 changes: 18 additions & 4 deletions ports/zeroc-ice/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ vcpkg_from_github(
REPO zeroc-ice/ice
REF v3.7.7
SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee
PATCHES md5i_fix.patch slice2swift.patch
PATCHES md5i_fix.patch slice2swift.patch mcppd_fix.patch
)

set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg)

get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME)
set(UNIX_BUILD_DIR "${SOURCE_PATH}")
set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX})
set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX})
set(UNIX_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/src/${SOURCE_PATH_SUFFIX})

# install_includes
function(install_includes ORIGINAL_PATH RELATIVE_PATHS)
Expand Down Expand Up @@ -132,6 +132,20 @@ if("icediscovery" IN_LIST FEATURES)
endif()

if(NOT VCPKG_TARGET_IS_WINDOWS)
# Clean up for the first round (important for install --editable)
vcpkg_execute_build_process(
COMMAND make distclean
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
LOGNAME make-clean-${TARGET_TRIPLET}
)

if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib")
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib")
endif()
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64")
endif()
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin")

# Setting these as environment variables, as .d files aren't generated
# the first time passing them as arguments to make.
Expand Down Expand Up @@ -248,12 +262,12 @@ else() # VCPKG_TARGET_IS_WINDOWS
SOURCE_PATH ${SOURCE_PATH}
PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln"
SKIP_CLEAN
TARGET "C++11\\ice++11"
TARGET "C++11\\ice++11"
USE_VCPKG_INTEGRATION
OPTIONS
/p:UseVcpkg=yes
/p:IceBuildingSrc=yes
${ICE_OPTIONAL_COMPONENTS_MSBUILD}
${ICE_OPTIONAL_COMPONENTS_MSBUILD}
)

if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll")
Expand Down
3 changes: 2 additions & 1 deletion ports/zeroc-ice/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "zeroc-ice",
"version": "3.7.7",
"port-version": 1,
"maintainers": "Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>",
"description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
"homepage": "https://github.com/zeroc-ice/ice",
"license": null,
"supports": "!uwp & !(windows & arm) & !wasm32",
"supports": "!uwp & !(windows & arm) & !(windows & staticcrt) & !wasm32",
"dependencies": [
"bzip2",
"expat",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7658,7 +7658,7 @@
},
"zeroc-ice": {
"baseline": "3.7.7",
"port-version": 0
"port-version": 1
},
"zeromq": {
"baseline": "4.3.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/z-/zeroc-ice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "813790998f0da139a77d1cd387d7a1f7d900045f",
"version": "3.7.7",
"port-version": 1
},
{
"git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b",
"version": "3.7.7",
Expand Down