From 97ff03c3238a2984fd87cfd0239fe3eb289ffdd7 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 5 Dec 2017 17:47:35 +0000 Subject: [PATCH] bindep.txt: Consolidate some RPM depdendencies Since bindep commit de6726520b1b ("bindep: Query for RPM capabilities as well") we can now use RPM capabilities in the bindep.txt files and this allows us to merge some of the existing RPM dependencies from SUSE and RedHat. Moreover, drop the profile information from the gcc package since it's common everywhere. Change-Id: Ia040b1f87df9625e062a0f9ae2b0ef566138f463 --- bindep.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bindep.txt b/bindep.txt index 812e00c3..5a05c5a4 100644 --- a/bindep.txt +++ b/bindep.txt @@ -22,8 +22,10 @@ # using this file. # +# The gcc compiler +gcc + # Base requirements for Ubuntu -gcc [platform:dpkg] git-core [platform:dpkg] libssl-dev [platform:dpkg] libffi-dev [platform:dpkg] @@ -35,13 +37,10 @@ python3-apt [platform:dpkg] python3-dev [platform:dpkg] # Base requirements for RPM distros -gcc [platform:rpm] gcc-c++ [platform:rpm] git [platform:rpm] -libffi-devel [platform:rpm !platform:opensuseproject-42] -libffi-devel-gcc5 [platform:opensuseproject-42] -openssl-devel [platform:redhat] -libopenssl-devel [platform:suse] +libffi-devel [platform:rpm] +openssl-devel [platform:rpm] python-devel [platform:rpm] python2-dnf [platform:fedora]