diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2017-05-17 19:00:07 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-05-20 10:55:16 +0000 |
| commit | bc1c848772dc9101b3d034634ee69ab6cc0dba14 (patch) | |
| tree | c3f8d84dbb73d85662b0c06c3d33776a25f9eaec | |
| parent | 2038ad010b54ea6c2252bf487837d3e72448040f (diff) | |
Remove specific versions of some packages.
Add lcov for rhel.
Correct fedora Development tools group and rpm-build.
Change-Id: I0a19e239e6bc4f34f3aacfbb7e08e2abbdc061ed
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -47,19 +47,20 @@ else DEB_DEPENDS += default-jdk-headless endif -RPM_DEPENDS_GROUPS = 'Development Tools' RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel RPM_DEPENDS += python-devel ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) RPM_DEPENDS += python2-virtualenv + RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' else RPM_DEPENDS += python-virtualenv + RPM_DEPENDS_GROUPS = 'Development Tools' endif -RPM_DEPENDS += chrpath libffi-devel +RPM_DEPENDS += chrpath libffi-devel rpm-build RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros -ifeq ($(OS_ID),centos) +ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) EPEL_DEPENDS += lcov else RPM_DEPENDS += lcov @@ -201,7 +202,7 @@ else ifneq ("$(wildcard /etc/redhat-release)","") @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS) - @sudo -E debuginfo-install $(CONFIRM) glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64 + @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib else $(error "This option currently works only on Ubuntu or Centos systems") endif |