[pkg-wine-party] [PATCH 6/8] Remove MULTIARCH switch, special IA32/AMD64 targets, etc. from debian/rules

[Hilko Bengen]

Time to simplify debian/rules!

- There will only be multiarch-based packages from now on.
- The "configure-ia32" target was only used for building 32-bit wine
  packages on amd64. That is no longer necessary.
- CC, CFLAGS, etc. are the same for 32-bit and 64-bit architectures
---
 debian/rules |   90 ++++++++++------------------------------------------------
 1 file changed, 15 insertions(+), 75 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6f4d9a8..746f757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,58 +25,15 @@ VERSION := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
 
 VERSUFFIX=
 
-# Maybe make this conditional on debian version compiled for, for backports
-# Can be set to:
-#  "n": Install into traditional paths, /usr/lib and /usr/lib32
-#  "p": Install into multiarch paths, /usr/lib/x86_64-linux-gnu and /usr/lib/i486-linux-gnu
-#  "y": Full multiarch, build natively only
-MULTIARCH=y
-
 CC=gcc
 LIBDIR=usr/lib/$(DEB_HOST_MULTIARCH)
 LIBDIRS=$(LIBDIR)
 
-IA32_CC := $(CC)
-IA32_CFLAGS := $(CFLAGS)
-IA32_LDFLAGS := $(LDFLAGS)
-IA32_CPPFLAGS := $(CPPFLAGS)
-IA32_LIBDIR := $(LIBDIR)
-
-# Win64 version requires gcc >= 4.4
-AMD64_CC := $(CC)
-AMD64_CFLAGS := $(CFLAGS)
-AMD64_LDFLAGS := $(LDFLAGS)
-AMD64_CPPFLAGS := $(CPPFLAGS)
-AMD64_LIBDIR := $(LIBDIR)
-
 ifeq ($(DEB_HOST_GNU_CPU),x86_64)
 
-IA32_LIBS := /emul/ia32-linux
-IA32_LDFLAGS += -L$(CURDIR)/lib32
-ifneq (n,$(MULTIARCH))
-IA32_LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
-else
-IA32_LIBDIR := usr/lib32
-IA32_LIBDIR_LINK := $(shell readlink /$(IA32_LIBDIR))
-ifneq (,$(IA32_LIBDIR_LINK))
-IA32_LIBDIR := $(patsubst /%,%,$(IA32_LIBDIR_LINK))
-endif
-endif
-
-ifeq (y,$(MULTIARCH))
 # full multiarch, cannot build 32-bit Wine on amd64
 BUILDS =
 LIBDIRS =
-#TRANSPREFIX = ia32-
-#TRANSSUFFIX = $(VERSUFFIX)
-else
-BUILDS = build32
-LIBDIRS = $(IA32_LIBDIR)
-ifeq (usr/lib/i486-linux-gnu,$(IA32_LIBDIR))
-# need ld.so support for multiarch path
-LIBWINE_DEPS = libc6-i386 (>= 2.9-24)
-endif
-endif
 
 else # !x86_64
 
@@ -84,9 +41,9 @@ BUILDS = build32
 
 endif # x86_64
 
-IA32_WINEDIR = $(IA32_LIBDIR)/wine$(VERSUFFIX)
+IA32_WINEDIR = $(LIBDIR)/wine$(VERSUFFIX)
 IA32_OVERRIDES = LIBSUFFIX="$(VERSUFFIX)" DATASUFFIX="$(VERSUFFIX)" dlldir="/$(IA32_WINEDIR)"
-AMD64_WINEDIR = $(AMD64_LIBDIR)/wine$(VERSUFFIX)
+AMD64_WINEDIR = $(LIBDIR)/wine$(VERSUFFIX)
 AMD64_OVERRIDES = LIBSUFFIX="$(VERSUFFIX)" DATASUFFIX="$(VERSUFFIX)" dlldir="/$(AMD64_WINEDIR)"
 
 LOADERS = wine-kthread wine-pthread wine-preloader
@@ -114,32 +71,19 @@ else
 endif
 	touch control-stamp
 
-configure-ia32: configure-ia32-stamp
-configure-ia32-stamp: control-stamp
-	dh_testdir
-ifneq (,$(IA32_LIBS))
-	mkdir lib32 || true
-	bash debian/ia32.sh $(IA32_LIBS) lib32
-endif
-	touch configure-ia32-stamp
-
 configure-arch32: configure-arch32-stamp
-configure-arch32-stamp: configure-ia32-stamp control-stamp
+configure-arch32-stamp: control-stamp
 	dh_testdir
 ifeq (,$(DEB_SAVEBUILD))
 	mkdir build32 || true
 	cd build32 && \
-	CC="$(IA32_CC)" \
-	CFLAGS="$(IA32_CFLAGS)" \
-	CPPFLAGS="$(IA32_CPPFLAGS)" \
-	LDFLAGS="$(IA32_LDFLAGS)" \
 	../configure --disable-win64 $(CONFIGOPTS) \
 	--prefix=/usr \
-	--sysconfdir=/etc \
-	--bindir=/usr/bin \
-	--libdir=/$(IA32_LIBDIR) \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info
+	--libdir=/$(LIBDIR) \
+	CC="$(CC)" \
+	CFLAGS="$(CFLAGS)" \
+	CPPFLAGS="$(CPPFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
 else
 	mv /tmp/build32 .
 endif
@@ -147,22 +91,18 @@ endif
 	touch configure-arch32-stamp
 
 configure-arch64: configure-arch64-stamp
-configure-arch64-stamp: configure-ia32-stamp control-stamp
+configure-arch64-stamp: control-stamp
 	dh_testdir
 ifeq (,$(DEB_SAVEBUILD))
 	mkdir build64 || true
 	cd build64 && \
-	CC="$(AMD64_CC)" \
-	CFLAGS="$(AMD64_CFLAGS)" \
-	CPPFLAGS="$(AMD64_CPPFLAGS)" \
-	LDFLAGS="$(AMD64_LDFLAGS)" \
 	../configure --enable-win64 $(CONFIGOPTS) \
 	--prefix=/usr \
-	--sysconfdir=/etc \
-	--bindir=/usr/bin \
-	--libdir=/$(AMD64_LIBDIR) \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info
+	--libdir=/$(LIBDIR) \
+	CC="$(CC)" \
+	CFLAGS="$(CFLAGS)" \
+	CPPFLAGS="$(CPPFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
 else
 	mv /tmp/build64 .
 endif
@@ -226,7 +166,7 @@ clean: clean-arch32 clean-arch64
 	dh_testdir
 	dh_testroot
 	bash debian/clean-install.sh "$(VERSUFFIX)"
-	rm -f install-arch-stamp build-indep-stamp configure-ia32-stamp control-stamp
+	rm -f install-arch-stamp build-indep-stamp control-stamp
 	rm -rf lib32 debian/libwine
 	dh_clean
 	# can't rm debian/control here because it'd break dpkg-buildpackage.
-- 
1.7.10.4