Additional parameters in spec file to control package build

The following new rpm variables influence options passed to configure:

1) enable_checking=<flag-list> can be used to customize the value of
--enable-checking configure command line option (default=release)
2) enable_bootstrap=1 can be used to enable bootstrap (default=0)

The default configure command (without these new parameters) hasn't
changed.

Change-Id: I16389507b7f148bae02d66d772222b003a5e706b

diff --git a/packaging/cross-aarch64-gcc49.spec b/packaging/cross-aarch64-gcc49.spec
index 767c00b..4c0bf14 100644 (file)
--- a/packaging/cross-aarch64-gcc49.spec
+++ b/packaging/cross-aarch64-gcc49.spec
@@ -268,7 +268,11 @@ PARALLEL="-j$J -l$JL"
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
+%if 0%{?enable_checking:1}
+ENABLE_CHECKING="--enable-checking=%{enable_checking}"
+%else
 ENABLE_CHECKING="--enable-checking=release"
+%endif
 
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
@@ -310,7 +314,11 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
        --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \
        --enable-ssp \
        --disable-libssp \
+%if 0%{?enable_bootstrap:1}
+    --enable-bootstrap  \
+%else
        --disable-bootstrap \
+%endif
 %if 0%{!?build_libvtv:1}
        --disable-libvtv \
 %endif

diff --git a/packaging/cross-armv7hl-gcc49.spec b/packaging/cross-armv7hl-gcc49.spec
index d82ae39..0aeda21 100644 (file)
--- a/packaging/cross-armv7hl-gcc49.spec
+++ b/packaging/cross-armv7hl-gcc49.spec
@@ -268,7 +268,11 @@ PARALLEL="-j$J -l$JL"
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
+%if 0%{?enable_checking:1}
+ENABLE_CHECKING="--enable-checking=%{enable_checking}"
+%else
 ENABLE_CHECKING="--enable-checking=release"
+%endif
 
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
@@ -310,7 +314,11 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
        --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \
        --enable-ssp \
        --disable-libssp \
+%if 0%{?enable_bootstrap:1}
+    --enable-bootstrap  \
+%else
        --disable-bootstrap \
+%endif
 %if 0%{!?build_libvtv:1}
        --disable-libvtv \
 %endif

diff --git a/packaging/cross-armv7l-gcc49.spec b/packaging/cross-armv7l-gcc49.spec
index ee2a4f6..23a58bd 100644 (file)
--- a/packaging/cross-armv7l-gcc49.spec
+++ b/packaging/cross-armv7l-gcc49.spec
@@ -268,7 +268,11 @@ PARALLEL="-j$J -l$JL"
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
+%if 0%{?enable_checking:1}
+ENABLE_CHECKING="--enable-checking=%{enable_checking}"
+%else
 ENABLE_CHECKING="--enable-checking=release"
+%endif
 
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
@@ -310,7 +314,11 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
        --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \
        --enable-ssp \
        --disable-libssp \
+%if 0%{?enable_bootstrap:1}
+    --enable-bootstrap  \
+%else
        --disable-bootstrap \
+%endif
 %if 0%{!?build_libvtv:1}
        --disable-libvtv \
 %endif

diff --git a/packaging/gcc.spec.in b/packaging/gcc.spec.in
index f6ca46d..a1f2345 100644 (file)
--- a/packaging/gcc.spec.in
+++ b/packaging/gcc.spec.in
@@ -18,7 +18,6 @@
 # norootforbuild
 # icecream 0
 
-
 %define build_ada 0
 
 %define quadmath_arch %ix86 x86_64 ia64
@@ -1123,7 +1122,11 @@ PARALLEL="-j$J -l$JL"
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
+%if 0%{?enable_checking:1}
+ENABLE_CHECKING="--enable-checking=%{enable_checking}"
+%else
 ENABLE_CHECKING="--enable-checking=release"
+%endif
 
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
@@ -1165,7 +1168,11 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
        --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \
        --enable-ssp \
        --disable-libssp \
+%if 0%{?enable_bootstrap:1}
+    --enable-bootstrap  \
+%else
        --disable-bootstrap \
+%endif
 %if 0%{!?build_libvtv:1}
        --disable-libvtv \
 %endif

diff --git a/packaging/gcc49.spec b/packaging/gcc49.spec
index 902f974..39dc752 100644 (file)
--- a/packaging/gcc49.spec
+++ b/packaging/gcc49.spec
@@ -18,7 +18,6 @@
 # norootforbuild
 # icecream 0
 
-
 %define build_ada 0
 
 %define quadmath_arch %ix86 x86_64 ia64
@@ -1656,7 +1655,11 @@ PARALLEL="-j$J -l$JL"
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
+%if 0%{?enable_checking:1}
+ENABLE_CHECKING="--enable-checking=%{enable_checking}"
+%else
 ENABLE_CHECKING="--enable-checking=release"
+%endif
 
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
@@ -1698,7 +1701,11 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
        --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \
        --enable-ssp \
        --disable-libssp \
+%if 0%{?enable_bootstrap:1}
+    --enable-bootstrap  \
+%else
        --disable-bootstrap \
+%endif
 %if 0%{!?build_libvtv:1}
        --disable-libvtv \
 %endif