dev-ruby/facter: ebuild cleanup #9339
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,18 +17,16 @@ if [[ ${PV} == 9999 ]] ; then | |
| inherit git-r3 | ||
| EGIT_REPO_URI="https://github.com/puppetlabs/facter.git" | ||
| EGIT_BRANCH="master" | ||
| else | ||
| [[ "${PV}" = *_rc* ]] || \ | ||
| KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" | ||
| SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" | ||
| fi | ||
|
|
||
| BDEPEND=" | ||
| >=sys-devel/gcc-4.8:* | ||
| dev-cpp/cpp-hocon" | ||
| COMMON_DEPEND=" | ||
| >=dev-libs/leatherman-1.0.0:= | ||
| dev-libs/openssl:* | ||
| sys-apps/util-linux | ||
|
|
@@ -40,23 +38,29 @@ CDEPEND=" | |
|
|
||
| ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )" | ||
|
|
||
| RDEPEND="${COMMON_DEPEND}" | ||
| DEPEND="${BDEPEND} | ||
| ${COMMON_DEPEND}" | ||
|
|
||
| # restore ${S} and override all phases exported by ruby-ng.eclass | ||
| S="${WORKDIR}/${P}" | ||
|
|
||
| pkg_setup() { | ||
| ruby-ng_pkg_setup | ||
| } | ||
|
|
||
| src_unpack() { | ||
|
There was a problem hiding this comment. isn't this section the default already? There was a problem hiding this comment. This is to avoid ruby-ng_src_unpack() |
||
| default | ||
|
|
||
| if [[ ${PV} == 9999 ]] ; then | ||
| git-r3_src_unpack | ||
| fi | ||
| } | ||
|
|
||
| src_prepare() { | ||
| # be explicit about the version of rspec we test with | ||
| sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \ | ||
| CMakeLists.txt || die | ||
| # be more lenient for software versions for tests | ||
| sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \ | ||
| -e '/rspec/ s/2.11.0/2.11/' \ | ||
|
|
@@ -66,12 +70,18 @@ src_prepare() { | |
| cmake-utils_src_prepare | ||
| } | ||
|
|
||
| each_ruby_configure() { | ||
| # hack for correct calculation of relative path from facter.rb to | ||
| # libfacter.so | ||
| my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir') | ||
| } | ||
|
|
||
| src_configure() { | ||
| ruby-ng_src_configure | ||
|
|
||
| local mycmakeargs=( | ||
| -DCMAKE_VERBOSE_MAKEFILE=ON | ||
|
There was a problem hiding this comment. why'd you get rid of the build type? and install prefix? and blkid location? There was a problem hiding this comment. CMAKE_BUILD_TYPE and CMAKE_INSTALL_PREFIX are passed by cmake-utils.eclass. Do we really need to override them? BLKID_LIBRARY is not used by build system for a long time: |
||
| -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir} | ||
| ) | ||
| if use debug; then | ||
| mycmakeargs+=( | ||
|
|
@@ -85,21 +95,15 @@ src_compile() { | |
| cmake-utils_src_compile | ||
| } | ||
|
|
||
| src_test() { | ||
| cmake-utils_src_test | ||
| } | ||
|
|
||
| each_ruby_install() { | ||
| doruby "${BUILD_DIR}"/lib/facter.rb | ||
| } | ||
|
|
||
| src_install() { | ||
| cmake-utils_src_install | ||
| ruby-ng_src_install | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
ruby isn't actually needed for this package to work, so no need to run it's pkg_setup
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 package already depends on ruby via ruby-ng.eclass (RUBY_OPTIONAL != yes). It can be made optional, but this should be done via use flag. Otherwise we can't properly install facter.rb for all ruby targets.
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.
ya, should probably be made optional then
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.
Don't expect me to do that in this PR as it probably require changes in reverse deps (app-admin/puppet). :)
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.
ok, but you can do multiple commits in a PR, but that's up to you :P
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.
Unfortunately, build system does not allow to disable ruby support. So this needs either additional hacks in the ebuild or patches for build system.