[gprbuild/f22] Do not pass versioned RTL

Pavel Zhukov landgraf at fedoraproject.org
Tue Feb 17 15:25:47 UTC 2015


commit 7d8a65d269f36a1a1f632b5fe54c97e0a4389ae6
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date:   Tue Feb 17 16:25:24 2015 +0100

    Do not pass versioned RTL

 gprbuild-2014-nortl.patch |   21 +++++++++++++++++++++
 gprbuild.spec             |   11 ++++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/gprbuild-2014-nortl.patch b/gprbuild-2014-nortl.patch
new file mode 100644
index 0000000..b3e6d98
--- /dev/null
+++ b/gprbuild-2014-nortl.patch
@@ -0,0 +1,21 @@
+diff --git a/src/gprlib.adb b/src/gprlib.adb
+index 3d81609..8c49496 100644
+--- a/src/gprlib.adb
++++ b/src/gprlib.adb
+@@ -1183,14 +1183,10 @@ begin
+ 
+                      Libgnat :=
+                        new String'
+-                         ("-lgnat" &
+-                          Shared_Libgnat_Separator &
+-                          Line (6 .. Last));
++                         ("-lgnat");
+                      Libgnarl :=
+                        new String'
+-                         ("-lgnarl" &
+-                          Shared_Libgnat_Separator &
+-                          Line (6 .. Last));
++                         ("-lgnarl");
+                   end if;
+ 
+                else
diff --git a/gprbuild.spec b/gprbuild.spec
index a5c08ac..9025025 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,6 +1,6 @@
 Name:       gprbuild
 Version:    2014
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Ada project builder
 Group:      Development/Languages
 License:    GPLv2+
@@ -12,6 +12,7 @@ Patch0:     %{name}-%{version}-noopenvms.patch
 Patch1:     %{name}-%{version}-iterator_variable.patch
 Patch2:     %{name}-%{version}-destdir.patch
 Patch3:     %{name}-%{version}-usrmove.patch
+Patch4:     %{name}-%{version}-nortl.patch
 
 BuildRequires:  xmlada-devel
 BuildRequires:  gcc-gnat > 5.0
@@ -39,12 +40,14 @@ and libraries and is particularly well-suited for compiled languages.
 %patch1 -p1
 %patch2 -p1 
 %patch3 -p1 
+%patch4 -p1 
 
 # Update the various config.guess to upstream release for new arch support
 cp /usr/lib/rpm/config.* .
 
 %build
 %configure --disable-rpath --datadir="%{buildroot}/%{_datadir}" --libdir="%{buildroot}/%{_libdir}" --bindir="%{buildroot}/%{_bindir}" --libexecdir="%{buildroot}/%{_libexecdir}"
+export GPRLIB_DEBUG="TRUE"
 make %{?_smp_mflags} LIBRARY_TYPE="relocatable" GNATOPTFLAGS="%{Gnatmake_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir 
 
 %install
@@ -68,6 +71,12 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
 %_GNAT_project_dir/*
 
 %changelog
+* Tue Feb 17 2015 Pavel Zhukov <landgraf at fedoraproject.org> - 2014-2
+- Do not pass RTL version to linker (TBD should be fixed upstream)
+
+* Tue Feb 17 2015 Pavel Zhukov <landgraf at fedoraproject.org> - 2014-1
+- New release 2014
+
 * Sun Feb 15 2015 Pavel Zhukov <landgraf at fedoraproject.org> - 2013-16
 - Remove OpenVMS from supported OS
 


More information about the scm-commits mailing list