The package rpms/gprbuild.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gprbuild.git/commit/?id=fc3041c89...
https://src.fedoraproject.org/cgit/rpms/gprbuild.git/commit/?id=4e93ea4fe....
Change:
+%ifnarch %{bootstrap_arch}
+%ifnarch %{bootsrap_arch}
Thanks.
Full change:
============
commit 889ed670328e23649c802984213a250bf5ccad2d
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Tue Feb 5 13:00:39 2019 +0100
Bootstrap for gcc-gnat 9
diff --git a/gprbuild.spec b/gprbuild.spec
index 7b507af..4cb5271 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,6 +1,6 @@
%undefine _hardened_build
##%%%global bootstrap_arch NOBOOTSRAPING
-%global bootstrap_arch %{_arch} %ix86
+%global bootstrap_arch %{GPRbuild_arches}
# When bootstrapping GPRbuild for a new architecture, set bootstrap_arch to the
# name of that architecture and add a tarball with binaries as Source100.
# When not bootstrapping bootstrap_arch must have a nonempty value that isn't
@@ -22,7 +22,7 @@
Name: gprbuild
Version: 2018
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Ada project builder
License: GPLv3+
URL:
http://libre.adacore.com
@@ -202,6 +202,9 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests
%endif
%changelog
+* Tue Feb 5 2019 Pavel Zhukov <pzhukov(a)redhat.com> - 2018-3
+- Bootstrap for all arches
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2017-16
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 6c08b3b40d8b2e971445a963973d165a721ce0f6
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Tue Feb 5 12:59:11 2019 +0100
Delete unused patches
diff --git a/gprbuild.spec b/gprbuild.spec
index 504255b..7b507af 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -37,13 +37,10 @@ Patch3: %{name}-2016-usrmove.patch
##
https://github.com/AdaCore/gprbuild/pull/31
Patch5: %{name}-2017-libsubdir.patch
Patch6: %{name}-2017-fedora_compilers.patch
-##Patch7: %{name}-2016-mingw.patch
# Adaptation to a change in GCC's version numbering:
Patch8: %{name}-2016-gcc7.patch
Patch9: gprbuild-2017-bootstrap.patch
-## Upstream changes (see inside)
-Patch10: %{name}-2017-default_language.patch
%ifarch %{bootstrap_arch}
BuildRequires: xmlada-sources
@@ -113,14 +110,13 @@ Requires: libgpr%{?_isa} = %{version}-%{release}
#%patch2 -p1
%patch3 -p1
%if %{with_libgpr}
-#%patch5 -p1 -b .libsubdir
+%patch5 -p1 -b .libsubdir
%endif
%patch6 -p1
###%patch7 -p1
%patch8 -p0
%patch9 -p1 -b .bootstrap
-##%patch10 -p1 -b .error-handling
# Update the various config.guess to upstream release for new arch support
cp /usr/lib/rpm/config.* .
commit f43d99a5a48e84341aa888c8040dec617ddb4e91
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Fri Feb 1 12:30:01 2019 +0100
Add ppc64 to the list of arches
diff --git a/gprbuild-2017-fedora_compilers.patch b/gprbuild-2017-fedora_compilers.patch
index 13fca2f..01eb12e 100644
--- a/gprbuild-2017-fedora_compilers.patch
+++ b/gprbuild-2017-fedora_compilers.patch
@@ -1,13 +1,29 @@
diff --git a/share/gprconfig/linker.xml b/share/gprconfig/linker.xml
-index e1f637d..575d926 100644
+index 25a814a..e27069d 100644
--- a/share/gprconfig/linker.xml
+++ b/share/gprconfig/linker.xml
-@@ -797,7 +797,6 @@
- <target name="^.*-pikeos$" />
- <target name="^arm-linux-androideabi$" />
- <target name="^.*-gnueabihf$" />
-- <target name="^.*-gnueabi$" />
- </targets>
- <config>
- for Archive_Builder use ("ar", "cr");
-
+@@ -117,6 +117,24 @@
+ </config>
+ </configuration>
+
++ <configuration>
++ <targets>
++ <target name="^ppc64.*-linux.*" />
++ </targets>
++ <hosts>
++ <host name="^ppc64.*-linux.*" />
++ </hosts>
++ <config>
++ for Object_Lister use ("nm", "-g");
++ for Object_Lister_Matcher use " [TDRBSG] (.*)";
++
++ package Linker is
++ for Export_File_Format use "GNU";
++ for Export_File_Switch use "-Wl,--version-script=";
++ end Linker;
++ </config>
++ </configuration>
++
+ <configuration>
+ <targets>
+ <target name="^i686.*-linux.*$" />
diff --git a/gprbuild.spec b/gprbuild.spec
index ac10b3b..504255b 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -116,7 +116,7 @@ Requires: libgpr%{?_isa} = %{version}-%{release}
#%patch5 -p1 -b .libsubdir
%endif
-#$%patch6 -p1
+%patch6 -p1
###%patch7 -p1
%patch8 -p0
%patch9 -p1 -b .bootstrap
commit c7d08d53e495803d0f1b3dc720b3c4b17009b77a
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Fri Feb 1 11:36:39 2019 +0100
More typos
diff --git a/gprbuild.spec b/gprbuild.spec
index 96f31dd..ac10b3b 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -128,11 +128,11 @@ cp /usr/lib/rpm/config.* .
%build
%ifarch %{bootstrap_arch}
## Some useful output
-+gcc -v
-+gcc -dumpmachine
-+gcc -dumpversion
-+gnatls -v --version
-+##
+gcc -v
+gcc -dumpmachine
+gcc -dumpversion
+gnatls -v --version
+##
./bootstrap.sh --with-xmlada=%{_includedir}/xmlada/sources/
--prefix=%{buildroot}/%{_prefix}/ build
cp %{SOURCE2} %{buildroot}/%{_datarootdir}/gprconfig/
%else
commit 9ea5ef414ca3c278eed3fb22864b1038a37a34b4
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Fri Feb 1 11:32:04 2019 +0100
fix typo
diff --git a/gprbuild.spec b/gprbuild.spec
index 3eb3e1f..96f31dd 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -127,6 +127,12 @@ cp /usr/lib/rpm/config.* .
%build
%ifarch %{bootstrap_arch}
+## Some useful output
++gcc -v
++gcc -dumpmachine
++gcc -dumpversion
++gnatls -v --version
++##
./bootstrap.sh --with-xmlada=%{_includedir}/xmlada/sources/
--prefix=%{buildroot}/%{_prefix}/ build
cp %{SOURCE2} %{buildroot}/%{_datarootdir}/gprconfig/
%else
@@ -144,12 +150,6 @@ XMLADA_BUILD=shared make ADA_PROJECT_PATH=%_GNAT_project_dir
BUILDER="gprbuild -
%filter_setup
}
%ifarch %{bootstrap_arch}
-+## Some useful output
-+gcc -v
-+gcc -dumpmachine
-+gcc -dumpversion
-+gnatls -v --version
-+##
bash -x ./bootstrap.sh --with-xmlada=%{_includedir}/xmlada/sources/
--prefix=%{buildroot}/%{_prefix}/ install
exit 0
%endif
commit 1451f33dc2f198bfd47e990af804e189d624dbcf
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Fri Feb 1 11:12:46 2019 +0100
Add output for debugging ppc64
diff --git a/gprbuild-2016-usrmove.patch b/gprbuild-2016-usrmove.patch
index b979886..8c3b9cd 100644
--- a/gprbuild-2016-usrmove.patch
+++ b/gprbuild-2016-usrmove.patch
@@ -1,19 +1,22 @@
-diff -u --recursive gprbuild-gpl-2016-src.ref/gpr/src/gpr-conf.adb
gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb
---- gprbuild-gpl-2016-src.ref/gpr/src/gpr-conf.adb 2016-08-27 03:10:11.766299104 +0200
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2016-08-27 15:22:04.151027240 +0200
-@@ -2162,7 +2162,7 @@
+diff --git a/gpr/src/gpr-conf.adb b/gpr/src/gpr-conf.adb
+index 2851192..08b2440 100644
+--- a/gpr/src/gpr-conf.adb
++++ b/gpr/src/gpr-conf.adb
+@@ -2400,7 +2400,8 @@ package body GPR.Conf is
if Comp_Driver /= null and then Comp_Driver'Length > 0 then
Comp_Dir :=
new String'
- (Containing_Directory (Comp_Driver.all));
+ (Containing_Directory (Normalize_Pathname(Comp_Driver.all,
Resolve_Links => True)));
++
-- Consider only the compiler drivers that are in "bin"
-- subdirectories.
-diff -u --recursive gprbuild-gpl-2016-src.ref/gpr/src/gpr-util.adb
gprbuild-gpl-2016-src/gpr/src/gpr-util.adb
---- gprbuild-gpl-2016-src.ref/gpr/src/gpr-util.adb 2016-05-16 11:44:00.000000000 +0200
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-util.adb 2016-08-27 17:42:57.097255288 +0200
-@@ -498,7 +498,7 @@
+diff --git a/gpr/src/gpr-util.adb b/gpr/src/gpr-util.adb
+index 8e249b1..c95bb57 100644
+--- a/gpr/src/gpr-util.adb
++++ b/gpr/src/gpr-util.adb
+@@ -701,7 +701,7 @@ package body GPR.Util is
---------------------
function Get_Install_Dir (S : String) return String is
diff --git a/gprbuild.spec b/gprbuild.spec
index 99b0ef2..3eb3e1f 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -22,7 +22,7 @@
Name: gprbuild
Version: 2018
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Ada project builder
License: GPLv3+
URL:
http://libre.adacore.com
@@ -111,7 +111,7 @@ Requires: libgpr%{?_isa} = %{version}-%{release}
%prep
%setup -q -n gprbuild-gpl-%{version}-src
#%patch2 -p1
-#%patch3 -p1
+%patch3 -p1
%if %{with_libgpr}
#%patch5 -p1 -b .libsubdir
%endif
@@ -144,6 +144,12 @@ XMLADA_BUILD=shared make ADA_PROJECT_PATH=%_GNAT_project_dir
BUILDER="gprbuild -
%filter_setup
}
%ifarch %{bootstrap_arch}
++## Some useful output
++gcc -v
++gcc -dumpmachine
++gcc -dumpversion
++gnatls -v --version
++##
bash -x ./bootstrap.sh --with-xmlada=%{_includedir}/xmlada/sources/
--prefix=%{buildroot}/%{_prefix}/ install
exit 0
%endif
commit 4e93ea4fe38ad71ead9472bcefc64ced440d196c
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Thu Jan 31 22:21:30 2019 +0100
combine x86 arches
diff --git a/gprbuild.spec b/gprbuild.spec
index 2a9edc8..99b0ef2 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,6 +1,6 @@
%undefine _hardened_build
##%%%global bootstrap_arch NOBOOTSRAPING
-%global bootstrap_arch %{_arch}
+%global bootstrap_arch %{_arch} %ix86
# When bootstrapping GPRbuild for a new architecture, set bootstrap_arch to the
# name of that architecture and add a tarball with binaries as Source100.
# When not bootstrapping bootstrap_arch must have a nonempty value that isn't
@@ -64,9 +64,11 @@ BuildRequires: fedora-gnat-project-common >= 2
Requires: fedora-gnat-project-common >= 2
Requires: gnat-srpm-macros
+%ifnarch %{bootsrap_arch}
# Build only on architectures where GPRbuild is already available, plus the
# architecture being bootstrapped, if any:
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
+%endif
%description
GPRbuild is an advanced software tool designed to help automate
commit fc3041c89c51bc71be5abc4b90d168e4d8e4e793
Author: Pavel Zhukov <pzhukov(a)redhat.com>
Date: Thu Jan 31 21:59:02 2019 +0100
Prepare update
diff --git a/.gitignore b/.gitignore
index 035d481..8fcd70f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/gprbuild-gpl-2015-src.tar.gz
/gprbuild-gpl-2016-src.tar.gz
/gprbuild-gpl-2017-src.tar.gz
+/gprbuild-gpl-2018-20180524-src.tar.gz
diff --git a/gprbuild-2017-bootstrap.patch b/gprbuild-2017-bootstrap.patch
index c0201e9..54f6f3a 100644
--- a/gprbuild-2017-bootstrap.patch
+++ b/gprbuild-2017-bootstrap.patch
@@ -1,13 +1,72 @@
---- a/bootstrap.sh 2017-05-16 13:39:29.000000000 +0200
-+++ b/bootstrap.sh.edit 2017-07-10 14:12:59.963937976 +0200
-@@ -66,8 +66,8 @@
+diff --git a/bootstrap.sh b/bootstrap.sh
+index ce912bb..25e837b 100755
+--- a/bootstrap.sh
++++ b/bootstrap.sh
+@@ -30,6 +30,9 @@ Options [defaults in brackets]:
- set -e
+ --with-xmlada=DIR xmlada source path [$xmlada_src]
--inc_flags="-I$srcdir/src -I$srcdir/gpr/src -I$xmlada_src/sax -I$xmlada_src/dom \
---I$xmlada_src/schema -I$xmlada_src/unicode -I$xmlada_src/input_sources"
-+inc_flags="-I$srcdir/src -I$srcdir/gpr/src -I$xmlada_src/xmlada_sax/xmlada
-I$xmlada_src/xmlada_dom/xmlada \
-+-I$xmlada_src/xmlada_schema/xmlada -I$xmlada_src/xmlada_unicode/xmlada/
-I$xmlada_src/xmlada_input_sources/xmlada/"
++ --build build only do not install
++ --install install only, build if not built
++
+ Environment variables:
+ CC specify C compiler [$CC]
+ CFLAGS set C and Ada compilation flags [$CFLAGS]
+@@ -54,6 +57,8 @@ while :; do
- # Programs to build and install
- bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+ --srcdir=?*) srcdir=${1#*=} ;;
+ --with-xmlada=?*) xmlada_src=${1#*=} ;;
++ --build) MODE="build";;
++ --install) MODE="install";;
+
+ -h|-\?|--help) usage ;;
+
+@@ -74,24 +79,31 @@ bin_progs="gprbuild gprconfig gprclean gprinstall gprname
gprls"
+ lib_progs="gprlib gprbind"
+
+ # Build
+-command $CC -c $CFLAGS "$srcdir"/gpr/src/gpr_imports.c
++if [ "x"${MODE} == "x" ] || [ ${MODE} == "build" ];
++then
++ command $CC -c $CFLAGS "$srcdir"/gpr/src/gpr_imports.c
+
+-for bin in $bin_progs; do
+- command $GNATMAKE $inc_flags "$bin"-main -o "$bin" $CFLAGS
$GNATMAKEFLAGS -largs gpr_imports.o
+-done
++ for bin in $bin_progs; do
++ command $GNATMAKE $inc_flags "$bin"-main -o "$bin" $CFLAGS
$GNATMAKEFLAGS -largs gpr_imports.o
++ done
+
+-for lib in $lib_progs; do
+- command $GNATMAKE $inc_flags "$lib" $CFLAGS $GNATMAKEFLAGS -largs
gpr_imports.o
+-done
++ for lib in $lib_progs; do
++ command $GNATMAKE $inc_flags "$lib" $CFLAGS $GNATMAKEFLAGS -largs
gpr_imports.o
++ done
++fi;
+
+ # Install
+-mkdir -p "$DESTDIR$prefix$bindir"
+-mkdir -p "$DESTDIR$prefix$libexecdir"/gprbuild
+-mkdir -p "$DESTDIR$prefix$datarootdir"/gprconfig
+-mkdir -p "$DESTDIR$prefix$datarootdir"/gpr
+-
+-install -m0755 $bin_progs -t "$DESTDIR$prefix$bindir"
+-install -m0755 $lib_progs -t "$DESTDIR$prefix$libexecdir"/gprbuild
+-install -m0644 "$srcdir"/share/gprconfig/*.xml -t
"$DESTDIR$prefix$datarootdir"/gprconfig
+-install -m0644 "$srcdir"/share/gprconfig/*.ent -t
"$DESTDIR$prefix$datarootdir"/gprconfig
+-install -m0644 "$srcdir"/share/_default.gpr
"$DESTDIR$prefix$datarootdir"/gpr/_default.gpr
++
++if [ "x"${MODE} == "x" ] || [ ${MODE} == "install" ];
++then
++ mkdir -p "$DESTDIR$prefix$bindir"
++ mkdir -p "$DESTDIR$prefix$libexecdir"/gprbuild
++ mkdir -p "$DESTDIR$prefix$datarootdir"/gprconfig
++ mkdir -p "$DESTDIR$prefix$datarootdir"/gpr
++
++ install -m0755 $bin_progs -t "$DESTDIR$prefix$bindir"
++ install -m0755 $lib_progs -t "$DESTDIR$prefix$libexecdir"/gprbuild
++ install -m0644 "$srcdir"/share/gprconfig/*.xml -t
"$DESTDIR$prefix$datarootdir"/gprconfig
++ install -m0644 "$srcdir"/share/gprconfig/*.ent -t
"$DESTDIR$prefix$datarootdir"/gprconfig
++ install -m0644 "$srcdir"/share/_default.gpr
"$DESTDIR$prefix$datarootdir"/gpr/_default.gpr
++fi
diff --git a/gprbuild.spec b/gprbuild.spec
index 2507e58..2a9edc8 100644
--- a/gprbuild.spec
+++ b/gprbuild.spec
@@ -1,25 +1,41 @@
%undefine _hardened_build
+##%%%global bootstrap_arch NOBOOTSRAPING
+%global bootstrap_arch %{_arch}
+# When bootstrapping GPRbuild for a new architecture, set bootstrap_arch to the
+# name of that architecture and add a tarball with binaries as Source100.
+# When not bootstrapping bootstrap_arch must have a nonempty value that isn't
+# an architecture name, as this spec would be syntactically invalid otherwise.
+#
+# Bootstrapping exception:
https://fedorahosted.org/fpc/ticket/605
+%ifarch %{bootstrap_arch}
+%global debug_package %{nil}
+%endif
+# Stripping out debugging information isn't important when bootstrapping, and
+# skipping this allows one to avoid unnecessary efforts to produce unstripped
+# binaries to bootstrap with.
+%ifnarch %{bootstrap_arch}
%define with_libgpr 1
+%else
+%define with_libgpr 0
+%endif
%global _python_bytecompile_extra 0
Name: gprbuild
-Version: 2017
-Release: 16%{?dist}
+Version: 2018
+Release: 1%{?dist}
Summary: Ada project builder
License: GPLv3+
URL:
http://libre.adacore.com
## Direct download is not available
-Source0: %{name}-gpl-%{version}-src.tar.gz
+Source0: gprbuild-gpl-2018-20180524-src.tar.gz
# target patterns for Fedora's architectures:
Source2: fedora_arches.xml
Patch2: %{name}-2016-gcc5.patch
# This usrmove patch works for this package. Upstream a different solution
# would be needed to handle other possible setups.
Patch3: %{name}-2016-usrmove.patch
-%if %{with_libgpr}
##
https://github.com/AdaCore/gprbuild/pull/31
Patch5: %{name}-2017-libsubdir.patch
-%endif
Patch6: %{name}-2017-fedora_compilers.patch
##Patch7: %{name}-2016-mingw.patch
# Adaptation to a change in GCC's version numbering:
@@ -29,39 +45,14 @@ Patch9: gprbuild-2017-bootstrap.patch
## Upstream changes (see inside)
Patch10: %{name}-2017-default_language.patch
-## %global bootstrap_arch %{GPRbuild_arches}
-%global bootstrap_arch NOBOOTSRAPING
-# When bootstrapping GPRbuild for a new architecture, set bootstrap_arch to the
-# name of that architecture and add a tarball with binaries as Source100.
-# When not bootstrapping bootstrap_arch must have a nonempty value that isn't
-# an architecture name, as this spec would be syntactically invalid otherwise.
-#
-# Bootstrapping exception:
https://fedorahosted.org/fpc/ticket/605
-
%ifarch %{bootstrap_arch}
-%global debug_package %{nil}
+BuildRequires: xmlada-sources
%endif
-# Stripping out debugging information isn't important when bootstrapping, and
-# skipping this allows one to avoid unnecessary efforts to produce unstripped
-# binaries to bootstrap with.
-
-# Building GPRbuild requires a working GPRbuild. Therefore GPRbuild and its
-# associated programs are linked statically to libgnat and XMLada so that they
-# won't stop working in Koji when one of those libraries gets upgraded and the
-# previous version becomes unavailable. Thus building this package requires
-# libgnat-static and xmlada-static.
-#
-# Static linkage exception:
https://fedorahosted.org/fesco/ticket/1551
-
-BuildRequires: xmlada-static
%ifnarch %{bootstrap_arch}
BuildRequires: gprbuild
%endif
-# XMLada is built with GPRbuild, so it's unavailable when GPRbuild hasn't been
-# bootstrapped yet.
-
BuildRequires: gcc-gnat > 5.1
BuildRequires: libgnat-static >= 6.1
BuildRequires: fedora-gnat-project-common >= 2
@@ -117,45 +108,27 @@ Requires: libgpr%{?_isa} = %{version}-%{release}
%prep
%setup -q -n gprbuild-gpl-%{version}-src
-%patch2 -p1
-%patch3 -p1
+#%patch2 -p1
+#%patch3 -p1
%if %{with_libgpr}
-%patch5 -p1 -b .libsubdir
+#%patch5 -p1 -b .libsubdir
%endif
-%patch6 -p1
+#$%patch6 -p1
###%patch7 -p1
%patch8 -p0
%patch9 -p1 -b .bootstrap
-%patch10 -p1 -b .error-handling
+##%patch10 -p1 -b .error-handling
# Update the various config.guess to upstream release for new arch support
cp /usr/lib/rpm/config.* .
%build
%ifarch %{bootstrap_arch}
-./bootstrap.sh --with-xmlada=%{_includedir}/xmlada --prefix=./bootstrap
-cp %{SOURCE2} bootstrap/share/gprconfig/
-export PATH="$PWD/bootstrap/bin:${PATH}"
-
-## Some useful output
-gcc -v
-gcc -dumpmachine
-gcc -dumpversion
-gnatls -v --version
-##
-
-%endif
-
-# The build won't work when GPRbuild is unavailable or broken, so do nothing in
-# this stage when bootstrapping.
-make prefix=%{buildroot}/%{_prefix} setup
-
-# Build it, and link statically by setting XMLADA_BUILD to "static".
-
-%ifarch %{bootstrap_arch}
-XMLADA_BUILD=static make ADA_PROJECT_PATH=%_GNAT_project_dir BUILDER="gprbuild -v
%{GPRbuild_optflags}"
+./bootstrap.sh --with-xmlada=%{_includedir}/xmlada/sources/
--prefix=%{buildroot}/%{_prefix}/ build
+cp %{SOURCE2} %{buildroot}/%{_datarootdir}/gprconfig/
%else
+make prefix=%{buildroot}/%{_prefix} setup
XMLADA_BUILD=shared make ADA_PROJECT_PATH=%_GNAT_project_dir BUILDER="gprbuild -v
%{GPRbuild_optflags}" all ## doc
%if %{with_libgpr}
XMLADA_BUILD=shared make ADA_PROJECT_PATH=%_GNAT_project_dir BUILDER="gprbuild -v
%{GPRbuild_optflags}" libgpr.build.shared
@@ -168,9 +141,14 @@ XMLADA_BUILD=shared make ADA_PROJECT_PATH=%_GNAT_project_dir
BUILDER="gprbuild -
%filter_requires_in %{_bindir}
%filter_setup
}
+%ifarch %{bootstrap_arch}
+bash -x ./bootstrap.sh --with-xmlada=%{_includedir}/xmlada/sources/
--prefix=%{buildroot}/%{_prefix}/ install
+exit 0
+%endif
rm -rf %{buildroot}
%ifarch %{bootstrap_arch}
-export PATH="$PWD/exe/:${PATH}"
+export PATH="$PWD/bin/:${PATH}"
+export INSTALLER="$PWD/bin/gprinstall"
%endif
make install DESTDIR=%{buildroot}
%if %{with_libgpr}
@@ -193,13 +171,16 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests
%files
%doc README.md COPYING* CHANGE*
+%ifnarch %{bootstrap_arch}
%doc __doc/*
+%endif
%{_bindir}/gpr*
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/gpr*
%{_datadir}/gprconfig
%_GNAT_project_dir/_default.gpr
+%if %{with_libgpr}
%files -n libgpr
%dir %{_libdir}/gpr
%{_libdir}/libgpr.so
@@ -209,6 +190,7 @@ rm -rf %{buildroot}%{_GNAT_project_dir}/manifests
%{_includedir}/gpr
%{_libdir}/gpr/relocatable/gpr/*.ali
%_GNAT_project_dir/gpr.gpr
+%endif
%ifnarch %{bootstrap_arch}
%files doc
diff --git a/sources b/sources
index ebb89a8..4ff1f5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gprbuild-gpl-2017-src.tar.gz) =
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
+SHA512 (gprbuild-gpl-2018-20180524-src.tar.gz) =
d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044