From 2f81ce4f440d626e44f64899b40d2bebb406671af0f39b001ecb8ce20d28dafc Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 2 Mar 2015 13:49:16 +0000 Subject: [PATCH] Accepting request 288474 from home:Andreas_Schwab:Factory - Add gcc-ada-32bit and gcc-ada-64bit packages only if building Ada OBS-URL: https://build.opensuse.org/request/show/288474 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc?expand=0&rev=56 --- gcc.changes | 5 +++++ gcc.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc.changes b/gcc.changes index 6dbc9de..c0d3516 100644 --- a/gcc.changes +++ b/gcc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 2 13:34:23 UTC 2015 - schwab@suse.de + +- Add gcc-ada-32bit and gcc-ada-64bit packages only if building Ada + ------------------------------------------------------------------- Wed Feb 25 14:21:45 UTC 2015 - rguenther@suse.com diff --git a/gcc.spec b/gcc.spec index 117e2c9..b0371b0 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,7 +1,7 @@ # # spec file for package gcc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ Name: gcc %ifarch %ix86 x86_64 ppc ppc64 s390 ia64 %define build_ada 1 %else -# alpha ppc64 s390x hppa arm +# alpha s390x hppa arm %define build_ada 0 %endif Url: http://gcc.gnu.org/ @@ -356,7 +356,6 @@ Independend Executable (PIE) variant. This enables better address space randomization (ASLR). -%if %{build_ada} %package -n gcc-ada Summary: The system GNU Ada Compiler License: GPL-3.0+ @@ -386,7 +385,6 @@ Requires: gcc-ada = %{version} %description -n gcc-ada-64bit The system GNU Ada Compiler 64 bit support. -%endif %prep @@ -629,10 +627,12 @@ EOF %{_prefix}/bin/gij32 %{_prefix}/bin/grmiregistry32 +%if %{build_ada} %files -n gcc-ada-32bit %defattr(-,root,root) # empty - only for the dependency %doc README +%endif %endif %if %{separate_bi64} @@ -667,10 +667,12 @@ EOF %{_prefix}/bin/gij64 %{_prefix}/bin/grmiregistry64 +%if %{build_ada} %files -n gcc-ada-64bit %defattr(-,root,root) # empty - only for the dependency %doc README +%endif %endif