[pkg-wine-party] [PATCH 4/8] Simplify gcc build dependencies: Build with gcc 4.4 or newer (Closes: #654741)

Hilko Bengen bengen at debian.org
Sat May 12 10:54:12 UTC 2012


Squeeze was released with gcc 4.4 as the default C compiler, squeeze
backports should still be possible.

gcc-4.1 (<< 4.1.2) was released before lenny, there is no need to
support backports that far.
---
 debian/control.in |    5 ++---
 debian/rules      |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index cdec1ea..addb887 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,13 +24,12 @@ Build-Depends: debhelper (>= 5), flex, bison,
  libcapi20-dev (>= 1:3.3.0.20041024-2) [i386 amd64 powerpc sparc],
  libhal-dev, libdbus-1-dev | dbus-1-dev, libgphoto2-2-dev, liblcms1-dev, libldap2-dev,
  libssl-dev, libgnutls-dev, libxml2-dev, libxslt1-dev, unixodbc-dev, prelink [i386 amd64],
- dctrl-tools | grep-dctrl, lzma, sharutils, gcc-4.4,
- gcc-4.4-multilib [amd64 kfreebsd-amd64] | gcc-4.1 (<< 4.1.2) [amd64 kfreebsd-amd64],
+ dctrl-tools | grep-dctrl, lzma, sharutils,
+ gcc (>= 4.4), gcc-multilib (>= 4.4) [amd64 kfreebsd-amd64],
  ia32-libs (>= 1.19) [amd64 kfreebsd-amd64],
  ia32-libs-dev [amd64 kfreebsd-amd64] | ia32-libs (<< 20100908) [amd64 kfreebsd-amd64],
  lib32ncurses5-dev [amd64 kfreebsd-amd64], lib32asound2-dev [amd64],
  lib32z1-dev [amd64 kfreebsd-amd64],
- gcc-multilib,
 Standards-Version: 3.9.2
 Homepage: http://www.winehq.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-wine/wine.git
diff --git a/debian/rules b/debian/rules
index a129dc6..24fc58a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ MULTIARCH=n
 # Win64 is not ready yet
 ENABLE_WIN64=n
 
-CC=gcc-4.4
+CC=gcc
 ifneq (n,$(MULTIARCH))
 LIBDIR=usr/lib/$(DEB_HOST_GNU_TYPE)
 else
@@ -52,8 +52,7 @@ IA32_LDFLAGS := $(LDFLAGS)
 IA32_CPPFLAGS := $(CPPFLAGS)
 IA32_LIBDIR := $(LIBDIR)
 
-# Win64 version requires gcc >= 4.4
-AMD64_CC := gcc-4.4
+AMD64_CC := $(CC)
 AMD64_CFLAGS := $(CFLAGS)
 AMD64_CPPFLAGS := $(CPPFLAGS)
 AMD64_LDFLAGS := $(LDFLAGS)
-- 
1.7.10




More information about the pkg-wine-party mailing list