[gprbuild/f22] Revert "New release (2014)"
Pavel Zhukov
landgraf at fedoraproject.org
Wed Feb 25 08:16:29 UTC 2015
commit d6aa0fc1e669de11ba2aa71f0c94266a559d1a4e
Author: Pavel Zhukov <landgraf at fedoraproject.org>
Date: Wed Feb 25 09:16:15 2015 +0100
Revert "New release (2014)"
This reverts commit b19b6c0f9bc1e9728f47ef61e84baa0f8db45432.
.gitignore | 1 -
gprbuild-2013-destdir.patch | 121 +++++++++++++++++++++
gprbuild-2013-openvms.patch | 20 ++++
gprbuild-2013-remove_rpath.patch | 12 ++
...14-usrmove.patch => gprbuild-2013-usrmove.patch | 8 +-
gprbuild-2014-destdir.patch | 17 ---
gprbuild-2014-iterator_variable.patch | 14 ---
gprbuild-2014-noopenvms.patch | 16 ---
gprbuild-armcompiller.patch | 13 +++
gprbuild.spec | 32 +++---
sources | 2 +-
11 files changed, 188 insertions(+), 68 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a276f5..653728e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
/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-2013-destdir.patch b/gprbuild-2013-destdir.patch
new file mode 100644
index 0000000..5a0d682
--- /dev/null
+++ b/gprbuild-2013-destdir.patch
@@ -0,0 +1,121 @@
+--- a/Makefile.in 2013-07-13 11:55:44.870791362 +0200
++++ b/Makefile.in 2013-07-13 12:00:43.106782490 +0200
+@@ -21,6 +21,7 @@
+ MKDIR=mkdir -p
+ BUILD=production
+
++DESTDIR ?=
+ prefix=@prefix@
+ srcdir=@srcdir@
+ root_objdir=@objdir@
+@@ -37,7 +38,7 @@
+ xmlada_prj_flags=@xmlada_prj_flags@
+
+ # How do we want to use XML/Ada ?
+-LIBRARY_TYPE=static
++LIBRARY_TYPE=relocatable
+ export LIBRARY_TYPE
+
+ objdir=obj
+@@ -124,45 +125,45 @@
+ -XBUILD_TOOL=gprbuild
+
+ 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 ${datadir}/doc/gprbuild
+- -${MKDIR} ${datadir}/doc/gprbuild
++ -${MKDIR} ${DESTDIR}/${datadir}/gpr
++ $(RM) -r ${DESTDIR}/${datadir}/doc/gprbuild/examples
++ -${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild/examples/
++ ${CP} -r examples/* ${DESTDIR}/${datadir}/doc/gprbuild/examples/
++ ${RM} -r ${DESTDIR}/${datadir}/doc/gprbuild
++ -${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild
+ for format in html txt pdf info; do \
+ if [ -d doc/$$format ] ; then \
+- ${MKDIR} ${datadir}/doc/gprbuild/$$format; \
+- ${CP} doc/$$format/* ${datadir}/doc/gprbuild/$$format; \
++ ${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild/$$format; \
++ ${CP} doc/$$format/* ${DESTDIR}/${datadir}/doc/gprbuild/$$format; \
+ if [ $$format = html ] ; then \
+- ${CP} doc/*.png ${datadir}/doc/gprbuild/html; \
++ ${CP} doc/*.png ${DESTDIR}/${datadir}/doc/gprbuild/html; \
+ sed -e "s/<doc_path>.*//" doc/gprbuild_gps.xml \
+- > ${datadir}/doc/gprbuild/html/gps_index.xml; \
++ > ${DESTDIR}/${datadir}/doc/gprbuild/html/gps_index.xml; \
+ fi; \
+ fi; \
+ done
+
+ install.data: force
+- -${MKDIR} ${datadir}/gprconfig
+- ${CP} share/gprconfig/*.xml ${datadir}/gprconfig
+- ${CP} share/gprconfig/gprconfig.xsd ${datadir}/gprconfig
+- -${MKDIR} ${datadir}/gpr
+- ${CP} share/_default.gpr ${datadir}/gpr
++ -${MKDIR} ${DESTDIR}/${datadir}/gprconfig
++ ${CP} share/gprconfig/*.xml ${DESTDIR}/${datadir}/gprconfig
++ ${CP} share/gprconfig/gprconfig.xsd ${DESTDIR}/${datadir}/gprconfig
++ -${MKDIR} ${DESTDIR}/${datadir}/gpr
++ ${CP} share/_default.gpr ${DESTDIR}/${datadir}/gpr
+
+ install.bin: force
+- -${MKDIR} ${bindir}
+- ${INSTALL_PROGRAM} gprconfig${EXEXT} ${bindir}
+- ${INSTALL_PROGRAM} gprbuild${EXEXT} ${bindir}
+- ${INSTALL_PROGRAM} gprclean${EXEXT} ${bindir}
+- ${INSTALL_PROGRAM} gprinstall${EXEXT} ${bindir}
++ -${MKDIR} ${DESTDIR}/${bindir}
++ ${INSTALL_PROGRAM} gprconfig${EXEXT} ${DESTDIR}/${bindir}
++ ${INSTALL_PROGRAM} gprbuild${EXEXT} ${DESTDIR}/${bindir}
++ ${INSTALL_PROGRAM} gprclean${EXEXT} ${DESTDIR}/${bindir}
++ ${INSTALL_PROGRAM} gprinstall${EXEXT} ${DESTDIR}/${bindir}
+ ifeq ($(IS_WINDOWS),true)
+ ${CP} src/gprinstall.exe.manifest ${bindir}
+ chmod +x ${bindir}/gprinstall.exe.manifest
+ endif
+- ${INSTALL_PROGRAM} gprslave${EXEXT} ${bindir}
+- -${MKDIR} ${libexecdir}/gprbuild
+- ${INSTALL_PROGRAM} gprbind${EXEXT} ${libexecdir}/gprbuild/
+- ${INSTALL_PROGRAM} gprlib${EXEXT} ${libexecdir}/gprbuild/
++ ${INSTALL_PROGRAM} gprslave${EXEXT} ${DESTDIR}/${bindir}
++ -${MKDIR} ${DESTDIR}/${libexecdir}/gprbuild
++ ${INSTALL_PROGRAM} gprbind${EXEXT} ${DESTDIR}/${libexecdir}/gprbuild/
++ ${INSTALL_PROGRAM} gprlib${EXEXT} ${DESTDIR}/${libexecdir}/gprbuild/
+
+ $(objdir)/gprbuild_dummies.o: src/gprbuild_dummies.c
+ gcc -c -o $@ $<
+@@ -193,8 +194,8 @@
+ make -C doc
+
+ install-doc:
+- -$(MKDIR) ${docdir}/html
+- ${CP} doc/*.html ${docdir}/html
++ -$(MKDIR) ${DESTDIR}/${docdir}/html
++ ${CP} doc/*.html ${DESTDIR}/${docdir}/html
+
+ tests: force
+ cd internal/gprtests_python; python ./run-gprconfig-test.py
+--- a/Makefile.in 2013-07-13 12:11:57.502762429 +0200
++++ b/Makefile.in 2013-07-13 12:12:16.930761851 +0200
+@@ -129,7 +129,6 @@
+ $(RM) -r ${DESTDIR}/${datadir}/doc/gprbuild/examples
+ -${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild/examples/
+ ${CP} -r examples/* ${DESTDIR}/${datadir}/doc/gprbuild/examples/
+- ${RM} -r ${DESTDIR}/${datadir}/doc/gprbuild
+ -${MKDIR} ${DESTDIR}/${datadir}/doc/gprbuild
+ for format in html txt pdf info; do \
+ if [ -d doc/$$format ] ; then \
+--- a/Makefile.in 2013-07-16 08:40:48.893213186 +0200
++++ b/Makefile.in 2013-07-16 08:41:07.887212621 +0200
+@@ -56,7 +56,7 @@
+
+ PROCESSORS ?= 1
+
+-GNATMAKE=gnatmake -p -m -j${PROCESSORS}
++GNATMAKE=gnatmake -p -m ${GNATOPTFLAGS}
+ ifeq ($(strip $(filter-out %vms%,$(host))),)
+ GNATMAKE=${GNATMAKE} -XOS=vms
+ endif
diff --git a/gprbuild-2013-openvms.patch b/gprbuild-2013-openvms.patch
new file mode 100644
index 0000000..ebbc6a1
--- /dev/null
+++ b/gprbuild-2013-openvms.patch
@@ -0,0 +1,20 @@
+diff --git a/gnat/hostparm.ads b/gnat/hostparm.ads
+index 16b4b39..923f7f8 100644
+--- a/gnat/hostparm.ads
++++ b/gnat/hostparm.ads
+@@ -41,13 +41,8 @@ package Hostparm is
+ -- HOST Parameters --
+ ---------------------
+
+- Gnat_VMSp : Integer;
+- pragma Import (C, Gnat_VMSp, "__gnat_vmsp");
+-
+- OpenVMS : Boolean := Gnat_VMSp /= 0;
+- -- 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.
++ OpenVMS : constant Boolean := False;
++ -- OpenVMS support has been removed in gnat 5.0
+
+ Direct_Separator : constant Character;
+ pragma Import (C, Direct_Separator, "__gnat_dir_separator");
diff --git a/gprbuild-2013-remove_rpath.patch b/gprbuild-2013-remove_rpath.patch
new file mode 100644
index 0000000..ba60270
--- /dev/null
+++ b/gprbuild-2013-remove_rpath.patch
@@ -0,0 +1,12 @@
+--- a/share/gprconfig/linker.xml 2012-12-17 11:54:37.990385949 +0400
++++ b/share/gprconfig/linker.xml 2012-12-17 11:54:43.868458984 +0400
+@@ -382,9 +382,6 @@
+ for Symbolic_Link_Supported use "true";
+ for Library_Major_Minor_Id_Supported use "true";
+
+- for Run_Path_Option use ("-Wl,-rpath,");
+- for Separate_Run_Path_Options use "true";
+- for Run_Path_Origin use "@executable_path";
+ for Library_Install_Name_Option use "-Wl,-install_name, at rpath";
+
+ for Shared_Library_Suffix use ".dylib";
diff --git a/gprbuild-2014-usrmove.patch b/gprbuild-2013-usrmove.patch
similarity index 60%
rename from gprbuild-2014-usrmove.patch
rename to gprbuild-2013-usrmove.patch
index 5050efa..8d7fb94 100644
--- a/gprbuild-2014-usrmove.patch
+++ b/gprbuild-2013-usrmove.patch
@@ -1,8 +1,6 @@
-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
+--- 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
diff --git a/gprbuild-armcompiller.patch b/gprbuild-armcompiller.patch
new file mode 100644
index 0000000..d705dfd
--- /dev/null
+++ b/gprbuild-armcompiller.patch
@@ -0,0 +1,13 @@
+diff --git a/share/gprconfig/compilers.xml b/share/gprconfig/compilers.xml
+index fc1ce19..d4b5216 100644
+--- a/share/gprconfig/compilers.xml
++++ b/share/gprconfig/compilers.xml
+@@ -10,7 +10,7 @@
+ <!-- GCC 3.x & 4.x -->
+ <compiler_description>
+ <name>GCC</name>
+- <executable prefix="1">(.*(-wrs-|-sysgo|-elf-|-eabi-|-eabispe-|avr-|-elinos-linux|-pc|-xcoff-).*)?gcc</executable>
++ <executable prefix="1">(.*(-wrs-|-sysgo|-elf-|-eabi-|-eabispe-|avr-|-elinos-linux|-pc-mingw32|-xcoff-|arm-linux-androideabi-|-linux-gnu|arm-linux-gnueabi-).*)?gcc</executable>
+ <version>
+ <external>${PREFIX}gcc -v</external>
+ <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
diff --git a/gprbuild.spec b/gprbuild.spec
index a5c08ac..447d21d 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,21 +1,24 @@
Name: gprbuild
-Version: 2014
-Release: 1%{?dist}
+Version: 2013
+Release: 16%{?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.tar.gz
-Patch0: %{name}-%{version}-noopenvms.patch
-Patch1: %{name}-%{version}-iterator_variable.patch
-Patch2: %{name}-%{version}-destdir.patch
+Source0: %{name}-gpl-%{version}-src.tgz
+## Fedora specific
+Patch1: %{name}-%{version}-destdir.patch
+Patch2: %{name}-armcompiller.patch
+## Fedora specific
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 > 5.0
-BuildRequires: libgnat-static libgnat-devel
+BuildRequires: gcc-gnat libgnat-static libgnat-devel
BuildRequires: fedora-gnat-project-common >= 2
Requires: fedora-gnat-project-common >= 2
Requires: gnat-srpm-macros
@@ -34,18 +37,19 @@ and libraries and is particularly well-suited for compiled languages.
%prep
-%setup -q -n gprbuild-gpl-%{version}-src
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-%{version}-src
+%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 --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
+%configure --disable-rpath
+make %{?_smp_mflags} LIBRARY_TYPE="relocatable" GNATOPTFLAGS="%{Gnatmake_optflags}" ADA_PROJECT_PATH=%_GNAT_project_dir
%install
rm -rf %{buildroot}
@@ -54,7 +58,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 b664feb..c8b9160 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0625ae36f588f36b3e481d1722b09dd6 gprbuild-gpl-2014-src.tar.gz
+f97cfb8b1dba3a10a9de1ef4d71117f8 gprbuild-gpl-2013-src.tgz
More information about the scm-commits
mailing list