diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-06-10 12:38:42 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-06-10 12:38:42 +0000 |
| commit | d264d90dd35be68f7a92168b17b1cba97a23c224 (patch) | |
| tree | c1269824a5a11b77566689fc66d8f9b45446af81 | |
| parent | 360f1a7a59ee452077075c5478f62b435f9f69f0 (diff) | |
| download | gcc-5-d264d90dd35be68f7a92168b17b1cba97a23c224.tar.gz | |
- Fix gnat/g++ build dependencies
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8109 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/rules.conf | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/debian/rules.conf b/debian/rules.conf index 24f1d0c..33f3bc8 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -438,10 +438,6 @@ ifneq (,$(java_awt_peers)) #JAVA_BUILD_DEP += libgconf2-dev$(bd_java_archs), # gstreamer peer #JAVA_BUILD_DEP += libgstreamer-plugins-base0.10-dev$(bd_java_archs), - # FIXME ... necessary only when built from separate source? - #ifneq ($(single_package),yes) - # JAVA_BUILD_DEP += g++-5 [armel armhf], - #endif endif ifneq ($(with_standalone_gcj),yes) ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) @@ -484,12 +480,14 @@ endif GO_BUILD_DEP := netbase, # try to build with itself, or with the last version -ifneq (,$(filter $(distrelease), jessie sid)) - gnat_build_dep := gnat-4.9 [$(ada_no_archs)] -else ifneq (,$(filter $(distrelease), wheezy precise trusty)) - gnat_build_dep := gnat-5 [$(ada_no_archs)] | gnat [$(ada_no_archs)] +ifneq (,$(filter $(distrelease), jessie stretch sid)) + gnat_build_dep := gnat-4.9 [$(ada_no_archs)], g++-4.9 +else ifneq (,$(filter $(distrelease), wheezy precise trusty wily)) + gnat_build_dep := gnat-5 [$(ada_no_archs)], g++-5 else ifneq (,$(filter $(distrelease), squeeze lucid)) gnat_build_dep := +else + gnat_build_dep := gnat [$(ada_no_archs)] endif ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) |