-
Notifications
You must be signed in to change notification settings - Fork 10
Conversation
Going to rebase #125 locally and test |
And as the example @lmoureaux used:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clean build fails with:
make[1]: Entering directory `/afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore'
mkdir -p /afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/src/linux/x86_64
gcc -O0 -g3 -fno-inline -Wall -pthread -fPIC -std=c++11 -m64 -I/usr/include/python2.7 -I/include -I/afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/include -c -MT /afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/src/linux/x86_64/XHALDevice.o -MMD -MP -MF /afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/src/linux/x86_64/XHALDevice.Td -o /afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/src/linux/x86_64/XHALDevice.o /afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/src/common/XHALDevice.cpp
In file included from /afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/include/xhal/XHALDevice.h:12:0,
from /afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/src/common/XHALDevice.cpp:1:
/afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/include/xhal/utils/XHALXMLParser.h:23:42: fatal error: xercesc/util/PlatformUtils.hpp: No such file or directory
#include <xercesc/util/PlatformUtils.hpp>
^
compilation terminated.
make[1]: *** [/afs/cern.ch/work/l/lmoureau/GEM/test/mf/xhal/xhalcore/src/linux/x86_64/XHALDevice.o] Error 1
Hardcoded |
The
No warning is printed for the ARM build. |
b0dd45a
to
a128d8e
Compare
4cb8a32
to
32b32f3
Compare
oops, missed this in the output earlier... no warning on |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to decide what to do with #125. Since develop
tends to evolve slowly, I think we don't need this fix there and we can merge it only into the feature branch.
I'm fine with including this in #125 (especially since I think you noticed this issue when developing for that anyway), and after that, |
32b32f3
to
127f7aa
Compare
* `config` submodule updated to pick up `XHAL_ROOT` and default `INSTALL_PATH` * `xhalarm` and `xhalcore` `Makefile`s are simplified for reliable, reproducible builds * `xhalarm` as dependency of `xhalcore` is moved to dependency of `xhalcore.RPM`
127f7aa
to
a12c07d
Compare
Fix cherry-picked in #125, closing. |
Description
Makefile
s are cleaned up as in thectp7_modules
way, with autodependencies calculated at object build time, objects and sources grouped based on the library they feed into, and common compilation syntax used, except where differences are needed.Could go further, a la
ctp7_modules
, where the library generation is also a common block, with extras added per library in a rule, but didn't seem necessary at this time.xhalarm
andxhalcore
Makefile
s are simplified for reliable, reproducible buildsxhalarm
as dependency ofxhalcore
is moved to dependency ofxhalcore.RPM
Types of changes
Motivation and Context
Issue #128 observed by @lmoureaux when adding new sources, this fix should make the syntax more obvious, though the structure of libraries and such may still need to be clarified.
How Has This Been Tested?
Compiled fine, compiled objects not tested.
Probably needs to be hotfixed into
feature/templated-rpc-methods
(or this branch rebased) as I suspect this was possible blocker for @lmoureaux testing the build of #125.