diff --git a/debian/control.m4 b/debian/control.m4 index 4471b69..aef5d83 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -95,7 +95,7 @@ Package: gcc-snapshot`'TS Architecture: any Section: devel Priority: extra -Depends: binutils`'TS (>= ${binutils:Version}), ${dep:libcbiarchdev}, ${dep:libcdev}, ${dep:libunwinddev}, ${snap:depends}, ${shlibs:Depends}, ${dep:ecj}, python, ${misc:Depends} +Depends: binutils-`'DEB_TARGET_ALIAS (>= ${binutils:Version}), ${dep:libcbiarchdev}, ${dep:libcdev}, ${dep:libunwinddev}, ${snap:depends}, ${shlibs:Depends}, ${dep:ecj}, python, ${misc:Depends} Recommends: ${snap:recommends} Suggests: ${dep:gold} Provides: c++-compiler`'TS`'ifdef(`TARGET',`',`, c++abi2-dev') @@ -214,6 +214,7 @@ Section: libs Priority: PRI(optional) Depends: ${misc:Depends} Breaks: gcc-4.6 (<< 4.6.1-8~) +Conflicts: gnat`'PV-base`'TSR BUILT_USING`'dnl Description: GNU Ada compiler (common files) GNAT is a compiler for the Ada programming language. It produces optimized @@ -739,7 +740,7 @@ Architecture: any Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: cpp`'PV`'TS (= ${gcc:Version}),ifenabled(`gccbase',` BASEDEP,') - binutils`'TS (>= ${binutils:Version}), + binutils-`'DEB_TARGET_ALIAS (>= ${binutils:Version}), ${dep:libgccdev}, ${shlibs:Depends}, ${misc:Depends} Recommends: ${dep:libcdev} Replaces: gccgo-4.9 (<< ${gcc:Version}) @@ -759,8 +760,7 @@ ifenabled(`libvtv',`',` libdbgdep(cilkrts`'CILKRTS_SO-dbg,), libdbgdep(quadmath`'QMATH_SO-dbg,), ${dep:libcloog} Provides: c-compiler`'TS -ifdef(`TARGET',`Conflicts: gcc-multilib -')`'dnl +Conflicts: gcc`'PV`'TSR ifdef(`TARGET',`, gcc-multilib') BUILT_USING`'dnl Description: GNU C compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -775,6 +775,7 @@ Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarchdev}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: gcc`'PV-multilib`'TSR BUILT_USING`'dnl Description: GNU C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -789,6 +790,7 @@ Architecture: any Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), GMP_BUILD_DEP ${shlibs:Depends}, ${misc:Depends} +Conflicts: gcc`'PV-plugin-dev`'TSR BUILT_USING`'dnl Description: Files for GNU GCC plugin development. This package contains (header) files for GNU GCC plugin development. It @@ -817,6 +819,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} Suggests: gcc`'PV-locales (>= ${gcc:SoftVersion}) Replaces: gccgo-4.9 (<< ${gcc:Version}) +Conflicts: cpp`'PV`'TSR BUILT_USING`'dnl Description: GNU C preprocessor A macro processor that is used automatically by the GNU C compiler @@ -866,6 +869,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: ${dep:crossbase}, gcc`'PV`'TS (= ${gcc:Version}), libdevdep(stdc++`'PV-dev,,=), ${shlibs:Depends}, ${misc:Depends} Provides: c++-compiler`'TS`'ifdef(`TARGET)',`',`, c++abi2-dev') Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libdbgdep(stdc++CXX_SO`'PV-dbg,) +Conflicts: g++`'PV`'TSR BUILT_USING`'dnl Description: GNU C++ compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. @@ -881,6 +885,7 @@ Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, g++`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libcxxbiarchdev}, ${shlibs:Depends}, ${misc:Depends} Suggests: ${dep:libcxxbiarchdbg} +Conflicts: g++`'PV-multilib`'TSR BUILT_USING`'dnl Description: GNU C++ compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. @@ -2979,6 +2984,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libdevdep(objc`'PV-dev,,=), ${misc:Depends} Suggests: ${gobjcxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}) Provides: objc++-compiler`'TS +Conflicts: gobjc++`'PV`'TSR BUILT_USING`'dnl Description: GNU Objective-C++ compiler This is the GNU Objective-C++ compiler, which compiles @@ -2992,6 +2998,7 @@ Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gobjc++`'PV`'TS (= ${gcc:Version}), g++`'PV-multilib`'TS (= ${gcc:Version}), gobjc`'PV-multilib`'TS (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} +Conflicts: gobjc++`'PV-multilib`'TSR BUILT_USING`'dnl Description: GNU Objective-C++ compiler (multilib files) This is the GNU Objective-C++ compiler, which compiles Objective-C++ on @@ -3010,7 +3017,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libdevdep(objc`'PV-dev,,=), ${misc:Depends} Suggests: ${gobjc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libdbgdep(objc`'OBJC_SO-dbg,) Provides: objc-compiler`'TS -ifdef(`__sparc__',`Conflicts: gcc`'PV-sparc64', `dnl') +Conflicts: gobjc`'PV`'TSR ifdef(`__sparc__',`, gcc`'PV-sparc64', `') BUILT_USING`'dnl Description: GNU Objective-C compiler This is the GNU Objective-C compiler, which compiles @@ -3023,6 +3030,7 @@ Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libobjcbiarchdev}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: gobjc`'PV-multilib`'TSR BUILT_USING`'dnl Description: GNU Objective-C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU Objective-C compiler, which compiles Objective-C on platforms @@ -3289,6 +3297,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: ${dep:crossbase}, gcc`'PV`'TS (= ${gcc:Version}), libdevdep(gfortran`'PV-dev,,=), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} Provides: fortran95-compiler, ${fortran:mod-version} Suggests: ${gfortran:multilib}, gfortran`'PV-doc, libdbgdep(gfortran`'FORTRAN_SO-dbg,) +Conflicts: gfortran`'PV`'TSR BUILT_USING`'dnl Description: GNU Fortran compiler This is the GNU Fortran compiler, which compiles @@ -3301,6 +3310,7 @@ Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS) Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gfortran`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libgfortranbiarchdev}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: gfortran`'PV-multilib`'TSR BUILT_USING`'dnl Description: GNU Fortran compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU Fortran compiler, which compiles Fortran on platforms @@ -3596,6 +3606,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ifdef(`STANDALONEGO',,`gcc`'PV`'TS (= ${gcc:Version}), ')libdep(go`'GO_SO,), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} Provides: go-compiler Suggests: ${go:multilib}, gccgo`'PV-doc, libdbgdep(go`'GO_SO-dbg,) +Conflicts: gccgo`'PV`'TSR BUILT_USING`'dnl Description: GNU Go compiler This is the GNU Go compiler, which compiles Go on platforms supported @@ -3608,6 +3619,7 @@ Section: devel Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gccgo`'PV`'TS (= ${gcc:Version}), ifdef(`STANDALONEGO',,`gcc`'PV-multilib`'TS (= ${gcc:Version}), ')${dep:libgobiarch}, ${shlibs:Depends}, ${misc:Depends} Suggests: ${dep:libgobiarchdbg} +Conflicts: gccgo`'PV-multilib`'TSR BUILT_USING`'dnl Description: GNU Go compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') This is the GNU Go compiler, which compiles Go on platforms supported @@ -3763,6 +3775,7 @@ Architecture: any Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${dep:gcj}, ${dep:gcjcross}, ${dep:libcdev}, ${dep:ecj}, ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info, ${misc:Depends} Recommends: libecj-java-gcj +Conflicts: gcj`'PV`'TSR BUILT_USING`'dnl Description: GCJ byte code and native compiler for Java(TM) GCJ is a front end to the GCC compiler which can natively compile both @@ -3793,7 +3806,7 @@ Depends: BASEDEP, ${dep:gcj}, ${dep:libcdev}, gcj`'PV`'TS (= ${gcj:Version}), gc Recommends: libecj-java-gcj Suggests: gcj`'PV-source (>= ${gcj:SoftVersion}), libdbgdep(gcj`'GCJ_SO-dbg,) Provides: java-compiler, java-sdk, java2-sdk, java5-sdk -Conflicts: gcj-4.4, cpp-4.1 (<< 4.1.1), gcc-4.1 (<< 4.1.1) +Conflicts: gcj-4.4, cpp-4.1 (<< 4.1.1), gcc-4.1 (<< 4.1.1), gcj`'PV-jdk`'TSR Replaces: libgcj11 (<< 4.5-20100101-1) BUILT_USING`'dnl Description: GCJ and Classpath development tools for Java(TM) @@ -3812,6 +3825,7 @@ Architecture: any Depends: BASEDEP, gcj`'PV-jre-lib`'TS (>= ${gcj:SoftVersion}), libdep(gcj`'LIBGCJ_EXT,,=,${gcj:Version}), ${dep:prctl}, ${shlibs:Depends}, ${misc:Depends} Suggests: fastjar, gcj`'PV-jdk`'TS (= ${gcj:Version}), libdep(gcj`'LIBGCJ_EXT-awt,,=,${gcj:Version}) Provides: java5-runtime-headless, java2-runtime-headless, java1-runtime-headless, java-runtime-headless +Conflicts: gcj`'PV-jre-headless`'TSR BUILT_USING`'dnl Description: Java runtime environment using GIJ/Classpath (headless version) GIJ is a Java bytecode interpreter, not limited to interpreting bytecode. @@ -3829,6 +3843,7 @@ Architecture: any Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, gcj`'PV-jre-headless`'TS (= ${gcj:Version}), libdep(gcj`'LIBGCJ_EXT-awt,,=,${gcj:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: java5-runtime, java2-runtime, java1-runtime, java-runtime +Conflicts: gcj`'PV-jre`'TSR BUILT_USING`'dnl Description: Java runtime environment using GIJ/Classpath GIJ is a Java bytecode interpreter, not limited to interpreting bytecode. @@ -3863,6 +3878,7 @@ Section: java Architecture: all Priority: PRI(optional) Depends: SOFTBASEDEP, libdep(gcj`'LIBGCJ_EXT,,>=,${gcj:SoftVersion}), ${misc:Depends} +Conflicts: gcj`'PV-jre-lib`'TSR BUILT_USING`'dnl Description: Java runtime library for use with gcj (jar files) This is the jar file that goes along with the gcj front end to gcc. @@ -4542,7 +4558,7 @@ Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2), # g-base 4.6.4-2, 4.9-20140330-1 contain debian_packaging.mk by mistake. # Newer versions of gnat and dh-ada-library will not provide these files. Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, - gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6, gnat-4.7, gnat-4.8 + gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6, gnat-4.7, gnat-4.8, gnat`'-GNAT_V`'TSR # These other packages will continue to provide /usr/bin/gnatmake and # other files. BUILT_USING`'dnl @@ -4559,6 +4575,7 @@ Priority: extra ifdef(`MULTIARCH', `Pre-Depends: multiarch-support ')`'dnl Depends: BASEDEP, gnat`'-GNAT_V`'TS (= ${gnat:Version}), ${misc:Depends} +Conflicts: gnat`'-GNAT_V-sjlj`'TSR BUILT_USING`'dnl Description: GNU Ada compiler (setjump/longjump runtime library) GNAT is a compiler for the Ada programming language. It produces optimized @@ -4774,6 +4791,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: SOFTBASEDEP, g++`'PV`'TS (>= ${gcc:SoftVersion}), ${dep:gdccross}, ${dep:phobosdev}, ${shlibs:Depends}, ${misc:Depends} Provides: gdc, d-compiler, d-v2-compiler Replaces: gdc (<< 4.4.6-5) +Conflicts: gdc`'PV`'TSR BUILT_USING`'dnl Description: GNU D compiler (version 2), based on the GCC backend This is the GNU D compiler, which compiles D on platforms supported by gcc. diff --git a/debian/patches/cross-ma-install-location.diff b/debian/patches/cross-ma-install-location.diff index 640b98b..7a7abc0 100644 --- a/debian/patches/cross-ma-install-location.diff +++ b/debian/patches/cross-ma-install-location.diff @@ -400,3 +400,24 @@ Index: b/src/libcilkrts/configure.ac multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in .) ;; # Avoid trailing /. +Index: gcc-4.9-4.9.2/src/libphobos/configure.ac +=================================================================== +--- gcc-4.9-4.9.2.orig/src/libphobos/configure.ac ++++ gcc-4.9-4.9.2/src/libphobos/configure.ac +@@ -247,14 +247,8 @@ AC_SUBST(gdc_include_dir) + AC_ARG_WITH([cross-host], + AC_HELP_STRING([--with-cross-host=HOST], + [configuring with a cross compiler])) +-if test -n "$with_cross_host" && +- test x"$with_cross_host" != x"no"; then +- phobos_toolexecdir='${exec_prefix}/${host_alias}' +- phobos_toolexeclibdir='${toolexecdir}/lib' +-else +- phobos_toolexecdir='${libdir}/gcc/${host_alias}' +- phobos_toolexeclibdir='${libdir}' +-fi ++phobos_toolexecdir='${libdir}/gcc/${host_alias}' ++phobos_toolexeclibdir='${libdir}' + # The norm would be to use $GDC -print-multi-os-directory, but + # that would require modifying config-ml.in + multi_os_directory=`$CC -print-multi-os-directory` diff --git a/debian/rules.conf b/debian/rules.conf index cded212..2384c7d 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -584,6 +584,7 @@ ctrl_flags = \ -DSRCNAME=$(PKGSOURCE) \ -D__$(DEB_TARGET_GNU_CPU)__ \ -DARCH=$(DEB_TARGET_ARCH) \ + -DDEB_TARGET_ALIAS=$(DEB_TARGET_ALIAS) \ -DDIST=$(distribution) ctrl_flags += \ @@ -615,6 +616,7 @@ ctrl_flags += \ -DNEON_ARCHS="$(neon_archs)" \ -DTP=$(TP) \ -DTS=$(TS) \ + -DTSR=$(TSR) \ -DLS=$(LS) \ -DAQ=$(AQ) diff --git a/debian/rules.defs b/debian/rules.defs index 6f7007c..8942447 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -200,6 +200,7 @@ ifeq ($(DEB_CROSS),yes) TARGET := $(DEB_TARGET_ARCH) TP := $(subst _,-,$(DEB_TARGET_GNU_TYPE))- TS := -$(subst _,-,$(DEB_TARGET_ALIAS)) + TSR := -$(subst _,-,$(TARGET)) LS := -$(subst _,-,$(DEB_TARGET_ARCH))-cross AQ := @@ -209,7 +210,10 @@ ifeq ($(DEB_CROSS),yes) ifeq ($(with_deps_on_target_arch_pkgs),yes) LS := + TS := -$(subst _,-,$(TARGET)) + TSR := -$(subst _,-,$(DEB_TARGET_ALIAS)) LS_biarch := + cross_bin_arch := -$(subst _,-,$(TARGET)) cross_lib_arch := AQ := :$(TARGET) endif