diff --git a/dist/redhat/centos_dep/binutils.diff b/dist/redhat/centos_dep/binutils.diff new file mode 100644 index 0000000000..26b4d44448 --- /dev/null +++ b/dist/redhat/centos_dep/binutils.diff @@ -0,0 +1,81 @@ +--- binutils.spec 2015-10-19 05:45:55.106745163 +0000 ++++ binutils.spec.1 2015-10-19 05:45:55.807742899 +0000 +@@ -17,7 +17,7 @@ + %define enable_deterministic_archives 1 + + Summary: A GNU collection of binary utilities +-Name: %{?cross}binutils%{?_with_debug:-debug} ++Name: scylla-%{?cross}binutils%{?_with_debug:-debug} + Version: 2.25 + Release: 5%{?dist} + License: GPLv3+ +@@ -29,6 +29,7 @@ + # instead. + + Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2 ++%define _prefix /opt/scylladb + + Source2: binutils-2.19.50.0.1-output-format.sed + Patch01: binutils-2.20.51.0.2-libtool-lib64.patch +@@ -82,6 +83,9 @@ + BuildRequires: texinfo >= 4.0, gettext, flex, bison, zlib-devel + # BZ 920545: We need pod2man in order to build the manual pages. + BuildRequires: /usr/bin/pod2man ++ ++Requires: scylla-env ++ + # Required for: ld-bootstrap/bootstrap.exp bootstrap with --static + # It should not be required for: ld-elf/elf.exp static {preinit,init,fini} array + %if %{run_testsuite} +@@ -105,8 +109,8 @@ + + %if "%{build_gold}" == "both" + Requires(post): coreutils +-Requires(post): %{_sbindir}/alternatives +-Requires(preun): %{_sbindir}/alternatives ++Requires(post): /sbin/alternatives ++Requires(preun): /sbin/alternatives + %endif + + # On ARM EABI systems, we do want -gnueabi to be part of the +@@ -131,11 +135,12 @@ + %package devel + Summary: BFD and opcodes static and dynamic libraries and header files + Group: System Environment/Libraries +-Provides: binutils-static = %{version}-%{release} ++Provides: scylla-binutils-static = %{version}-%{release} ++Requires: scylla-env + Requires(post): /sbin/install-info + Requires(preun): /sbin/install-info + Requires: zlib-devel +-Requires: binutils = %{version}-%{release} ++Requires: scylla-binutils = %{version}-%{release} + + %description devel + This package contains BFD and opcodes static and dynamic libraries. +@@ -411,11 +416,11 @@ + %post + %if "%{build_gold}" == "both" + %__rm -f %{_bindir}/%{?cross}ld +-%{_sbindir}/alternatives --install %{_bindir}/%{?cross}ld %{?cross}ld \ ++/sbin/alternatives --install %{_bindir}/%{?cross}ld %{?cross}ld \ + %{_bindir}/%{?cross}ld.bfd %{ld_bfd_priority} +-%{_sbindir}/alternatives --install %{_bindir}/%{?cross}ld %{?cross}ld \ ++/sbin/alternatives --install %{_bindir}/%{?cross}ld %{?cross}ld \ + %{_bindir}/%{?cross}ld.gold %{ld_gold_priority} +-%{_sbindir}/alternatives --auto %{?cross}ld ++/sbin/alternatives --auto %{?cross}ld + %endif + %if %{isnative} + /sbin/ldconfig +@@ -433,8 +438,8 @@ + %preun + %if "%{build_gold}" == "both" + if [ $1 = 0 ]; then +- %{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.bfd +- %{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.gold ++ /sbin/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.bfd ++ /sbin/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.gold + fi + %endif + %if %{isnative} diff --git a/dist/redhat/centos_dep/build_dependency.sh b/dist/redhat/centos_dep/build_dependency.sh index 10221f3969..22b7ce40e2 100755 --- a/dist/redhat/centos_dep/build_dependency.sh +++ b/dist/redhat/centos_dep/build_dependency.sh @@ -59,10 +59,12 @@ if [ ! -f $RPMBUILD/RPMS/noarch/scylla-env-1.0-1.el7.centos.noarch.rpm ]; then fi do_install scylla-env-1.0-1.el7.centos.noarch.rpm -if [ ! -f $RPMBUILD/RPMS/x86_64/binutils-2.25-5.el7.centos.x86_64.rpm ]; then - rpmbuild --define "_topdir $RPMBUILD" --rebuild build/srpms/binutils-2.25-5.fc22.src.rpm +if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-binutils-2.25-5.el7.centos.x86_64.rpm ]; then + rpm --define "_topdir $RPMBUILD" -ivh build/srpms/binutils-2.25-5.fc22.src.rpm + patch $RPMBUILD/SPECS/binutils.spec < dist/redhat/centos_dep/binutils.diff + rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/binutils.spec fi -do_install binutils-2.25-5.el7.centos.x86_64.rpm +do_install scylla-binutils-2.25-5.el7.centos.x86_64.rpm if [ ! -f $RPMBUILD/RPMS/x86_64/isl-0.14-3.el7.centos.x86_64.rpm ]; then rpmbuild --define "_topdir $RPMBUILD" --rebuild build/srpms/isl-0.14-3.fc22.src.rpm