X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=e4c3b19b66bc7c94173c46649759beeaafe3f640;hb=0d351d3fdddbcfe2e47021c26043419f6da4e7b4;hp=80ebec2f528d2055773b625c4e73b411d52b8c06;hpb=d0ab4a8eabcf9d8b2fb96e2b77ee1266b707f99f;p=build.git diff --git a/lxc.mk b/lxc.mk index 80ebec2f..e4c3b19b 100644 --- a/lxc.mk +++ b/lxc.mk @@ -372,12 +372,14 @@ IN_BOOTCD += pyplnet # # for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff # +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18)" rvm-ruby-MODULES := rvm-ruby rvm-ruby-SPEC := rpm/rvm-ruby.spec rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel # Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against # turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream -#ALL += rvm-ruby +ALL += rvm-ruby +endif # # OML measurement library