applgrid: fix Linux build (#523201)
This commit is contained in:
@@ -0,0 +1,6 @@
|
||||
#ifdef __CLING__
|
||||
#pragma link off all globals;
|
||||
#pragma link off all classes;
|
||||
#pragma link off all functions;
|
||||
#pragma link C++ class TFileString+;
|
||||
#endif
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifdef __CLING__
|
||||
#pragma link off all globals;
|
||||
#pragma link off all classes;
|
||||
#pragma link off all functions;
|
||||
#pragma link C++ class TFileVector+;
|
||||
#endif
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -16130,7 +16130,6 @@
|
||||
$as_echo "$as_me: WARNING: ****************************************************************" >&2;}
|
||||
fi
|
||||
|
||||
-( echo $CXXFLAGS | grep -q "m64" ) || CXXFLAGS+=" -m64 "
|
||||
|
||||
|
||||
|
||||
@@ -18,7 +18,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-h+ZNGj33FIwg4fOCyfGJrUKM2vDDQl76JcLhtboAOtc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream's configure unconditionally injects `-m64` into CXXFLAGS, which is
|
||||
# invalid on aarch64 (and redundant on x86_64). The line was added in r1946
|
||||
# for applgrid 1.6.17 with the commit message "add default m64 compilation".
|
||||
# There is no public bug tracker upstream, and the line is still present in
|
||||
# trunk. We patch only the generated `configure` (not `configure.ac`) so
|
||||
# that make doesn't try to re-run autotools during the build.
|
||||
./no-m64.patch
|
||||
|
||||
# ROOT 6.40 made rootcling fail when no selection rules are provided
|
||||
# (https://root.cern/doc/v640/release-notes.html#core-libraries). The patch
|
||||
# appends $*LinkDef.h to the dictionary pattern rule so rootcint picks up
|
||||
# the LinkDef.h files we drop into src/ in postPatch.
|
||||
./rootcling-linkdef.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./TFileStringLinkDef.h} src/TFileStringLinkDef.h
|
||||
cp ${./TFileVectorLinkDef.h} src/TFileVectorLinkDef.h
|
||||
|
||||
sed -i appl_grid/serialise_base.h -e '1i#include <cstdint>'
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -1027,7 +1027,7 @@
|
||||
$(CC) $(AM_CFLAGS) -c $<
|
||||
|
||||
@USE_ROOT_TRUE@%Dict.cxx : %.h %.cxx
|
||||
-@USE_ROOT_TRUE@ $(CINT) -f $@ -c $< -I..
|
||||
+@USE_ROOT_TRUE@ $(CINT) -f $@ -c $< -I.. $*LinkDef.h
|
||||
|
||||
#../appl_grid/$*LinkDef.h
|
||||
|
||||
Reference in New Issue
Block a user