Skip to content

Conversation

@dberzano
Copy link
Contributor

Should supersede #879.

@dberzano
Copy link
Contributor Author

@davidrohr @ktf this is what I have in mind, I am currently testing it with O2. For FairRoot, I have already tested it and it correctly picks:

  • protobuf from the system, in case no protobuf from ours is available;
  • protobuf from ours in case it is available.

This works with a patched FairRoot only. Bump to patch version will be added to this PR later. Stay tuned!

@dberzano
Copy link
Contributor Author

See FairRootGroup/FairRoot#652, proposed for upstream dev.

* Use a single variable pointing to the root installation
* Do not pass the variable if protobuf comes from the system
* Bump FairRoot to a version compatible with our fix
@dberzano dberzano force-pushed the fix-system-protobuf branch from c2183b1 to e6bc9f6 Compare October 12, 2017 13:23
@dberzano dberzano changed the title [WIP] Simplify pickup of system protobuf Simplify pickup of system protobuf Oct 12, 2017
@dberzano
Copy link
Contributor Author

So if you pick up this alidist version (and you don't have FairRoot in devel mode, so that you are forced to use our version) it should work.

Waiting for confirmation from @davidrohr :-)

@dberzano dberzano merged commit 342ab95 into alisw:master Oct 12, 2017
@davidrohr
Copy link
Contributor

@dberzano : Hi Dario, I rebuilt from scratch and protobuf is picked up correctly from the system.
Thanks
David

@dberzano
Copy link
Contributor Author

@davidrohr thanks for checking, I had to merge it before your check as @shahor02 needed it sooner :-)

@dberzano dberzano deleted the fix-system-protobuf branch October 13, 2017 09:58
@davidrohr
Copy link
Contributor

@dberzano : I saw that, but wanted to let you know that it works with system protobuf as well, so I think we can close this topic now.

@ktf
Copy link
Member

ktf commented Oct 17, 2017

@dberzano this (or something related to this) seems to have broken the PR builds on system which have both system and our protobuf, e.g. the build machines. See for example:

AliceO2Group/AliceO2#626

@ktf
Copy link
Member

ktf commented Oct 17, 2017

@dberzano @dennisklein for the record the actual problem seems to be:

...
-DProtoBuf_DIR=/mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/protobuf/v3.0.2
...
-- Looking for Protobuf... - found: libraries: optimized;/lib64/libprotobuf.so;debug;/lib64/libprotobuf.so;-lpthread, includes: /mnt/mesos/sandbox/sandbox/sw/slc7_x86-64/protobuf/v3.0.2-1/include, protoc: /bin/protoc

which if I understand correctly is simply wrong.

@dennisklein
Copy link
Contributor

Yes, looks wrong. It seems to mix up system installation with custom installation somehow. I had a holiday today, will have a look at it tomorrow.

@dberzano
Copy link
Contributor Author

I have a fix. I'm making a PR.

@dberzano
Copy link
Contributor Author

See FairRootGroup/FairRoot#656.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants