diff options
Diffstat (limited to 'debian/rules.conf')
| -rw-r--r-- | debian/rules.conf | 469 |
1 files changed, 175 insertions, 294 deletions
diff --git a/debian/rules.conf b/debian/rules.conf index 923fe01..57e8ac0 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -26,8 +26,8 @@ _soname_map = gcc=$(GCC_SONAME) stdc++=$(CXX_SONAME) gomp=$(GOMP_SONAME) \ go=$(GO_SONAME) backtrace=$(BTRACE_SONAME) \ atomic=$(ATOMIC_SONAME) asan=$(ASAN_SONAME) lsan=$(LSAN_SONAME) \ tsan=$(TSAN_SONAME) ubsan=$(UBSAN_SONAME) \ - vtv=$(VTV_SONAME) cilkrts=$(CILKRTS_SONAME) mpx=$(MPX_SONAME) \ - gphobos=$(GPHOBOS_SONAME) + vtv=$(VTV_SONAME) gm2=$(GM2_SONAME) \ + gphobos=$(GPHOBOS_SONAME) hsail-rt=$(HSAIL_SONAME) _soname = $(patsubst $(1)=%,%,$(filter $(1)=%,$(_soname_map))) rel_on_dev := $(if $(cross_lib_arch),>=,=) @@ -63,15 +63,7 @@ define gen_multilib_deps endif endif ifeq ($$(biarchx32),yes) - ifeq ($1,mpx) - ifeq ($$(biarch64),yes) - lib$1biarch$2 := $$(lib$1biarch64$2) - else ifeq ($$(biarch32),yes) - lib$1biarch$2 := $$(lib$1biarch32$2) - else - lib$1biarch$2 := - endif - else ifeq ($$(biarch64),yes) + ifeq ($$(biarch64),yes) lib$1biarch$2 := $$(lib$1biarch64$2), $$(lib$1biarchx32$2) else ifeq ($$(biarch32),yes) lib$1biarch$2 := $$(lib$1biarch32$2), $$(lib$1biarchx32$2) @@ -100,7 +92,7 @@ ifeq ($(with_shared_libgcc),yes) $(eval $(call gen_multilib_deps,gcc,,$(DEB_LIBGCC_VERSION))) endif LIBGCC_DEV_DEP := libgcc-$(BASE_VERSION)-dev$(LS)$(AQ) ($(rel_on_dev) $(DEB_VERSION)) -$(foreach x,stdc++ gomp ssp gfortran itm objc atomic asan lsan mpx ubsan quadmath go vtv cilkrts, \ +$(foreach x,stdc++ gomp ssp gfortran itm objc atomic asan lsan ubsan quadmath go vtv, \ $(eval $(call gen_multilib_deps,$(x),,$$$${gcc:Version}))) $(foreach x,gcc stdc++ gfortran objc go gphobos, \ $(eval $(call gen_multilib_deps,$(x),dev,$$$${gcc:Version}))) @@ -108,8 +100,8 @@ $(foreach x,gcc stdc++ gfortran objc go gphobos, \ $(eval $(call gen_multilib_deps,$(x),dbg,$$$${gcc:Version}))) # Helper to generate _no_archs variables. -# For example, $(eval $(call gen_no_archs,java)) will create the java_no_archs -# variable, using the java_no_cpu and java_no_systems variables. +# For example, $(eval $(call gen_no_archs,go)) will create the go_no_archs +# variable, using the go_no_cpu and go_no_systems variables. define gen_no_archs $1_no_archs := ifneq (,$$($1_no_cpus)) @@ -139,7 +131,7 @@ define gen_no_archs endef base_deb_cpus := amd64 i386 alpha base_deb_systems := -$(foreach x,ada java java_plugin fortran libgphobos libgc check locale,$(eval $(call gen_no_archs,$(x),$(base_deb_cpus),$(base_deb_systems)))) +$(foreach x,ada fortran libgphobos libgc check locale,$(eval $(call gen_no_archs,$(x),$(base_deb_cpus),$(base_deb_systems)))) linux_no_archs := !hurd-any !kfreebsd-any GCC_VERSION := $(strip $(shell cat $(firstword $(wildcard $(srcdir)/gcc/FULL-VER $(srcdir)/gcc/BASE-VER)))) @@ -153,7 +145,7 @@ NEXT_GCC_MINOR_VERSION := $(shell expr $(echo $(GCC_MINOR_VERSION)) + 1) NEXT_GCC_RELEASE_VERSION := $(shell expr $(echo $(GCC_MAJOR_VERSION)) + 1) ifeq ($(single_package),yes) - BASE_VERSION := $(shell echo $(GCC_VERSION) | sed -e 's/\([1-9]*\).*/\1/') + BASE_VERSION := $(shell echo $(GCC_VERSION) | sed -e 's/\([0-9]*\).*/\1/') endif GCC_SOURCE_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-.*//') @@ -193,6 +185,12 @@ ifeq ($(DEB_HOST_ARCH),$(DEB_TARGET_ARCH)) TARGET_QUAL = :$(DEB_TARGET_ARCH) endif +ifneq (,$(filter $(distrelease),squeeze wheezy lucid precise trusty xenial)) + LOCALES = locales +else + LOCALES = locales-all +endif + # The binutils version needed. # The oldest suitable versions for the various platforms can be found in # INSTALL/specific.html ; we take a tighter dependency if possible to be on @@ -206,20 +204,34 @@ else BINUTILSBDV = 2.22 ifneq (,$(filter $(distrelease),vivid)) BINUTILSBDV = 2.25-3~ + else ifneq (,$(filter $(distrelease),precise)) + BINUTILSBDV = 2.22-6~ + else ifneq (,$(filter $(distrelease),trusty)) + BINUTILSBDV = 2.24-5~ else ifneq (,$(filter $(distrelease),jessie)) BINUTILSBDV = 2.25-7~ else ifneq (,$(filter $(distrelease),xenial)) BINUTILSBDV = 2.26.1 - else ifneq (,$(filter $(distrelease),sid stretch zesty)) - BINUTILSBDV = 2.28-3 + else ifneq (,$(filter $(distrelease),stretch zesty)) + BINUTILSBDV = 2.28 + else ifneq (,$(filter $(distrelease),artful)) + BINUTILSBDV = 2.29.1 + else ifneq (,$(filter $(distrelease),bionic)) + BINUTILSBDV = 2.30 + else + BINUTILSBDV = 2.33.1 endif endif ifeq ($(DEB_CROSS),yes) - BINUTILS_BUILD_DEP = binutils$(TS)$(NT) (>= $(BINUTILSBDV)), binutils-multiarch$(NT) (>= $(BINUTILSBDV)) + ifneq (,$(filter $(distrelease),stretch jessie wheezy precise trusty xenial)) + BINUTILS_BUILD_DEP = binutils$(TS)$(NT) (>= $(BINUTILSBDV)), binutils-multiarch$(NT) (>= $(BINUTILSBDV)) + else + INUTILS_BUILD_DEP = binutils$(TS)$(NT) (>= $(BINUTILSBDV)), debhelper (>= 10.10.6~) + endif BINUTILSV := $(shell dpkg -l binutils$(TS) \ | awk '/^ii/{print $$3;exit}' | sed 's/-.*//') else - BINUTILS_BUILD_DEP = binutils$(NT) (>= $(BINUTILSBDV)) | binutils-multiarch$(NT) (>= $(BINUTILSBDV)) + BINUTILS_BUILD_DEP = binutils$(NT) (>= $(BINUTILSBDV)) ifneq (,$(findstring cross-build-,$(build_type))) BINUTILSV := $(shell dpkg -l binutils$(TS) \ | awk '/^ii/{print $$3;exit}' | sed 's/-.*//') @@ -229,12 +241,8 @@ else endif endif ifneq (,$(filter $(build_type), build-native cross-build-native)) - ifeq (,$(filter gccgo% gcj% gnat%, $(PKGSOURCE))) - ifeq ($(hppa64_archs),hppa) - BINUTILS_BUILD_DEP += , binutils-hppa64$(NT) (>= $(BINUTILSBDV)) [$(hppa64_archs)] - else - BINUTILS_BUILD_DEP += , binutils-hppa64-linux-gnu$(NT) (>= $(BINUTILSBDV)) [$(hppa64_archs)] - endif + ifeq (,$(filter gccgo% gnat%, $(PKGSOURCE))) + BINUTILS_BUILD_DEP += , $(binutils_hppa64)$(NT) (>= $(BINUTILSBDV)) [$(hppa64_archs)] endif endif ifeq (,$(BINUTILSV)) @@ -282,7 +290,12 @@ LIBC_DEV_DEP := $(LIBC_DEP)-dev # this is about Debian archs name, *NOT* GNU target triplet biarch_deb_map := \ i386=amd64 amd64=i386 \ - mips=mips64 mipsel=mips64 \ + mips=mips64 mipsel=mips64el \ + mipsn32=mips mipsn32el=mipsel \ + mips64=mips mips64el=mipsel \ + mipsr6=mips64r6 mipsr6el=mips64r6el \ + mipsn32r6=mipsr6 mipsn32r6el=mipsr6el \ + mips64r6=mipsr6 mips64r6el=mipsr6el \ powerpc=ppc64 ppc64=powerpc \ sparc=sparc64 sparc64=sparc\ s390=s390x s390x=s390 \ @@ -310,7 +323,7 @@ ifneq (,$(findstring yes,$(biarch64) $(biarch32) $(biarchn32) $(biarchx32)$(biar endif endif # mips* - ifneq (,$(findstring $(DEB_TARGET_ARCH),mips mipsel mipsn32 mipsn32el mips64 mips64el)) + ifneq (,$(findstring $(DEB_TARGET_ARCH),mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el)) ifeq ($(biarchn32)$(biarch32),yesyes) LIBC_BIARCH_DEV_DEP := libc6-dev-mips32$(LS)$(AQ) (>= $(libc_ver)), libc6-dev-mipsn32$(LS)$(AQ) (>= $(libc_ver)) endif @@ -351,7 +364,10 @@ ifneq ($(DEB_CROSS),yes) LIBC_BUILD_DEP += , libc6-dev (>= 2.13-31) [armel armhf] endif LIBC_BIARCH_BUILD_DEP = libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mipsn32el mips64 mips64el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el], - ifneq (,$(findstring amd64,$(biarchx32archs))) + ifeq (yes,$(MIPS_R6_ENABLED)) + LIBC_BIARCH_BUILD_DEP = libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el], + endif +ifneq (,$(findstring amd64,$(biarchx32archs))) LIBC_BIARCH_BUILD_DEP += libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], endif ifneq (,$(findstring armel,$(biarchhfarchs))) @@ -374,13 +390,14 @@ endif ifneq (,$(multilib_archs)) GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)]$(pf_ncross), endif -GCC_MULTILIB_BUILD_DEP += g++-6 [arm64]$(pf_ncross), -LIBUNWIND_DEV_DEP := libunwind7-dev$(LS)$(AQ) (>= 0.98.5-6) +LIBUNWIND_DEV_DEP := libunwind8-dev$(LS)$(AQ) LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP) [ia64], LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(LS) [ia64], ifneq ($(DEB_TARGET_ARCH),ia64) LIBUNWIND_DEV_DEP := # nothing +else ifneq (,$(filter $(DEB_STAGE),stage1 stage2)) + LIBUNWIND_DEV_DEP := # nothing endif ifneq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty)) @@ -392,8 +409,8 @@ else endif ISL_BUILD_DEP = libisl-dev, -ifneq (,$(filter $(distrelease),jessie stretch sid experimental)) - ISL_BUILD_DEP = libisl-dev (>= 0.14), +ifneq (,$(filter $(distrelease),cosmic buster sid experimental)) + ISL_BUILD_DEP = libisl-dev (>= 0.20), endif ifneq (,$(filter $(distrelease),lenny etch squeeze wheezy dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring)) @@ -407,10 +424,19 @@ ifeq (,$(findstring gcc,$(PKGSOURCE))) SOURCE_BUILD_DEP := gcc-$(BASE_VERSION)-source (>= $(GCC_SOURCE_VERSION)), gcc-$(BASE_VERSION)-source (<< $(NEXT_GCC_SOURCE_VERSION)), endif -CHECK_BUILD_DEP := dejagnu [$(check_no_archs)], +ifneq (,$(filter $(distrelease),squeeze wheezy lucid precise)) + CHECK_BUILD_DEP := dejagnu [$(check_no_archs)], +else + CHECK_BUILD_DEP := dejagnu [$(check_no_archs)] <!nocheck>, +endif AUTO_BUILD_DEP := m4, libtool, -AUTO_BUILD_DEP += autoconf2.64, +autoconf_version = 2.69 +# FIXME should have a separate 2.69 package +ifeq (,$(filter $(distrelease),lucid precise)) + autoconf_version = +endif +AUTO_BUILD_DEP += autoconf$(autoconf_version), ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring saucy trusty)) SDT_BUILD_DEP = systemtap-sdt-dev [linux-any kfreebsd-any hurd-any], @@ -419,40 +445,44 @@ endif # ensure that the common libs, built from the next GCC version are available ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) ifneq ($(with_common_libs),yes) - BASE_BUILD_DEP = gcc-6-base, + BASE_BUILD_DEP = gcc-10-base, endif endif +ifeq (,$(filter $(distrelease),lucid precise)) + OFFLOAD_BUILD_DEP += nvptx-tools [$(nvptx_archs)], +endif + PHOBOS_BUILD_DEP = lib32z1-dev [amd64 kfreebsd-amd64], lib64z1-dev [i386], ifeq ($(derivative),Ubuntu) - PHOBOS_BUILD_DEP += libx32z1-dev [amd64 kfreebsd-amd64 i386], + ifeq (,$(filter $(distrelease),precise)) + PHOBOS_BUILD_DEP += libx32z1-dev [amd64 kfreebsd-amd64 i386], + endif +endif + +ifeq ($(with_m2),yes) + GM2_BUILD_DEP = libpth-dev, python3:any, endif ifneq ($(DEB_CROSS),yes) # all archs for which to create b-d's -any_archs = alpha amd64 armel armhf arm64 i386 mips mipsel mips64 mips64el powerpc ppc64 ppc64el m68k sh4 sparc64 s390x x32 -arch_gnutype_map = \ - alpha=alpha-linux-gnu \ - amd64=x86-64-linux-gnu \ - armel=arm-linux-gnueabi \ - armhf=arm-linux-gnueabihf \ - arm64=aarch64-linux-gnu \ - i386=i686-linux-gnu \ - mips=mips-linux-gnu \ - mipsel=mipsel-linux-gnu \ - mips64=mips64-linux-gnuabi64 \ - mips64el=mips64el-linux-gnuabi64 \ - powerpc=powerpc-linux-gnu \ - ppc64=powerpc64-linux-gnu \ - ppc64el=powerpc64le-linux-gnu \ - m68k=m68k-linux-gnu \ - sh4=sh4-linux-gnu \ - sparc64=sparc64-linux-gnu \ - s390x=s390x-linux-gnu \ - x32=x86-64-linux-gnux32 - -_element = $(filter $1=%,$(arch_gnutype_map)) +any_archs := alpha amd64 armel armhf arm64 i386 mips mipsel mips64 mips64el mipsn32 powerpc powerpcspe ppc64 ppc64el m68k riscv64 sh4 sparc64 s390x x32 +ifeq (,$(filter $(distrelease),squeeze wheezy jessie stretch buster lucid precise xenial bionic cosmic disco)) + any_archs := $(filter-out mips, $(any_archs)) +endif +ifeq (,$(filter $(distrelease),squeeze wheezy jessie stretch buster lucid precise xenial bionic cosmic disco)) + any_archs := $(filter-out powerpcspe, $(any_archs)) +endif +ifeq (yes,$(MIPS_R6_ENABLED)) + any_archs += mipsn32el mipsr6 mipsr6el mips64r6 mips64r6el mipsn32r6 mipsn32r6el +endif +ifeq (,$(filter $(DEB_HOST_ARCH),$(any_archs))) +any_archs += $(DEB_HOST_ARCH) +endif + +arch_gnutype_map := $(foreach a,$(any_archs),$(a)=$(shell CC=true dpkg-architecture -f -a$(a) -qDEB_HOST_GNU_TYPE)) _gnu_type = $(subst $1=,,$(filter $1=%,$(arch_gnutype_map))) +_gnu_suffix = -$(subst _,-,$(call _gnu_type,$1)) ifneq (,$(filter $(distrelease),lenny etch squeeze wheezy wheezy dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring saucy trusty utopic vivid)) DEBHELPER_BUILD_DEP = debhelper (>= 9), @@ -463,81 +493,27 @@ else DEBHELPER_BUILD_DEP = debhelper (>= 9.20141010), TARGET_TOOL_BUILD_DEP = \ $(foreach a, $(any_archs), \ - g++-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>, \ + g++-$(BASE_VERSION)$(call _gnu_suffix,$(a)) [$(a)] <cross>, \ $(if $(filter $(a), avr),, \ - gobjc-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \ - gfortran-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>, \ - $(if $(filter $(a), avr),, \ - gcj-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \ + gobjc-$(BASE_VERSION)$(call _gnu_suffix,$(a)) [$(a)] <cross>,) \ + gfortran-$(BASE_VERSION)$(call _gnu_suffix,$(a)) [$(a)] <cross>, \ $(if $(filter $(a), s390 sh4),, \ - gdc-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \ + gdc-$(BASE_VERSION)$(call _gnu_suffix,$(a)) [$(a)] <cross>,) \ $(if $(filter $(a), hppa m68k sh4),, \ - gccgo-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \ - $(if $(filter $(a), m68k mips64 powerpcspe sh4 sparc64 x32),, \ - gnat-$(BASE_VERSION)-$(call _gnu_type,$(a)) [$(a)] <cross>,) \ + gccgo-$(BASE_VERSION)$(call _gnu_suffix,$(a)) [$(a)] <cross>,) \ + $(if $(filter $(a), m68k),, \ + gnat-$(BASE_VERSION)$(call _gnu_suffix,$(a)) [$(a)] <cross>,) \ + $(if $(filter $(a), $(m2_no_archs)),, \ + gm2-$(BASE_VERSION)$(call _gnu_suffix,$(a)) [$(a)] <cross>,) \ ) pf_cross = $(SPACE)<cross> pf_ncross = $(SPACE)<!cross> NT = :native endif -JAVA_BUILD_DEP := zlib1g-dev, libantlr-java, python$(NT), libffi-dev, - -ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) - bd_java_archs = -else ifeq ($(single_package)-$(with_java),yes-yes) - bd_java_archs = -else - bd_java_archs = $(if $(java_no_archs),$(EMPTY) [$(java_no_archs)]) -endif - -ifneq (,$(java_awt_peers)) - JAVA_BUILD_DEP += fastjar$(bd_java_archs), libmagic-dev$(bd_java_archs), - JAVA_BUILD_DEP += libecj-java (>= 3.3.0-2)$(bd_java_archs), zip$(bd_java_archs), - ifeq ($(with_java_maintainer_mode),yes) - # gcj-6 needed for gjavah-6. - JAVA_BUILD_DEP += gcj-6$(bd_java_archs), ecj (>= 3.3.0-2)$(bd_java_archs), - endif - JAVA_BUILD_DEP += libasound2-dev [$(java_no_archs) $(linux_no_archs)], - ifneq (,$(findstring gtk,$(java_awt_peers))) - JAVA_BUILD_DEP += libxtst-dev$(bd_java_archs), libxt-dev$(bd_java_archs), libgtk2.0-dev (>= 2.4.4-2)$(bd_java_archs), libart-2.0-dev$(bd_java_archs), libcairo2-dev$(bd_java_archs), - endif - ifneq (,$(findstring qt,$(java_awt_peers))) - JAVA_BUILD_DEP += libqt4-dev (>= 4.1.0)$(bd_java_archs), - endif - # gconf peer, disabled by default - #JAVA_BUILD_DEP += libgconf2-dev$(bd_java_archs), - # gstreamer peer - #JAVA_BUILD_DEP += libgstreamer-plugins-base0.10-dev$(bd_java_archs), -endif -ifneq ($(with_standalone_gcj),yes) - ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) - JAVA_BUILD_DEP += $(SOURCE_BUILD_DEP) - endif -endif -#JAVA_BUILD_INDEP := gcj-$(BASE_VERSION)-jdk ifeq ($(single_package),yes) LIBSTDCXX_BUILD_INDEP = doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base LIBSTDCXX_BUILD_INDEP +=, xsltproc, libxml2-utils, docbook-xsl-ns - JAVA_BUILD_INDEP := -endif -ifeq ($(with_separate_libgcj),yes) - ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) - JAVA_BUILD_DEP := - JAVA_BUILD_INDEP := - endif -endif - -ifeq ($(with_ecj),yes) - ifneq (./,$(dir $(ecj_jar))) - ECJ_DEP = libecj-java (>= 3.5.1) - endif -else - ECJ_DEP = ecj, libecj-java (>= 3.5.1) - ECJ_DEP = ecj-gcj, libecj-java-gcj (>= 3.5.1) - ifeq ($(with_external_ecj1),yes) - ECJ_DEP +=, ecj1 - endif endif ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) @@ -545,22 +521,28 @@ ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) ifeq (,$(filter $(distrelease),lenny etch dapper hardy jaunty karmic lucid maverick natty oneiric)) LIBSTDCXX_BUILD_INDEP +=, xsltproc, libxml2-utils, docbook-xsl-ns endif - JAVA_BUILD_INDEP :=, $(JAVA_BUILD_INDEP) endif GO_BUILD_DEP := netbase, # try to build with itself, or with the last version -ifneq (,$(filter $(distrelease), jessie)) +ifneq (,$(filter $(distrelease), squeeze lucid precise)) + gnat_build_dep := +else ifneq (,$(filter $(distrelease), jessie)) gnat_build_dep := gnat-4.9$(NT) [$(ada_no_archs)], g++-4.9$(NT) -else ifneq (,$(filter $(distrelease), wheezy precise trusty wily xenial)) - gnat_build_dep := gnat-5$(NT) [$(ada_no_archs)], g++-5$(NT) -else ifneq (,$(filter $(distrelease), stretch sid yakkety zesty)) +else ifneq (,$(filter $(distrelease), precise)) gnat_build_dep := gnat-6$(NT) [$(ada_no_archs)], g++-6$(NT) -else ifneq (,$(filter $(distrelease), squeeze lucid)) - gnat_build_dep := +else ifneq (,$(filter $(distrelease), wheezy trusty wily xenial)) + gnat_build_dep := gnat-5$(NT) [$(ada_no_archs)], g++-5$(NT) +else ifneq (,$(filter $(distrelease), stretch yakkety zesty)) + gnat_build_dep := gnat-6$(NT) [$(ada_no_archs) !x32], g++-7 [x32], gnat-7 [x32], g++-6$(NT) +else ifneq (,$(filter $(distrelease), buster artful bionic)) + gnat_build_dep := gnat-8$(NT) [$(ada_no_archs)], g++-8$(NT) else - gnat_build_dep := gnat$(NT) [$(ada_no_archs)] + gnat_build_dep := gnat-9$(NT) [$(ada_no_archs)], g++-9$(NT) +endif +ifneq (,$(filter $(DEB_STAGE),stage1 stage2)) + gnat_build_dep := endif ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) @@ -579,27 +561,16 @@ else ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION)) # Bootstrap step needs a gnatgcc symbolic link. GNAT_BUILD_DEP := $(gnat_build_dep), GNAT_BUILD_DEP += $(SOURCE_BUILD_DEP) - JAVA_BUILD_DEP := - JAVA_BUILD_INDEP := - GDC_BUILD_DEP := - GO_BUILD_DEP := -else ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) - # Special source package just for gcj. - GNAT_BUILD_DEP := GDC_BUILD_DEP := GO_BUILD_DEP := else ifeq ($(PKGSOURCE),gdc-$(BASE_VERSION)) # Special source package just for gdc. GNAT_BUILD_DEP := - JAVA_BUILD_DEP := - JAVA_BUILD_INDEP := GDC_BUILD_DEP := $(SOURCE_BUILD_DEP) GO_BUILD_DEP := else ifeq ($(PKGSOURCE),gccgo-$(BASE_VERSION)) # Special source package just for gccgo. GNAT_BUILD_DEP := - JAVA_BUILD_DEP := - JAVA_BUILD_INDEP := GDC_BUILD_DEP := $(SOURCE_BUILD_DEP) endif @@ -614,16 +585,13 @@ endif ifeq (,$(findstring gcc,$(PKGSOURCE))) SOURCE_BUILD_DEP := gcc-$(BASE_VERSION)-source (>= $(GCC_SOURCE_VERSION)), gcc-$(BASE_VERSION)-source (<< $(NEXT_GCC_SOURCE_VERSION)), endif - ifeq ($(with_java),yes) - JAVA_BUILD_DEP := zlib1g-dev, lib64z1-dev [i386 powerpc sparc s390], lib32z1-dev [amd64 ppc64 kfreebsd-amd64 s390x], - endif - JAVA_BUILD_INDEP := GNAT_BUILD_DEP := + arch_gnutype_map = $(DEB_TARGET_ARCH)=$(TARGET_ALIAS) endif # cross compiler -BASE_BREAKS := gcc-4.4-base (<< 4.4.7), gcc-4.7-base (<< 4.7.3), gcj-4.4-base (<< 4.4.6-9~), gnat-4.4-base (<< 4.4.6-3~), gcj-4.6-base (<< 4.6.1-4~), gnat-4.6 (<< 4.6.1-5~) +BASE_BREAKS := gnat (<< 7) # these would need proper updates, and are only needed for upgrades -ifneq (,$(filter $(distrelease),squeeze wheezy lucid precise trusty)) +ifneq (,$(filter $(distrelease),stretch jessie trusty xenial bionic cosmic)) BASE_BREAKS := endif @@ -633,30 +601,27 @@ NEXT_GCC_VERSION := $(shell echo $(GCC_VERSION) | \ awk -F. '{OFS="."; if (NF==2) $$3=1; else $$NF += 1; print}') # first version with a new path component in gcc_lib_dir (i.e. GCC_VERSION # or TARGET_ALIAS changes), or last version available for all architectures -DEB_GCC_SOFT_VERSION := 6.3.0-1 -DEB_GCJ_SOFT_VERSION := 6.3.0-1 -DEB_GNAT_SOFT_VERSION := 6.3.0-1 +DEB_GCC_SOFT_VERSION := 8 +DEB_GNAT_SOFT_VERSION := 8 ifeq ($(with_d),yes) GDC_VERSION := $(BASE_VERSION) DEB_GDC_VERSION := $(DEB_VERSION) endif +ifeq ($(with_m2),yes) + GM2_VERSION := $(BASE_VERSION) + DEB_GM2_VERSION := $(DEB_VERSION) +endif + # semiautomatic ... DEB_SOVERSION := $(DEB_VERSION) DEB_SOVERSION := 5 DEB_SOEVERSION := $(EPOCH):5 DEB_STDCXX_SOVERSION := 5 -DEB_GCJ_SOVERSION := 5 DEB_GOMP_SOVERSION := $(DEB_SOVERSION) DEB_GCC_VERSION := $(DEB_VERSION) -DEB_GCJ_VERSION := $(DEB_VERSION) -ifeq ($(with_separate_libgcj),yes) - ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) - DEB_GCC_VERSION := $(DEB_GCC_SOFT_VERSION) - endif -endif DEB_GNAT_VERSION := $(DEB_VERSION) ifeq ($(with_separate_gnat),yes) @@ -674,16 +639,14 @@ endif pkg_ver := -$(BASE_VERSION) -PKG_GCJ_EXT = $(GCJ_SONAME1) -PKG_LIBGCJ_EXT = $(GCJ_SONAME1)$(if $(GCJ_SONAME2),-$(GCJ_SONAME2)) - ctrl_flags = \ -DBINUTILSV=$(BINUTILSV) \ -DBINUTILSBDV=$(BINUTILSBDV) \ -DSRCNAME=$(PKGSOURCE) \ -D__$(DEB_TARGET_GNU_CPU)__ \ -DARCH=$(DEB_TARGET_ARCH) \ - -DDIST=$(distribution) + -DDIST=$(distribution) \ + -DLOCALES=$(LOCALES) \ ctrl_flags += \ -DLIBC_DEV_DEP="$(LIBC_DEV_DEP)" \ @@ -692,9 +655,7 @@ ctrl_flags += \ -DBASE_BUILD_DEP="$(BASE_BUILD_DEP)" \ -DFORTRAN_BUILD_DEP="$(FORTRAN_BUILD_DEP)" \ -DGNAT_BUILD_DEP="$(GNAT_BUILD_DEP)" \ - -DJAVA_BUILD_DEP="$(JAVA_BUILD_DEP)" \ -DGO_BUILD_DEP="$(GO_BUILD_DEP)" \ - -DJAVA_BUILD_INDEP="$(JAVA_BUILD_INDEP)" \ -DLIBSTDCXX_BUILD_INDEP="$(LIBSTDCXX_BUILD_INDEP)" \ -DGDC_BUILD_DEP="$(GDC_BUILD_DEP)" \ -DBINUTILS_BUILD_DEP="$(BINUTILS_BUILD_DEP)" \ @@ -713,6 +674,8 @@ ctrl_flags += \ -DGCC_MULTILIB_BUILD_DEP='$(GCC_MULTILIB_BUILD_DEP)' \ -DTARGET_TOOL_BUILD_DEP='$(TARGET_TOOL_BUILD_DEP)' \ -DPHOBOS_BUILD_DEP="$(PHOBOS_BUILD_DEP)" \ + -DGM2_BUILD_DEP="$(GM2_BUILD_DEP)" \ + -DOFFLOAD_BUILD_DEP="$(OFFLOAD_BUILD_DEP)" \ -DMULTILIB_ARCHS="$(multilib_archs)" \ -DNEON_ARCHS="$(neon_archs)" \ -DTP=$(TP) \ @@ -801,6 +764,9 @@ ifneq ($(DEB_STAGE),rtlibs) ifneq (,$(filter objpp, $(languages))) addons += objppdev endif + ifneq (,$(filter brig, $(enabled_languages))) + addons += brigdev + endif addons += plugindev endif addons += $(if $(findstring armel,$(biarchhfarchs)),armml) @@ -888,16 +854,6 @@ ifeq ($(with_vtv),yes) #addons += $(if $(findstring armel,$(biarchhfarchs)),libhfvtv) #addons += $(if $(findstring armhf,$(biarchsfarchs)),libsfvtv) endif -ifeq ($(with_libcilkrts),yes) - addons += libcilkrts - addons += libcilkrts lib32cilkrts lib64cilkrts #libn32cilkrts - addons += $(if $(findstring amd64,$(biarchx32archs)),libx32cilkrts) - #addons += $(if $(findstring armel,$(biarchhfarchs)),libhfcilkrts) - #addons += $(if $(findstring armhf,$(biarchsfarchs)),libsfcilkrts) -endif -ifeq ($(with_mpx),yes) - addons += libmpx lib32mpx lib64mpx -endif ifeq ($(with_libqmath),yes) addons += libqmath lib32qmath lib64qmath libn32qmath addons += $(if $(findstring amd64,$(biarchx32archs)),libx32qmath) @@ -910,15 +866,25 @@ endif ifeq ($(with_libgccjit),yes) addons += libjit endif +ifeq ($(with_offload_nvptx),yes) + addons += olnvptx libgompnvptx +endif +ifeq ($(with_offload_hsa),yes) + addons += olhsa libgomphsa +endif ifeq ($(with_libcc1),yes) addons += libcc1 endif ifeq ($(with_d),yes) languages += d ifeq ($(with_libphobos),yes) - addons += libphobos + addons += libphobos libn32phobos addons += $(if $(findstring amd64,$(biarchx32archs)),libx32phobos) endif + ifeq ($(with_libphobosdev),yes) + addons += libdevphobos libdevn32phobos + addons += $(if $(findstring amd64,$(biarchx32archs)),libdevx32phobos) + endif endif ifeq ($(with_go),yes) addons += ggo godev @@ -927,6 +893,14 @@ ifeq ($(with_go),yes) addons += $(if $(findstring amd64,$(biarchx32archs)),libx32ggo) endif endif +ifeq ($(with_m2),yes) + languages += m2 + addons += libdevgm2 + ifeq ($(with_libgm2),yes) + addons += libgm2 # lib32gm2 lib64gm2 libn32gm2 + #addons += $(if $(findstring amd64,$(biarchx32archs)),libx32gm2) + endif +endif ifeq ($(with_ada),yes) languages += ada addons += libgnat libs # libgmath libnof lib64gnat ssp @@ -934,11 +908,11 @@ ifeq ($(with_ada),yes) addons += adasjlj endif endif -ifeq ($(with_java),yes) - languages += java - addons += gcj - ifneq ($(DEB_CROSS),yes) - addons += libgcj libgcjdev gcjdoc gcjsrc +ifeq ($(with_brig),yes) + addons += brig + ifeq ($(with_libhsailrt),yes) + addons += libhsail # lib32hsail lib64hsail libn32hsail + addons += # $(if $(findstring amd64,$(biarchx32archs)),libx32hsail) endif endif @@ -946,51 +920,7 @@ endif ifneq (,$(neon_archs)) addons += libneongcc libneongomp libneonitm libneonobjc libneongfortran libneoncxx endif - ifeq ($(with_fixincl),yes) - addons += $(if $(DEB_STAGE),,fixincl) - endif - ifeq ($(with_libgcj_doc),yes) - addons += gcjdoc - endif endif # DEB_CROSS -# ifneq (,$(findstring gtk, $(java_awt_peers))) -# addons += gtkpeer -# endif -# ifneq (,$(findstring qt, $(java_awt_peers))) -# addons += qtpeer -# endif - ifeq ($(with_separate_libgcj),yes) - ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) - languages := $(filter-out java,$(languages)) - addons := $(filter-out gcj libgcj libgcjdev gcjdoc gcjsrc gtkpeer qtpeer,$(addons)) - endif - ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) - languages = java - addons = gcj libgcj libgcjdev gcjsrc - addons += $(if $(filter yes,$(with_gcjbase)),gcjbase) - addons += $(if $(filter yes,$(with_gcjxbase)),gcjxbase) - ifeq ($(with_libgcj_doc),yes) - addons += gcjdoc - endif -# ifneq (,$(findstring gtk, $(java_awt_peers))) -# addons += gtkpeer -# endif -# ifneq (,$(findstring qt, $(java_awt_peers))) -# addons += qtpeer -# endif - ifeq ($(with_standalone_gcj),yes) - addons += libgcc lib4gcc lib64gcc lib32gcc libn32gcc libx32gcc - endif - endif - endif - ifeq ($(DEB_CROSS),yes) - addons := $(filter-out gcjdoc gcjsrc,$(addons)) - endif - ifeq ($(with_standalone_gcj),yes) - ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) - ctrl_flags += -DSTANDALONEJAVA - endif - endif ifeq ($(with_separate_libgo),yes) ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) languages := $(filter-out go,$(languages)) @@ -1036,6 +966,9 @@ endif ifeq ($(with_libphobos),yes) addons += libphobos endif + ifeq ($(with_libphobosdev),yes) + addons += libdevphobos + endif endif endif ifneq ($(DEB_CROSS),yes) # no docs for cross compilers @@ -1053,11 +986,10 @@ control-file: -DGCC_SO=$(GCC_SONAME) \ -DOBJC_SO=$(OBJC_SONAME) \ -DFORTRAN_SO=$(FORTRAN_SONAME) \ - -DGCJ_SO=$(PKG_GCJ_EXT) \ - -DLIBGCJ_EXT=$(PKG_LIBGCJ_EXT) \ -DGNAT_SO=$(GNAT_SONAME) \ -DGNAT_V=$(GNAT_VERSION) \ -DPHOBOS_V=$(GPHOBOS_SONAME) \ + -DGM2_V=$(GM2_SONAME) \ -DGDRUNTIME_V=$(GDRUNTIME_SONAME) \ -DGOMP_SO=$(GOMP_SONAME) \ -DITM_SO=$(ITM_SONAME) \ @@ -1068,20 +1000,18 @@ control-file: -DTSAN_SO=$(TSAN_SONAME) \ -DUBSAN_SO=$(UBSAN_SONAME) \ -DVTV_SO=$(VTV_SONAME) \ - -DCILKRTS_SO=$(CILKRTS_SONAME) \ - -DMPX_SO=$(MPX_SONAME) \ -DQMATH_SO=$(QUADMATH_SONAME) \ -DSSP_SO=$(SSP_SONAME) \ -DGO_SO=$(GO_SONAME) \ -DCC1_SO=$(CC1_SONAME) \ -DGCCJIT_SO=$(GCCJIT_SONAME) \ + -DHSAIL_SO=$(HSAIL_SONAME) \ -Denabled_languages="$(languages) $(addons)" \ -Dada_no_archs="$(ada_no_archs)" \ - -Djava_no_archs="$(java_no_archs)" \ -Dfortran_no_archs="$(fortran_no_archs)" \ -Dlibgc_no_archs="$(libgc_no_archs)" \ - -Dlibphobos_archs="$(libphobos_archs)" \ - -Dlibphobos_no_archs="$(libphobos_no_archs)" \ + -Dlibphobos_archs="$(phobos_archs)" \ + -Dlibphobos_no_archs="$(phobos_no_archs)" \ -Dcheck_no_archs="$(check_no_archs)" \ -Dlocale_no_archs="$(locale_no_archs)" \ -Dlinux_gnu_archs="$(linux_gnu_archs)" \ @@ -1093,7 +1023,6 @@ control-file: -Dbiarchsf_archs="$(strip $(subst /, ,$(biarchsfarchs)))" \ -Dadd_built_using=$(add_built_using) \ -DGCC_PORTS_BUILD=$(GCC_PORTS_BUILD) \ - -DPR66145BREAKS="$(if $(findstring build-native,$(build_type)),$(if $(filter new,$(libstdcxx_abi)),$$(tr '\n' ' ' < debian/libstdc++-breaks.$(derivative))))" \ debian/control.m4 > debian/control.tmp2 uniq debian/control.tmp2 | sed '/^Build/s/ *, */, /g;/^ /s/ *, */, /g' \ $(if $(filter yes, $(with_base_only)), | awk '/^$$/ {if (p) exit; else p=1; } {print}') \ @@ -1110,7 +1039,7 @@ readme-bugs-file: copyright-file: rm -f debian/copyright - if echo $(SOURCE_VERSION) | grep -E ^'[0-9]\.[0-9]-[0-9]{8}' ; \ + if echo $(SOURCE_VERSION) | grep -E ^'[0-9][0-9]*\.[0-9]-[0-9]{8}' ; \ then SVN_BRANCH="trunk" ; \ else \ SVN_BRANCH="gcc-$(subst .,_,$(BASE_VERSION))-branch" ; \ @@ -1128,9 +1057,7 @@ substvars-file: control-file echo 'gcc:EpochVersion=$(DEB_EVERSION)'; \ echo 'gcc:SoftVersion=$(DEB_GCC_SOFT_VERSION)'; \ echo 'gdc:Version=$(DEB_GDC_VERSION)'; \ - echo 'gcj:Version=$(DEB_GCJ_VERSION)'; \ - echo 'gcj:SoftVersion=$(DEB_GCJ_SOFT_VERSION)'; \ - echo 'gcj:BaseVersion=$(BASE_VERSION)'; \ + echo 'gm2:Version=$(DEB_GM2_VERSION)'; \ echo 'gnat:Version=$(DEB_GNAT_VERSION)'; \ echo 'gnat:SoftVersion=$(DEB_GNAT_SOFT_VERSION)'; \ echo 'binutils:Version=$(BINUTILSV)'; \ @@ -1146,7 +1073,6 @@ substvars-file: control-file echo 'dep:libcxxbiarchdev=$(libstdc++biarchdev)'; \ echo 'dep:libcxxbiarchdbg=$(libstdc++biarchdbg)'; \ echo 'dep:libgnat=$(LIBGNAT_DEP)'; \ - echo 'dep:ecj=$(ECJ_DEP)'; \ echo 'base:Breaks=$(BASE_BREAKS)'; \ ) > debian/substvars.local.tmp ifneq (,$(filter $(DEB_TARGET_ARCH), $(multilib_archs))) @@ -1202,14 +1128,6 @@ ifeq ($(with_vtv),yes) echo 'dep:libvtv=libvtv$(VTV_SONAME)$(LS)$(AQ) (>= $${gcc:Version})' \ >> debian/substvars.local.tmp endif -ifeq ($(with_cilkrts),yes) - echo 'dep:libcilkrts=libcilkrts$(CILKRTS_SONAME)$(LS)$(AQ) (>= $${gcc:Version})' \ - >> debian/substvars.local.tmp -endif -ifeq ($(with_mpx),yes) - echo 'dep:libmpx=libmpx$(MPX_SONAME)$(LS)$(AQ) (>= $${gcc:Version})' \ - >> debian/substvars.local.tmp -endif ifeq ($(with_qmath),yes) echo 'dep:libqmath=libquadmath$(QUADMATH_SONAME)$(LS)$(AQ) (>= $${gcc:Version})' \ >> debian/substvars.local.tmp @@ -1223,7 +1141,7 @@ ifeq ($(multilib),yes) >> debian/substvars.local.tmp echo 'dep:libobjcbiarchdev=$(libobjcbiarchdev)' \ >> debian/substvars.local.tmp - ifeq ($(with_libphobos),yes) + ifeq ($(with_phobos),yes) echo 'dep:libphobosbiarchdev=$(libgphobosbiarchdev)' \ >> debian/substvars.local.tmp endif @@ -1267,14 +1185,6 @@ ifeq ($(multilib),yes) echo 'dep:libvtvbiarch=$(libvtvbiarch)' \ >> debian/substvars.local.tmp endif - ifeq ($(with_cilkrts),yes) - echo 'dep:libcilkrtsbiarch=$(libcilkrtsbiarch)' \ - >> debian/substvars.local.tmp - endif - ifeq ($(with_mpx),yes) - echo 'dep:libmpxbiarch=$(libmpxbiarch)' \ - >> debian/substvars.local.tmp - endif ifeq ($(with_qmath),yes) echo 'dep:libqmathbiarch=$(libquadmathbiarch)' \ >> debian/substvars.local.tmp @@ -1285,31 +1195,12 @@ ifeq ($(multilib),yes) echo 'dep:libgobiarch=$(libgobiarch)' \ >> debian/substvars.local.tmp endif - ifeq ($(with_libphobosdev),yes) - echo 'dep:libphobosbiarchdev=$(libgphobosbiarchdev)' \ - >> debian/substvars.local.tmp - echo 'dep:libphobosbiarch=$(libgphobosbiarch)' \ - >> debian/substvars.local.tmp - endif -endif -ifneq ($(with_standalone_gcj),yes) - ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf)) - echo 'dep:gcj=g++$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ - >> debian/substvars.local.tmp - else - echo 'dep:gcj=gcc$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ - >> debian/substvars.local.tmp - endif - ifeq ($(DEB_CROSS),yes) - echo 'dep:gcjcross=gcj$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ - >> debian/substvars.local.tmp - endif endif ifeq ($(DEB_CROSS),yes) echo 'dep:gdccross=gdc$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ >> debian/substvars.local.tmp endif -ifeq ($(with_libphobos),yes) +ifeq ($(with_phobos),yes) echo 'dep:phobosdev=libgphobos$(pkg_ver)-dev$(LS)$(AQ) (>= $(DEB_GCC_SOFT_VERSION))' \ >> debian/substvars.local.tmp ifeq ($(DEB_CROSS),yes) @@ -1327,14 +1218,6 @@ ifeq ($(with_cc1),yes) >> debian/substvars.local.tmp endif endif -#ifneq (,$(findstring gtk, $(java_awt_peers))) -# echo 'pkg:gcjgtk=libgcj$(subst 0,,$(GCJ_SONAME))-awt-gtk (>= $(DEB_GCJ_VERSION))' \ -# >> debian/substvars.local.tmp -#endif -#ifneq (,$(findstring qt, $(java_awt_peers))) -# echo 'pkg:gcjqt=libgcj$(subst 0,,$(GCJ_SONAME))-awt-qt (>= $(DEB_GCJ_VERSION))' \ -# >> debian/substvars.local.tmp -#endif ifeq ($(DEB_HOST_ARCH),hppa) echo 'dep:prctl=prctl' >> debian/substvars.local.tmp endif @@ -1375,15 +1258,11 @@ parameters-file: echo 'DEB_LIBGCC_SOVERSION := $(DEB_LIBGCC_SOVERSION)'; \ echo 'DEB_LIBGCC_VERSION := $(DEB_LIBGCC_VERSION)'; \ echo 'DEB_STDCXX_SOVERSION := $(DEB_STDCXX_SOVERSION)'; \ - echo 'DEB_GCJ_SOVERSION := $(DEB_GCJ_SOVERSION)'; \ - echo 'PKG_GCJ_EXT := $(PKG_GCJ_EXT)'; \ - echo 'PKG_LIBGCJ_EXT := $(PKG_LIBGCJ_EXT)'; \ echo 'DEB_GOMP_SOVERSION := $(DEB_GOMP_SOVERSION)'; \ echo 'GCC_SONAME := $(GCC_SONAME)'; \ echo 'CXX_SONAME := $(CXX_SONAME)'; \ echo 'FORTRAN_SONAME := $(FORTRAN_SONAME)'; \ echo 'OBJC_SONAME := $(OBJC_SONAME)'; \ - echo 'GCJ_SONAME := $(GCJ_SONAME)'; \ echo 'GDC_VERSION := $(GDC_VERSION)'; \ echo 'GNAT_VERSION := $(GNAT_VERSION)'; \ echo 'GNAT_SONAME := $(GNAT_SONAME)'; \ @@ -1398,14 +1277,14 @@ parameters-file: echo 'TSAN_SONAME := $(TSAN_SONAME)'; \ echo 'UBSAN_SONAME := $(UBSAN_SONAME)'; \ echo 'VTV_SONAME := $(VTV_SONAME)'; \ - echo 'CILKRTS_SONAME := $(CILKRTS_SONAME)'; \ - echo 'MPX_SONAME := $(MPX_SONAME)'; \ echo 'QUADMATH_SONAME := $(QUADMATH_SONAME)'; \ echo 'GO_SONAME := $(GO_SONAME)'; \ echo 'CC1_SONAME := $(CC1_SONAME)'; \ echo 'GCCJIT_SONAME := $(GCCJIT_SONAME)'; \ echo 'GPHOBOS_SONAME := $(GPHOBOS_SONAME)'; \ echo 'GDRUNTIME_SONAME := $(GDRUNTIME_SONAME)'; \ + echo 'GM2_SONAME := $(GM2_SONAME)'; \ + echo 'HSAIL_SONAME := $(HSAIL_SONAME)'; \ echo 'LIBC_DEP := $(LIBC_DEP)'; \ ) > debian/rules.parameters.tmp [ -e debian/rules.parameters ] \ @@ -1436,25 +1315,27 @@ ifeq ($(DEB_CROSS),yes) ln -s $$f $$link; \ done endif + ifeq ($(with_libphobosdev),yes) + echo 'dep:libphobosbiarchdev=$(libgphobosbiarchdev)' \ + >> debian/substvars.local.tmp + echo 'dep:libphobosbiarch=$(libgphobosbiarch)' \ + >> debian/substvars.local.tmp + endif endif versioned-files: - fs=`echo debian/*BV* debian/*GCJ* debian/*CXX* debian/*LC* | sort -u`; \ - for f in $$fs debian/source.lintian-overrides.in; do \ + fs=`echo debian/*BV* debian/*CXX* debian/*LC* | sort -u`; \ + for f in $$fs; do \ [ -f $$f ] || echo "CANNOT FIND $$f"; \ [ -f $$f ] || continue; \ if [ -z "$(DEB_CROSS)" ]; then case "$$f" in *-CR*) continue; esac; fi; \ f2=$$(echo $$f \ - | sed 's/BV/$(BASE_VERSION)/;s/CXX/$(CXX_SONAME)/;s/LGCJ/$(PKG_LIBGCJ_EXT)/;s/GCJ/$(PKG_GCJ_EXT)/;s/LC/$(GCC_SONAME)/;s/-CRB/$(cross_bin_arch)/;s/\.in$$//'); \ + | sed 's/BV/$(BASE_VERSION)/;s/CXX/$(CXX_SONAME)/;s/LC/$(GCC_SONAME)/;s/-CRB/$(cross_bin_arch)/;s/\.in$$//'); \ sed -e 's/@BV@/$(BASE_VERSION)/g' \ -e 's/@CXX@/$(CXX_SONAME)/g' \ - -e 's/@LGCJ@/$(PKG_LIBGCJ_EXT)/g' \ - -e 's/@GCJ@/$(PKG_GCJ_EXT)/g' \ - -e 's/@GCJSO@/$(GCJ_SONAME)/g' \ -e 's/@LC@/$(GCC_SONAME)/g' \ -e 's/@SRC@/$(PKGSOURCE)/g' \ -e 's/@GFDL@/$(if $(filter yes,$(GFDL_INVARIANT_FREE)),#)/g' \ - -e 's/@java_priority@/$(java_priority)/g' \ -e 's/@gcc_priority@/$(subst .,,$(BASE_VERSION))/g' \ -e 's/@TARGET@/$(DEB_TARGET_GNU_TYPE)/g' \ -e 's/@TARGET_QUAL@/$(TARGET_QUAL)/g' \ |