Skip to content

Commit

Permalink
Fixes for Ubuntu 22.04. Do not link libraries loaded later (#1466)
Browse files Browse the repository at this point in the history
* Switch off trapfpe in case of problematic libxml2

* Do not link libraries that are loaded later

---------

Co-authored-by: hristov <peter.Hristov@cern.ch>
  • Loading branch information
2 people authored and chiarazampolli committed Apr 18, 2023
1 parent f0660c8 commit 10f58df
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ALIROOT/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@
# Module include folder
include_directories(${AliRoot_SOURCE_DIR}/ALIROOT)

find_package(LibXml2 REQUIRED)
message("LIBXML2_INCLUDE_DIR -> ${LIBXML2_INCLUDE_DIR}")

# Additional include folders in alphabetical order
include_directories(
${AliRoot_BINARY_DIR}/version
${AliRoot_SOURCE_DIR}/STEER/STEER
${AliRoot_SOURCE_DIR}/STEER/STEERBase
${LIBXML2_INCLUDE_DIR}
)

# aliroot executable
Expand Down
5 changes: 5 additions & 0 deletions ALIROOT/fpu.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#ifdef __linux
#include <libxml/xmlversion.h>
#if LIBXML_VERSION < 20913
#define _GNU_SOURCE 1
#include <fenv.h>
static void __attribute__ ((constructor)) trapfpe(void)
Expand All @@ -9,3 +11,6 @@ static void __attribute__ ((constructor)) trapfpe(void)
#else
void trapfpe () {}
#endif
#else
void trapfpe () {}
#endif
2 changes: 1 addition & 1 deletion PYTHIA6/AliPythia6/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")

# Generate the ROOT map
# Dependecies
set(LIBDEPS STEERBase STEER EVGEN FASTSIM EGPythia6 pythia6 microcern lhapdfbase)
set(LIBDEPS STEERBase STEER EVGEN EGPythia6)
generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")


Expand Down

0 comments on commit 10f58df

Please sign in to comment.