Skip to content

Fix pkgconfig patch for Qhull to only let CMake substitute @#4451

Merged
boegel merged 1 commit intoeasybuilders:developfrom
ComputeCanada:qhull-fix-pkgconfig-patch
Apr 6, 2017
Merged

Fix pkgconfig patch for Qhull to only let CMake substitute @#4451
boegel merged 1 commit intoeasybuilders:developfrom
ComputeCanada:qhull-fix-pkgconfig-patch

Conversation

@bartoldeman
Copy link
Copy Markdown
Contributor

see https://cmake.org/cmake/help/latest/command/configure_file.html
otherwise it replaces ${...} by empty strings which is not what we want and broke our Octave compilation.

@boegel boegel added this to the 3.2.0 milestone Apr 5, 2017
@boegel
Copy link
Copy Markdown
Member

boegel commented Apr 5, 2017

@bartoldeman How did it break you Octave build exactly?

note to self: stuff to retest that lists Qhull as a dep: Octave, OpenMD, PCL, pyhull, scikit-image

@bartoldeman
Copy link
Copy Markdown
Contributor Author

Somewhere in the Octave build procedure where using QHull it used
"-L -L/some/path". I submitted a PR for Octave 4.2.1 so perhaps you can see it for yourself.

@boegel
Copy link
Copy Markdown
Member

boegel commented Apr 6, 2017

without the patch:

$ cat $EASYBUILD_PREFIX/software/Qhull/2015.2-intel-2016b/lib/pkgconfig/qhull.pc
prefix=/user/home/gent/vsc400/vsc40023/eb_phanpyscratch/CO7/haswell-ib/software/Qhull/2015.2-intel-2016b
exec_prefix=
includedir=/include
libdir=/lib

Name: qhull
Description: General dimension convex hull library
Version: 2015.2 2016/01/18
Requires:
Libs: -L -lqhull -lm
Cflags: -I

with the patch:

cat $EASYBUILD_PREFIX/software/Qhull/2015.2-intel-2016b/lib/pkgconfig/qhull.pc
prefix=/user/home/gent/vsc400/vsc40023/eb_phanpyscratch/CO7/haswell-ib/software/Qhull/2015.2-intel-2016b
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${prefix}/lib

Name: qhull
Description: General dimension convex hull library
Version: 2015.2 2016/01/18
Requires:
Libs: -L${libdir} -lqhull -lm
Cflags: -I${includedir}

@boegel
Copy link
Copy Markdown
Member

boegel commented Apr 6, 2017

Thanks for the fix @bartoldeman!

@boegel boegel merged commit 528dfc4 into easybuilders:develop Apr 6, 2017
@boegel boegel mentioned this pull request Apr 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants