Skip to content

Commit

Permalink
(#20267) aeron: fix missing glibc symbols on newer systems
Browse files Browse the repository at this point in the history
* aeron: add -fno-finite-math-only to fix issues with glibc >= 2.31

* aeron: bump deps

* aeron: avoid overwriting of CMAKE_CXX_FLAGS in toolchain
  • Loading branch information
valgur authored Oct 22, 2023
1 parent 9c976a6 commit 3e07efa
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions recipes/aeron/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AeronConan(ConanFile):
description = "Efficient reliable UDP unicast, UDP multicast, and IPC message transport"
topics = ("udp", "messaging", "low-latency")
url = "https://github.com/conan-io/conan-center-index"
homepage = "https://github.com/real-logic/aeron/wiki"
homepage = "https://github.com/real-logic/aeron"
license = "Apache-2.0"

package_type = "library"
Expand Down Expand Up @@ -72,7 +72,7 @@ def validate(self):
raise ConanInvalidConfiguration("This platform (os=Macos arch=armv8) is not yet supported by this recipe")

def build_requirements(self):
self.tool_requires("zulu-openjdk/11.0.15")
self.tool_requires("zulu-openjdk/11.0.19")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand All @@ -90,6 +90,12 @@ def generate(self):
tc.cache_variables["AERON_BUILD_DOCUMENTATION"] = False
tc.cache_variables["AERON_INSTALL_TARGETS"] = True
tc.cache_variables["AERON_ENABLE_NONSTANDARD_OPTIMIZATIONS"] = True
# The finite-math-only optimization has no effect and can cause linking errors
# when linked against glibc >= 2.31
tc.blocks["cmake_flags_init"].template += (
'string(APPEND CMAKE_CXX_FLAGS_INIT " -fno-finite-math-only")\n'
'string(APPEND CMAKE_C_FLAGS_INIT " -fno-finite-math-only")\n'
)
tc.generate()

def _patch_sources(self):
Expand Down

0 comments on commit 3e07efa

Please sign in to comment.