[gprbuild/f22] New release (2014)
Pavel Zhukov
landgraf at fedoraproject.org
Tue Feb 17 09:24:17 UTC 2015
commit b19b6c0f9bc1e9728f47ef61e84baa0f8db45432
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date: Tue Feb 17 10:23:56 2015 +0100
New release (2014)
.gitignore | 1 +
gprbuild-2013-destdir.patch | 121 --------------------
gprbuild-2013-openvms.patch | 20 ----
gprbuild-2013-remove_rpath.patch | 12 --
gprbuild-2014-destdir.patch | 17 +++
gprbuild-2014-iterator_variable.patch | 14 +++
gprbuild-2014-noopenvms.patch | 16 +++
...13-usrmove.patch => gprbuild-2014-usrmove.patch | 8 +-
gprbuild-armcompiller.patch | 13 --
gprbuild.spec | 32 +++---
sources | 2 +-
11 files changed, 68 insertions(+), 188 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 653728e..2a276f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/gprbuild-gpl-2011-src.tgz
/gprbuild-gpl-2012-src.tgz
/gprbuild-gpl-2013-src.tgz
+/gprbuild-gpl-2014-src.tar.gz
diff --git a/gprbuild-2014-destdir.patch b/gprbuild-2014-destdir.patch
new file mode 100644
index 0000000..3bff2e8
--- /dev/null
+++ b/gprbuild-2014-destdir.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.in b/Makefile.in
+index 140c5dd..221e230 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -125,9 +125,9 @@ bootstrap-clean:
+
+ install: install.data install.bin
+ -${MKDIR} ${datadir}/gpr
+- $(RM) -r ${datadir}/examples/gprbuild
+- -${MKDIR} ${datadir}/examples/gprbuild
+- ${CP} -r examples/* ${datadir}/examples/gprbuild
++ $(RM) -r ${docdir}/gprbuild/examples/
++ -${MKDIR} ${docdir}/gprbuild/examples/
++ ${CP} -r examples/* ${docdir}/gprbuild/examples
+ ${RM} -r ${datadir}/doc/gprbuild
+ -${MKDIR} ${datadir}/doc/gprbuild
+ for format in html txt pdf info; do \
diff --git a/gprbuild-2014-iterator_variable.patch b/gprbuild-2014-iterator_variable.patch
new file mode 100644
index 0000000..8bfa587
--- /dev/null
+++ b/gprbuild-2014-iterator_variable.patch
@@ -0,0 +1,14 @@
+
+diff --git a/src/gprbuild-compilation-slave.adb b/src/gprbuild-compilation-slave.adb
+index 73b4b93..424588b 100644
+--- a/src/gprbuild-compilation-slave.adb
++++ b/src/gprbuild-compilation-slave.adb
+@@ -817,7 +817,7 @@ package body Gprbuild.Compilation.Slave is
+ S : Slave := Slave_S.Element (C);
+ begin
+ Proc (S);
+- Pool (C) := S;
++ Slave_S.Replace_Element (Pool, C, S);
+ end;
+ end loop;
+ end Iterate;
diff --git a/gprbuild-2014-noopenvms.patch b/gprbuild-2014-noopenvms.patch
new file mode 100644
index 0000000..8777632
--- /dev/null
+++ b/gprbuild-2014-noopenvms.patch
@@ -0,0 +1,16 @@
+diff --git a/gnat/hostparm.ads b/gnat/hostparm.ads
+index 16b4b39..814ae07 100644
+--- a/gnat/hostparm.ads
++++ b/gnat/hostparm.ads
+@@ -41,10 +41,7 @@ package Hostparm is
+ -- HOST Parameters --
+ ---------------------
+
+- Gnat_VMSp : Integer;
+- pragma Import (C, Gnat_VMSp, "__gnat_vmsp");
+-
+- OpenVMS : Boolean := Gnat_VMSp /= 0;
++ OpenVMS : Boolean := False;
+ -- Set True for OpenVMS host. See also OpenVMS target boolean in
+ -- system-vms.ads and system-vms_64.ads and OpenVMS_On_Target boolean in
+ -- Targparm. This is not a constant, because it can be modified by -gnatdm.
diff --git a/gprbuild-2013-usrmove.patch b/gprbuild-2014-usrmove.patch
similarity index 60%
rename from gprbuild-2013-usrmove.patch
rename to gprbuild-2014-usrmove.patch
index 8d7fb94..5050efa 100644
--- a/gprbuild-2013-usrmove.patch
+++ b/gprbuild-2014-usrmove.patch
@@ -1,6 +1,8 @@
---- gprbuild-2011-src/gnat/makeutl.adb 2012-02-21 01:16:24.000000000 +0100
-+++ gprbuild-2011-src/gnat/makeutl.adb 2012-02-21 01:16:25.000000000 +0100
-@@ -521,7 +521,7 @@
+diff --git a/gnat/makeutl.adb b/gnat/makeutl.adb
+index 3b72ed7..73349dc 100644
+--- a/gnat/makeutl.adb
++++ b/gnat/makeutl.adb
+@@ -710,7 +710,7 @@ package body Makeutl is
---------------------
function Get_Install_Dir (S : String) return String is
diff --git a/gprbuild.spec b/gprbuild.spec
index 447d21d..a5c08ac 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,24 +1,21 @@
Name: gprbuild
-Version: 2013
-Release: 16%{?dist}
+Version: 2014
+Release: 1%{?dist}
Summary: Ada project builder
Group: Development/Languages
License: GPLv2+
URL: http://libre.adacore.com
## Auth required
## Direct download is not available
-Source0: %{name}-gpl-%{version}-src.tgz
-## Fedora specific
-Patch1: %{name}-%{version}-destdir.patch
-Patch2: %{name}-armcompiller.patch
-## Fedora specific
+Source0: %{name}-gpl-%{version}-src.tar.gz
+Patch0: %{name}-%{version}-noopenvms.patch
+Patch1: %{name}-%{version}-iterator_variable.patch
+Patch2: %{name}-%{version}-destdir.patch
Patch3: %{name}-%{version}-usrmove.patch
-Patch6: %{name}-%{version}-remove_rpath.patch
-## Remove OpenVMS support
-Patch7: %{name}-%{version}-openvms.patch
BuildRequires: xmlada-devel
-BuildRequires: gcc-gnat libgnat-static libgnat-devel
+BuildRequires: gcc-gnat > 5.0
+BuildRequires: libgnat-static libgnat-devel
BuildRequires: fedora-gnat-project-common >= 2
Requires: fedora-gnat-project-common >= 2
Requires: gnat-srpm-macros
@@ -37,19 +34,18 @@ and libraries and is particularly well-suited for compiled languages.
%prep
-%setup -q -n %{name}-%{version}-src
-%patch1 -p1
+%setup -q -n gprbuild-gpl-%{version}-src
+%patch0 -p1
+%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch6 -p1
-%patch7 -p1
# Update the various config.guess to upstream release for new arch support
cp /usr/lib/rpm/config.* .
%build
-%configure --disable-rpath
-make %{?_smp_mflags} LIBRARY_TYPE="relocatable" GNATOPTFLAGS="%{Gnatmake_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir
+%configure --disable-rpath --datadir="%{buildroot}/%{_datadir}" --libdir="%{buildroot}/%{_libdir}" --bindir="%{buildroot}/%{_bindir}" --libexecdir="%{buildroot}/%{_libexecdir}"
+make %{?_smp_mflags} LIBRARY_TYPE="relocatable" GNATOPTFLAGS="%{Gnatmake_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir
%install
rm -rf %{buildroot}
@@ -58,7 +54,7 @@ find %{buildroot}%{_datadir}/gprconfig -type f -name "*.xml" -exec chmod -x {} \
mkdir __doc
mv %{buildroot}/%{_datadir}/doc/%{name}/* __doc
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
-find __doc/examples -type f -exec chmod -x {} \;
+##%%find __doc/examples -type f -exec chmod -x {} \;
%files
%defattr(-,root,root,-)
diff --git a/sources b/sources
index c8b9160..b664feb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f97cfb8b1dba3a10a9de1ef4d71117f8 gprbuild-gpl-2013-src.tgz
+0625ae36f588f36b3e481d1722b09dd6 gprbuild-gpl-2014-src.tar.gz
More information about the scm-commits
mailing list