dist: move isl package to /opt/scylladb

This commit is contained in:
Takuya ASADA
2015-10-19 04:59:57 +00:00
parent 6db2ddc53b
commit 23b69d610c
2 changed files with 45 additions and 4 deletions

View File

@@ -68,11 +68,13 @@ if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-binutils-2.25-5.el7.centos.x86_64.rpm ];
fi
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
if [ ! -f $RPMBUILD/RPMS/x86_64/scylla-isl-0.14-3.el7.centos.x86_64.rpm ]; then
rpm --define "_topdir $RPMBUILD" -ivh build/srpms/isl-0.14-3.fc22.src.rpm
patch $RPMBUILD/SPECS/isl.spec < dist/redhat/centos_dep/isl.diff
rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/isl.spec
fi
do_install isl-0.14-3.el7.centos.x86_64.rpm
do_install isl-devel-0.14-3.el7.centos.x86_64.rpm
do_install scylla-isl-0.14-3.el7.centos.x86_64.rpm
do_install scylla-isl-devel-0.14-3.el7.centos.x86_64.rpm
if [ ! -f $RPMBUILD/RPMS/x86_64/gcc-5.1.1-4.el7.centos.x86_64.rpm ]; then
rpmbuild --define "_topdir $RPMBUILD" --define "fedora 21" --rebuild build/srpms/gcc-5.1.1-4.fc22.src.rpm

39
dist/redhat/centos_dep/isl.diff vendored Normal file
View File

@@ -0,0 +1,39 @@
--- isl.spec 2015-01-06 16:24:49.000000000 +0000
+++ isl.spec.1 2015-10-18 12:12:38.000000000 +0000
@@ -1,5 +1,5 @@
Summary: Integer point manipulation library
-Name: isl
+Name: scylla-isl
Version: 0.14
License: MIT
Group: System Environment/Libraries
@@ -17,8 +17,10 @@
BuildRequires: gmp-devel
BuildRequires: pkgconfig
+Requires: scylla-env
Source0: http://isl.gforge.inria.fr/isl-%{version}.tar.xz
+%define _prefix /opt/scylladb
%description
isl is a library for manipulating sets and relations of integer points
@@ -32,7 +34,8 @@
%package devel
Summary: Development for building integer point manipulation library
-Requires: isl%{?_isa} == %{version}-%{release}
+Requires: scylla-env
+Requires: scylla-isl%{?_isa} == %{version}-%{release}
Requires: gmp-devel%{?_isa}
Group: Development/Libraries
@@ -47,7 +50,7 @@
graphs), dependence analysis and bounds on piecewise step-polynomials.
%prep
-%setup -q
+%setup -q -n isl-%{version}
%build
%configure