[gprbuild] Updated to 2011
Pavel Zhukov
landgraf at fedoraproject.org
Sun Mar 4 09:12:16 UTC 2012
commit 93d152f860690203bf93a79f46a0ce2fbba66038
Author: Pavel Zhukov <pavel at fedora17.home.zhukoff.net>
Date: Sun Mar 4 13:12:10 2012 +0400
Updated to 2011
.gitignore | 1 +
gprbuild-destdir.patch | 20 ++++-----------
gprbuild-gcc.patch | 19 ---------------
gprbuild-gcc46.patch | 10 --------
gprbuild-gccversion.patch | 56 --------------------------------------------
gprbuild-gnatflags.patch | 11 --------
gprbuild-shared.patch | 11 --------
gprbuild-unreference.patch | 39 ++++++++++++++++++++++++++++++
gprbuild-usrmove.patch | 11 ++++++++
gprbuild.spec | 51 ++++++++++++++++++---------------------
gprbuild_gnatflags.patch | 11 ++++++++
gprbuild_style.patch | 32 +++++++++++++++++++++++++
sources | 2 +-
13 files changed, 125 insertions(+), 149 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cda0031..b502e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/gprbuild-gpl-2010-src.tgz
+/gprbuild-gpl-2011-src.tgz
diff --git a/gprbuild-destdir.patch b/gprbuild-destdir.patch
index e33b8ba..c5761a3 100644
--- a/gprbuild-destdir.patch
+++ b/gprbuild-destdir.patch
@@ -1,15 +1,6 @@
---- a/Makefile.in 2011-02-05 01:10:28.682428002 +0300
-+++ b/Makefile.in 2011-02-05 01:11:20.654428003 +0300
-@@ -3,7 +3,7 @@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
- HOST=@HOST@
--
-+DESTDIR ?=
- # Relative to the gnat/ subdirectory (or absolute path)
- GNAT_SOURCE_DIR=../gnat_src
-
-@@ -89,36 +89,37 @@
+--- gprbuild-2011-src/Makefile.in 2011-02-17 17:12:24.000000000 +0100
++++ gprbuild-2011-src/Makefile.in 2012-02-19 22:39:54.000000000 +0100
+@@ -121,36 +121,37 @@
-XBUILD_TOOL=gprbuild
install: install.data install.bin
@@ -66,7 +57,7 @@
$(objdir)/gprbuild_dummies.o: src/gprbuild_dummies.c
gcc -c -o $@ $<
-@@ -143,8 +144,8 @@
+@@ -181,8 +182,8 @@
make -C doc
install-doc:
@@ -76,4 +67,5 @@
+ ${CP} doc/*.html ${DESTDIR}/${docdir}/html
tests: force
- cd internal/gprtests_python; ./run-gprconfig-test.py
+ cd internal/gprtests_python; python ./run-gprconfig-test.py
+
diff --git a/gprbuild-unreference.patch b/gprbuild-unreference.patch
new file mode 100644
index 0000000..bed6618
--- /dev/null
+++ b/gprbuild-unreference.patch
@@ -0,0 +1,39 @@
+--- a/src/buildgpr.adb 2012-03-04 08:28:33.906391551 +0400
++++ b/src/buildgpr.adb 2012-03-04 08:29:18.346390580 +0400
+@@ -71,6 +71,7 @@
+
+ use Gpr_Util.Knowledge;
+ use type ALI.ALI_Id, Opt.Verbosity_Level_Type, Opt.Warning_Mode_Type;
++ pragma Unreferenced(Source_Project);
+
+ Object_Suffix : constant String := Get_Target_Object_Suffix.all;
+ -- The suffix of object files on this platform
+--- a/src/buildgpr.adb 2012-03-04 08:30:59.507387219 +0400
++++ b/src/buildgpr.adb 2012-03-04 08:31:35.833385726 +0400
+@@ -71,7 +71,6 @@
+
+ use Gpr_Util.Knowledge;
+ use type ALI.ALI_Id, Opt.Verbosity_Level_Type, Opt.Warning_Mode_Type;
+- pragma Unreferenced(Source_Project);
+
+ Object_Suffix : constant String := Get_Target_Object_Suffix.all;
+ -- The suffix of object files on this platform
+@@ -4850,6 +4849,7 @@
+ Pid : Process_Id;
+ Options : String_List_Access;
+ begin
++ pragma Unreferenced (Source_Project);
+ if not Opt.Quiet_Output then
+ if Opt.Verbose_Mode then
+ Write_Str (Compiler_Path);
+--- a/Makefile.in 2012-03-04 08:50:58.595351549 +0400
++++ b/Makefile.in 2012-03-04 08:51:14.092351078 +0400
+@@ -58,7 +58,7 @@
+
+ PROCESSORS ?= 1
+
+-GNATMAKE=gnatmake -p -m -j${PROCESSORS} ${GNATFLAGS}
++GNATMAKE=gnatmake -gnatwF -p -m -j${PROCESSORS} ${GNATFLAGS}
+ ifeq ($(strip $(filter-out %vms%,$(host))),)
+ GNATMAKE=${GNATMAKE} -XOS=vms
+ endif
diff --git a/gprbuild-usrmove.patch b/gprbuild-usrmove.patch
new file mode 100644
index 0000000..8d7fb94
--- /dev/null
+++ b/gprbuild-usrmove.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+ ---------------------
+
+ function Get_Install_Dir (S : String) return String is
+- Exec : String := S;
++ Exec : String := Normalize_Pathname (S, Resolve_Links => True);
+ Path_Last : Integer := 0;
+
+ begin
diff --git a/gprbuild.spec b/gprbuild.spec
index 6434c29..d121fea 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,6 +1,6 @@
Name: gprbuild
-Version: 2010
-Release: 10%{?dist}
+Version: 2011
+Release: 3%{?dist}
Summary: Ada project builder
Group: Development/Languages
License: GPLv2+
@@ -8,27 +8,20 @@ URL: http://libre.adacore.com
## Auth required
## Direct download is not available
Source0: %{name}-gpl-%{version}-src.tgz
-## Patch for shared libs
-Patch0: %{name}-shared.patch
-## Patch for gcc-4.5.2
-## __gnat_get_env_vars_case_sensitive check isn't needed for package
-Patch1: %{name}-gcc.patch
-## RPM specific oatch (add DESTDIR to Makefile)
+## Style fix
+Patch0: %{name}_style.patch
+## Fedora specific
+Patch1: %{name}_gnatflags.patch
Patch2: %{name}-destdir.patch
-## Fix issue for localisation version of GCC - APPROVED by AdaCore
-Patch3: %{name}-gccversion.patch
-## Fedora specific
-Patch4: %{name}-gnatflags.patch
-## AI-0157 implementaion doesn't realised in gcc-4.6
-Patch5: %{name}-gcc46.patch
+Patch3: %{name}-usrmove.patch
+Patch4: gprbuild-unreference.patch
+
BuildRequires: xmlada-devel
BuildRequires: gcc-gnat libgnat-static libgnat-devel
BuildRequires: fedora-gnat-project-common >= 2
# xmlada and gcc-gnat only available on these:
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 alpha
-Requires: xmlada
-
%description
GPRbuild is an advanced software tool designed to help automate
the construction of multi-language systems.
@@ -50,16 +43,15 @@ Devel package (examples) for gprbuild
%prep
%setup -q -n %{name}-%{version}-src
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
%configure --disable-rpath
-make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir
+make %{?_smp_mflags} LIBRARY_TYPE="relocatable" GNATFLAGS="%{GNAT_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir
%install
rm -rf %{buildroot}
@@ -67,7 +59,7 @@ make install DESTDIR=%{buildroot}
mkdir -p %{buildroot}%{_docdir}/%{name}
install -m0644 README %{buildroot}%{_docdir}/%{name}/
install -m0644 COPYING %{buildroot}%{_docdir}/%{name}/
-install -m0644 CHANGE_160803 %{buildroot}%{_docdir}/%{name}/
+install -m0644 CHANGE* %{buildroot}%{_docdir}/%{name}/
find %{buildroot}%{_datadir}/%{name}/examples -type f -exec chmod -x {} \;
mv -f %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version}
@@ -85,10 +77,15 @@ mv -f %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version}
%{_datadir}/%{name}/examples/*
%changelog
-* Tue Jan 10 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2010-10
-- Rebuild for new GCC-4.7
+* Sun Mar 04 2012 Pavel Zhukov <landgraf at fedoraproject.org> - 2011-3
+- Updated to 2011 (#722704)
+- Add unreference patch
+
+* Mon Feb 27 2012 Björn Persson <bjorn at rombobjörn.se> - 2011-1
+- Patched to resolve the link /bin → /usr/bin.
+- Removed a superfluous explicit dependency on xmlada.
-* Sun Jul 17 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 2010-8
+* Sun Jul 17 2011 Pavel Zhukov <landgraf at fedoraproject.org> - 2010-10
- Rebuld for xmlada 2011
* Thu Mar 24 2011 Dan Horák <dan[at]danny.cz> - 2010-8
diff --git a/gprbuild_gnatflags.patch b/gprbuild_gnatflags.patch
new file mode 100644
index 0000000..676a9cd
--- /dev/null
+++ b/gprbuild_gnatflags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in 2012-03-03 21:09:21.565722279 +0400
++++ b/Makefile.in 2012-03-03 21:09:35.659721859 +0400
+@@ -58,7 +58,7 @@
+
+ PROCESSORS ?= 1
+
+-GNATMAKE=gnatmake -p -m -j${PROCESSORS}
++GNATMAKE=gnatmake -p -m -j${PROCESSORS} ${GNATFLAGS}
+ ifeq ($(strip $(filter-out %vms%,$(host))),)
+ GNATMAKE=${GNATMAKE} -XOS=vms
+ endif
diff --git a/gprbuild_style.patch b/gprbuild_style.patch
new file mode 100644
index 0000000..f17889a
--- /dev/null
+++ b/gprbuild_style.patch
@@ -0,0 +1,32 @@
+--- a/src/gpr_version.adb 2012-03-03 21:02:22.968734731 +0400
++++ b/src/gpr_version.adb 2012-03-03 21:02:28.533734565 +0400
+@@ -37,7 +37,7 @@
+ Last : Positive;
+ First : Positive;
+
+- Date : String (1 .. 10) := "(unknown) ";
++ Date : String (1 .. 10) := "(unknown) ";
+ Host : constant String := " (" & GprConfig.Sdefault.Hostname & ')';
+
+ begin
+--- a/src/gpr_version.adb 2012-03-03 21:04:32.980730863 +0400
++++ b/src/gpr_version.adb 2012-03-03 21:04:38.298730705 +0400
+@@ -36,7 +36,6 @@
+ function Gpr_Version_String return String is
+ Last : Positive;
+ First : Positive;
+-
+ Date : String (1 .. 10) := "(unknown) ";
+ Host : constant String := " (" & GprConfig.Sdefault.Hostname & ')';
+
+--- a/src/gpr_version.ads 2012-03-03 21:04:56.309730170 +0400
++++ b/src/gpr_version.ads 2012-03-03 21:05:06.498729866 +0400
+@@ -36,7 +36,7 @@
+
+ package GPR_Version is
+
+- Gpr_Version: constant String := "2011";
++ Gpr_Version : constant String := "2011";
+ -- Static string identifying this version
+
+ function Gpr_Version_String return String;
diff --git a/sources b/sources
index c9c9856..ac0a31f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca3dd79405d08d04744b1356cf3c71cc gprbuild-gpl-2010-src.tgz
+d8ad6fa682b5155c928364960400be4e gprbuild-gpl-2011-src.tgz
More information about the scm-commits
mailing list