← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gcc-4.7/trusty

« back to all changes in this revision

Viewing changes to debian/rules.conf

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2013-04-22 11:55:05 UTC
  • mfrom: (15.2.16 experimental)
  • Revision ID: package-import@ubuntu.com-20130422115505-10c2vs3iembuyc1z
Tags: 4.7.3-2ubuntu4
Add build dependency on libsfgcc1 [armhf], needed for dependency
information of libsfstdc++6-4.7-dbg when libsfgcc1 is built from
newer sources.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules.conf
290
290
  LIBC_BIARCH_BUILD_DEP += libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386],
291
291
endif
292
292
ifneq (,$(findstring armel,$(biarchhfarchs)))
293
 
  LIBC_BIARCH_BUILD_DEP += libc6-dev-armhf [armel],
 
293
  LIBC_BIARCH_BUILD_DEP += libc6-dev-armhf [armel], libhfgcc1 [armel],
294
294
endif
295
295
ifneq (,$(findstring armhf,$(biarchsfarchs)))
296
 
  LIBC_BIARCH_BUILD_DEP += libc6-dev-armel [armhf],
 
296
  LIBC_BIARCH_BUILD_DEP += libc6-dev-armel [armhf], libsfgcc1 [armhf],
297
297
endif
298
298
else
299
299
  LIBC_BUILD_DEP = $(LIBC_DEV_DEP),
314
314
ifneq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty))
315
315
  GMP_BUILD_DEP = libgmp3-dev | libgmp-dev (>= 2:5.0.1~),
316
316
  MPFR_BUILD_DEP = libmpfr-dev,
 
317
  GMP_BUILD_DEP = libgmp-dev (>= 2:5.0.1~),
 
318
  MPFR_BUILD_DEP = libmpfr-dev (>= 3.0.0-9~),
317
319
else
318
320
  GMP_BUILD_DEP = libgmp-dev (>= 2:5.0.1~),
319
321
  MPFR_BUILD_DEP = libmpfr-dev (>= 3.0.0-9~),
412
414
 
413
415
ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
414
416
  LIBSTDCXX_BUILD_INDEP = doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base
415
 
  LIBSTDCXX_BUILD_INDEP +=, xsltproc, libxml2-utils, docbook-xsl-ns
 
417
  ifeq (,$(filter $(distrelease),lenny etch dapper hardy jaunty karmic lucid maverick natty oneiric))
 
418
    LIBSTDCXX_BUILD_INDEP +=, xsltproc, libxml2-utils, docbook-xsl-ns
 
419
  endif
416
420
  JAVA_BUILD_INDEP :=, $(JAVA_BUILD_INDEP)
417
421
endif
418
422
 
632
636
addons += plugindev
633
637
addons += $(if $(findstring armel,$(biarchhfarchs)),armml)
634
638
addons += $(if $(findstring armhf,$(biarchsfarchs)),armml)
 
639
addons += $(if $(findstring amd64,$(biarchx32archs)),x32dev)
635
640
ifeq ($(with_libgcc),yes)
636
641
  addons += libgcc lib4gcc lib32gcc lib64gcc libn32gcc
637
642
  addons += $(if $(findstring amd64,$(biarchx32archs)),libx32gcc)