Skip to content
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.

Sign up for GitHub

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

Jump to bottom

RPM packaging updates #5189

Closed
wants to merge 4 commits into from
Closed

RPM packaging updates #5189

wants to merge 4 commits into from

Conversation

lazyfrosch
Copy link
Contributor

fixes #5177 - correcting Boost dependencies against EPEL and/or Icinga Repo
fixes #5188 - Depending on a newer release package

@lazyfrosch
Fix httpss link in doc
e669e99
@lazyfrosch
Update Boost dependency to minimum of 1.48 in INSTALL and icinga2.spec
837c0c2 
Icinga 2 does not build with 1.41:

    /usr/include/boost/range/const_iterator.hpp:37:58: error: no type
    named 'const_iterator' in 'class boost::intrusive_ptr<icinga::Array>'
    ...
    /usr/include/boost/thread/locks.hpp:269:22: error: cannot bind
    'boost::unique_lock<boost::mutex>' lvalue to
    'boost::unique_lock<boost::mutex>&&'

fixes #5188

This also refs #5177 as a partial fix for the dependencies, when not
using Icinga's boost packages.
@lazyfrosch
icinga2.spec: Update RedHat SCL handling for builds on el 5 and 6
122a132 
So you don't have to modify the environment.
@lazyfrosch lazyfrosch added area/documentation End-user or developer help area/setup Installation, systemd, sample files labels Apr 24, 2017
@lazyfrosch lazyfrosch self-assigned this Apr 24, 2017
@lazyfrosch
Copy link
Contributor Author

Please don't merge this yet.

I was wondering why we previously did this: @gunnarbeutner ?

export PATH=/opt/rh/devtoolset-2/root/usr/bin:$PATH
ln -sf /opt/rh/devtoolset-2/root/usr/bin/ld.bfd /opt/rh/devtoolset-2/root/usr/bin/ld
for file in `find /opt/rh/devtoolset-2/root/usr/include/c++ -name c++config.h`; do
  echo '#define _GLIBCXX__PTHREADS' >> $file
done

I dropped the lines for now - it builds at least on CentOS6.

@dnsmichi
Copy link
Contributor

AFAIK that's only necessary on el5, but I did not test that.

lazyfrosch added a commit to Icinga/icinga-packaging that referenced this pull request Apr 24, 2017
@lazyfrosch
icinga2: Update spec for better boost dependencies
4f6829c 
See Icinga/icinga2#5189
@lazyfrosch lazyfrosch mentioned this pull request Apr 24, 2017
Closed
@lazyfrosch
Copy link
Contributor Author

@dnsmichi Tested build on EL5 without this changes, against EPEL Boost + Icinga Boost

So I guess we could drop it for now - unless @gunnarbeutner has objections...

@dnsmichi
Copy link
Contributor

I don't know why exactly we've added such, but it could be related to a broken boost version on el5/6 which was then resolved with 1.53 from packages.icinga.com. As said earlier, I wasn't aware that we depend on our own boost rpms for older RHEL versions. Might be a good time to clean things up after ~3 years :-)

@lazyfrosch
Copy link
Contributor Author

If so it would be a runtime error, I tested the build against 1.48 (EPEL)

@lazyfrosch
icinga2.spec: Add selecting g++ compiler on older SUSE releases
084ea32 
g++ is too old, and the newer binary is suffixed.
@lazyfrosch lazyfrosch changed the title WIP: RPM packaging updates RPM packaging updates May 2, 2017
@lazyfrosch
Copy link
Contributor Author

Please review and merge, this has been tested nearly everywhere.

Changes are already applied to https://github.com/icinga/icinga-packaging/tree/rpm/snapshot

@dnsmichi
Copy link
Contributor

dnsmichi commented May 3, 2017

Thanks, looks good 👍 e669e99 is already fixed in master (separate PR), I'm leaving that out.

@dnsmichi
Copy link
Contributor

dnsmichi commented May 3, 2017

Created a separate issue for the suse g++ compiler version, just a cosmetic change - #5218.

@dnsmichi
Copy link
Contributor

dnsmichi commented May 3, 2017

Rebased, reworded and merged to master, thanks.

@dnsmichi dnsmichi closed this May 3, 2017
@lazyfrosch lazyfrosch deleted the fix/rpm-packaging branch May 3, 2017 11:51
@dnsmichi dnsmichi modified the milestone: 2.7.0 May 23, 2017
lazyfrosch added a commit to Icinga/rpm-icinga2 that referenced this pull request Feb 6, 2018
@lazyfrosch
icinga2: Update spec for better boost dependencies
b799c93 
See Icinga/icinga2#5189
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dnsmichi dnsmichi Awaiting requested review from dnsmichi

@gunnarbeutner gunnarbeutner Awaiting requested review from gunnarbeutner

@dgoetz dgoetz Awaiting requested review from dgoetz

Assignees

@lazyfrosch lazyfrosch

Labels
area/documentation End-user or developer help area/setup Installation, systemd, sample files
Projects
None yet
Milestone
2.7.0
Development

Successfully merging this pull request may close these issues.

Boost >= 1.48 required Issues Packing icinga 2.6.3 tar.gz to RPM
2 participants
@lazyfrosch @dnsmichi