Skip to content

Added support for pkg-config via pkgconfig/bzip2.pc#8200

Merged
boegel merged 6 commits intoeasybuilders:developfrom
furstj:20190501145109_new_pr_bzip2106
May 3, 2019
Merged

Added support for pkg-config via pkgconfig/bzip2.pc#8200
boegel merged 6 commits intoeasybuilders:developfrom
furstj:20190501145109_new_pr_bzip2106

Conversation

@furstj
Copy link
Copy Markdown
Contributor

@furstj furstj commented May 1, 2019

(created using eb --new-pr)

@boegel
Copy link
Copy Markdown
Member

boegel commented May 1, 2019

@furstj Did you write the bzip2.pc file yourself, or was it inspired by sources online?

@boegel boegel added this to the 3.x milestone May 1, 2019
@furstj
Copy link
Copy Markdown
Contributor Author

furstj commented May 1, 2019

The bzip2.pc was inspired by the /usr/lib64/pkgconfig/bzip2.pc from OpenSUSE Leap 15 distribution. Nevertheless OpenSUSE uses several more complicated patches which make the package compatible with autotools and change the source . On the other hand my patch does not change the source code and just adds the bzip2.pc.

The bzip2.pc file simplifies greatly compilations on OpenSUSE Leap and SLES. Without it, the compilation of e.g. fontconfig fails.

@boegel
Copy link
Copy Markdown
Member

boegel commented May 1, 2019

@furstj In that case, we should mention (in the patch file) that it was inspired by OpenSUSE, preferably with a URL included that shows where you got it from. No need to pull in the other parts if they're not really needed.

@furstj
Copy link
Copy Markdown
Contributor Author

furstj commented May 1, 2019

I made a notice in the patch file mentioning the original work of S. Brabec from SUSE.

@boegel
Copy link
Copy Markdown
Member

boegel commented May 1, 2019

@furstj You'll need to fix the checksum accordingly...

Do you mind making this same change (adding the patch file) to all bzip2 easyconfigs that use GCCcore as a toolchain, for consistency sake?

@furstj
Copy link
Copy Markdown
Contributor Author

furstj commented May 1, 2019

Sorry, I forgot to update the checksums. I will make also the same change to all bzip2 easyconfigs (both for GCCcore and Intel toolchains) in a moment.

@boegel
Copy link
Copy Markdown
Member

boegel commented May 1, 2019

@furstj If you do more than just the GCCcore ones, please do all for bzip2 1.0.6...

@furstj
Copy link
Copy Markdown
Contributor Author

furstj commented May 1, 2019

Ok :). Should I put it in this PR via update-pr or should I make a new PR?

@boegel
Copy link
Copy Markdown
Member

boegel commented May 1, 2019

@furstj Updating this PR is fine, no need to open a new one.

@furstj
Copy link
Copy Markdown
Contributor Author

furstj commented May 1, 2019

Ok, the mega update is on the way ...

@akesandgren
Copy link
Copy Markdown
Contributor

Can remember... do we autoadd PKG_CONFIG_PATH for simple stuff like this or do the bzip easyconfigs need it added manually?

@furstj
Copy link
Copy Markdown
Contributor Author

furstj commented May 1, 2019

I don't know. Anyway, the patch works fine on SuSE. The module generated for bzip2 automatically sets the PKG_CONFIG_PATH to

/opt/easybuild/software/bzip2/1.0.6-GCCcore-8.2.0/lib/pkgconfig

@boegel
Copy link
Copy Markdown
Member

boegel commented May 1, 2019

@furstj You overlooked bzip2-1.0.6.eb, let's patch that one too? :)

@boegel
Copy link
Copy Markdown
Member

boegel commented May 1, 2019

@akesandgren Updating $PKG_CONFIG_PATH is done automagically for standard locations, cfr. https://github.com/easybuilders/easybuild-framework/blob/master/easybuild/framework/easyblock.py#L1323

@boegel boegel modified the milestones: 3.x, next release (3.9.1) May 1, 2019
@furstj
Copy link
Copy Markdown
Contributor Author

furstj commented May 1, 2019

Ops, I forgot to include the bzip2-1.0.6.eb in --update-pr. It is included now.

@boegel
Copy link
Copy Markdown
Member

boegel commented May 3, 2019

Test report by @boegel
SUCCESS
Build succeeded for 40 out of 40 (40 easyconfigs in this PR)
node2016.delcatty.os - Linux centos linux 7.6.1810, Intel(R) Xeon(R) CPU E5-2670 0 @ 2.60GHz, Python 2.7.5
See https://gist.github.com/a4d2bea80c7806f94f6d5af1eb8a685c for a full test report.

@boegel
Copy link
Copy Markdown
Member

boegel commented May 3, 2019

Going in, thanks @furstj!

@boegel boegel merged commit 47b1e3e into easybuilders:develop May 3, 2019
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.

3 participants