diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.m4 | 2 | ||||
| -rw-r--r-- | debian/rules.conf | 9 |
4 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 75b5121..0bab9b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ gcc-4.8 (4.8.1-5) UNRELEASED; urgency=low * Fix documentation builds with texinfo-5.1. * Update the ARM libsanitizer backport from the 4.8 Linaro branch. * libphobos-4.8-dev provides libphobos-dev (Peter de Wachter). + * The gdc cross compiler doesn't depend on libphobos-4.8-dev. -- Matthias Klose <doko@debian.org> Sun, 23 Jun 2013 21:30:32 +0200 diff --git a/debian/control b/debian/control index af75b82..99b301e 100644 --- a/debian/control +++ b/debian/control @@ -1787,7 +1787,7 @@ Description: GNU Standard C++ Library v3 (documentation files) Package: gdc-4.8 Architecture: any Priority: optional -Depends: gcc-4.8-base (>= ${gcc:SoftVersion}), g++-4.8 (>= ${gcc:SoftVersion}), ${dep:gdccross}, libphobos-4.8-dev (= ${gcc:Version}) [!avr !arm64 !hppa !ia64 !m68k !mips !mipsel !powerpc !powerpcspe !ppc64 !s390 !s390x !sh4 !sparc !sparc64 !alpha !hurd-alpha !arm !armel !armhf !hurd-amd64 !hurd-i386 !hurd-alpha !kfreebsd-amd64 !kfreebsd-i386 !kfreebsd-alpha], ${shlibs:Depends}, ${misc:Depends} +Depends: gcc-4.8-base (>= ${gcc:SoftVersion}), g++-4.8 (>= ${gcc:SoftVersion}), ${dep:gdccross}, ${dep:phobosdev}, ${shlibs:Depends}, ${misc:Depends} Provides: gdc, d-compiler, d-v2-compiler Replaces: gdc (<< 4.4.6-5) Description: GNU D compiler (version 2), based on the GCC backend diff --git a/debian/control.m4 b/debian/control.m4 index 36c5e7b..efa8beb 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -4053,7 +4053,7 @@ ifenabled(`d ',` Package: gdc`'PV`'TS Architecture: any Priority: ifdef(`TARGET',`extra',`PRI(optional)') -Depends: SOFTBASEDEP, g++`'PV`'TS (>= ${gcc:SoftVersion}), ${dep:gdccross}, libdevdep(phobos`'PV-dev,,=) [libphobos_no_archs], ${shlibs:Depends}, ${misc:Depends} +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) BUILT_USING`'dnl diff --git a/debian/rules.conf b/debian/rules.conf index 2d43fc0..65f8f7d 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -1048,6 +1048,15 @@ ifeq ($(DEB_CROSS),yes) echo 'dep:gdccross=gdc$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ >> debian/substvars.local.tmp endif +ifeq ($(with_libphobos),yes) + ifeq ($(DEB_CROSS),yes) + echo 'dep:gdccross=gdc$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \ + >> debian/substvars.local.tmp + else + echo 'dep:phobosdev=libphobos$(pkg_ver)-dev (>= $(DEB_GCC_SOFT_VERSION))' \ + >> 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 |