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 1 commit
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
Prev Previous commit
Next Next commit
remove the ability for zeroc-ice to depend on external libs
  • Loading branch information
@strega-nil
strega-nil committed Apr 18, 2022
commit 3b0acf5c3ebb1a1a3df3fc88a98547aadba6530b
7 changes: 4 additions & 3 deletions ports/zeroc-ice/mcppd_fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
# 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
-$1_includedir ?= $$($1_home)/include
+$1_installdir =
+$1_libdir ?=
+$1_includedir ?=
endif
-$1_ldflags ?= -l$1
+$1_ldflags ?= -l$$(if $$(and $$(filter mcpp,$1),$$(filter no,$$(OPTIMIZE))),$1d,$1)
Expand Down
2 changes: 1 addition & 1 deletion versions/z-/zeroc-ice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "813790998f0da139a77d1cd387d7a1f7d900045f",
"git-tree": "19ff4530f3b42bfdc6d83f2fd3aca166dcb7aae8",
"version": "3.7.7",
"port-version": 1
},
Expand Down