~ubuntu-branches/ubuntu/vivid/gccgo-5/vivid-updates

« back to all changes in this revision

Viewing changes to debian/rules.conf

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2015-03-29 16:38:06 UTC
  • Revision ID: package-import@ubuntu.com-20150329163806-lfnot0ecq0dympfb
Tags: 5-20150328-0ubuntu2
Fix the merge from the gcc-5 source package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
483
483
    # Build gnat as part of the combiled gcc-x.y source package.  Do not fail
484
484
    # if gnat is not present on unsupported architectures; the build scripts
485
485
    # will not use gnat anyway.
486
 
    GNAT_BUILD_DEP := gnat-4.9 [$(ada_no_archs)],
 
486
    GNAT_BUILD_DEP := gnat-5 [$(ada_no_archs)] | gnat-4.9 [$(ada_no_archs)] | gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)] | gnat-4.8 [$(ada_no_archs)],,
487
487
  endif
488
488
else ifeq ($(single_package),yes)
489
489
  # Ditto, as part of the gcc-snapshot package.
490
 
  GNAT_BUILD_DEP := gnat-4.9 [$(ada_no_archs)],
 
490
  GNAT_BUILD_DEP := gnat-5 [$(ada_no_archs)] | gnat-4.9 [$(ada_no_archs)] | gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)] | gnat-4.8 [$(ada_no_archs)],,
491
491
else ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
492
492
  # Special source package just for gnat. Fail early if gnat is not present,
493
493
  # rather than waste CPU cycles and fail later.