-
Notifications
You must be signed in to change notification settings - Fork 4k
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 #4605
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ARROW-5631: [C++] Fix FindBoost targets with cmake3.2 #4605
Conversation
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.
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.
This is needed to work with BoostConfig.cmake provided by Boost (not CMake).
The Boost package provided by MSYS2 installed BoostConfig.cmake at the time.
But the current Boost package doesn't install BoostConfig.cmake: https://github.com/msys2/MINGW-packages/pull/5326/files
See also: msys2/MINGW-packages#5233
There is no platform that needs this. So we can remove this for now but we may need this again in the future.
|
A note that this patch does not fully fix the cmake3.2 issue, see https://jira.apache.org/jira/browse/ARROW-5631?filter=-1 But at least it gets a cmake build directory populated. |
|
@kou afaik, find_package shouldn't be affected by BUILD_SHARED_LIBS? |
|
I think it's fine to keep the stashing; it seems like it was more likely future proofing |
|
Don't merge for now, it doesn't fix the docker cmake32 image. |
c4d7d34 to
033a944
Compare
033a944 to
8a89596
Compare
|
rebased with master, ready to land (once it passes tests). This passes locally, minus the linking error fixed by #4635. |
|
It seems that the current changes don't fix anything. |
Codecov Report
@@ Coverage Diff @@
## master #4605 +/- ##
==========================================
+ Coverage 88.49% 88.91% +0.41%
==========================================
Files 890 710 -180
Lines 110406 96682 -13724
Branches 1418 0 -1418
==========================================
- Hits 97703 85960 -11743
+ Misses 12422 10722 -1700
+ Partials 281 0 -281Continue to review full report at Codecov.
|
|
@ursabot crossbox --help |
|
|
@ursabot crossbow --help |
|
|
@ursabot crossbow test |
|
AMD64 Conda Crossbow (#23233) builder failed. Revision: f097a4b4ea5ae527a6cf8bfc7a927e5dbca5616b Crossbow: |
|
@ursabot crossbow test -g docker |
|
AMD64 Conda Crossbow (#23234) builder has been succeeded. Revision: f097a4b4ea5ae527a6cf8bfc7a927e5dbca5616b Submitted crossbow builds: ursa-labs/crossbow @ ursabot-41 |
f097a4b to
0e11383
Compare
|
@ursabot crossbow test docker docker-cpp docker-cpp-cmake32 docker-rust |
|
AMD64 Conda Crossbow (#23279) builder failed. Revision: 0e11383c1589ac73b2a8abb2c158038a1477de40 Crossbow: |
|
@ursabot crossbow test docker-cpp docker-cpp-cmake32 docker-rust |
|
AMD64 Conda Crossbow (#23280) builder has been succeeded. Revision: 0e11383c1589ac73b2a8abb2c158038a1477de40 Submitted crossbow builds: ursa-labs/crossbow @ ursabot-42
|
|
@ursabot crossbow test docker-c_glib |
|
AMD64 Conda Crossbow (#23290) builder has been succeeded. Revision: 0e11383c1589ac73b2a8abb2c158038a1477de40 Submitted crossbow builds: ursa-labs/crossbow @ ursabot-43
|
|
@kszucs do you know why the badge is at failed? The last one are waiting to be run. |
|
@kou could you check locally with this patch why c_glib docker image fails? I've exausted my debugging of meson. I think that you need to namespace gandiva's I'll let you decide if renaming breaks anything. |
0b1a568 to
dbf6fe7
Compare
|
@ursabot crossbow test docker-c_glib |
|
AMD64 Conda Crossbow (#23312) builder has been succeeded. Revision: dbf6fe7d9d813e1179d697c7eeab0b31900257b1 Submitted crossbow builds: ursa-labs/crossbow @ ursabot-44
|
|
@ursabot crossbow test docker-r |
|
AMD64 Conda Crossbow (#23410) builder has been succeeded. Revision: 46d5da0b3b08be423333e17e7206a824f437162e Submitted crossbow builds: ursa-labs/crossbow @ ursabot-45
|
|
@ursabot crossbow test -g docker |
|
AMD64 Conda Crossbow (#23414) builder has been succeeded. Revision: 46d5da0b3b08be423333e17e7206a824f437162e Submitted crossbow builds: ursa-labs/crossbow @ ursabot-46 |
conda's cmake3.2 does not support https for third party download.
- Ensure that LD_LIBRARY_PATH is set before installing R packages because conda's pkg-config would pickup libicu from conda at compile but LD_LIBRARY_PATH was not exported yet, thus package would fail tests. - Fix JSON payload on systems where locales are missing.
46d5da0 to
01f67dd
Compare
|
This fixes the most pressing issues, notably
I fixed also fixed docker-rust, and partly advanced on docker-r and docker-c_glib. |
|
@ursabot crossbow test docker-cpp docker-cpp-cmake32 |
|
AMD64 Conda Crossbow (#23443) builder has been succeeded. Revision: 01f67dd Submitted crossbow builds: ursa-labs/crossbow @ ursabot-47
|
kou
left a comment
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.
gandiva-glib/meson.build:50:0: ERROR: Tried to create target "enums.c", but a target of that name already exists.
This is a Meson bug. It has been fixed in the latest Meson. But the latest Meson (0.51.0) has a environment variable related bug: mesonbuild/meson#5503 mesonbuild/meson#5502
So we need to use 0.50.1 for now.
r/Dockerfile
Outdated
|
|
||
| # r-base includes tzdata. Get around interactive stop in that package | ||
| ENV DEBIAN_FRONTEND=noninteractive | ||
| # workaround for install_github Github API rate limit |
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.
Github -> GitHub
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.
fixing
c_glib/Dockerfile
Outdated
| ARROW_INSTALL_NAME_RPATH=OFF \ | ||
| LD_LIBRARY_PATH="${CONDA_PREFIX}/lib" \ | ||
| PKG_CONFIG_PATH="${CONDA_PREFIX}/lib/pkgconfig" \ | ||
| PKG_CONFIG_PATH="${CONDA_PREFIX}/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig" \ |
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.
Is this needed?
The added path is included in system pkg-config path. So it'll be searched without this.
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.
I'm going to revert this for now
|
BTW, I couldn't find any build log on CircleCI. https://circleci.com/gh/ursa-labs/crossbow/tree/ursabot-46-circle-docker-c_glib shows And "build" link shows |
wesm
left a comment
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.
+1. Made a couple of tweaks. Merging -- please open follow up JIRAs about other docker failures
c_glib/Dockerfile
Outdated
| ARROW_INSTALL_NAME_RPATH=OFF \ | ||
| LD_LIBRARY_PATH="${CONDA_PREFIX}/lib" \ | ||
| PKG_CONFIG_PATH="${CONDA_PREFIX}/lib/pkgconfig" \ | ||
| PKG_CONFIG_PATH="${CONDA_PREFIX}/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig" \ |
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.
I'm going to revert this for now
r/Dockerfile
Outdated
|
|
||
| # r-base includes tzdata. Get around interactive stop in that package | ||
| ENV DEBIAN_FRONTEND=noninteractive | ||
| # workaround for install_github Github API rate limit |
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.
fixing


cmake's FindBoost pre 3.5 did not export IMPORTED targets. This also fixes the newly introduced trusty docker image.