[pcsx2] 01/01: Fix crossbuilding issues.

[Miguel A. Colón Vélez]

This is an automated email from the git hooks/post-receive script.

micove-guest pushed a commit to branch master
in repository pcsx2.

commit 9cbd08cac1f11ed4c276d305e56812332e3e242b
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Wed Dec 24 10:47:28 2014 -0500

    Fix crossbuilding issues.
    
    We want:
    ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
            dh_shlibdeps
    else
            dh_shlibdeps -l/lib/$(DEB_HOST_MULTIARCH)/:/usr/lib/$(DEB_HOST_MULTIARCH)/
    endif
    .
    The one liner should be safe.
---
 debian/rules | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 5cdf6ad..7769c72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 LDFLAGS += -Wl,--as-needed
 
@@ -40,6 +40,12 @@ override_dh_installdocs:
 # Silence lintian warnings about *-has-useless-call-to-ldconfig
 override_dh_makeshlibs:
 
+override_dh_shlibdeps:
+	# Wehn doing dpkg-buildpackage -ai386 don't depend on lib32stdc++6,
+	# lib32gcc1, and libc6-i386 since they don't exist in i386. Correctly pick
+	# the multiarch variant instead of the multilib variant.
+	dh_shlibdeps -l/lib/$(DEB_HOST_MULTIARCH)/:/usr/lib/$(DEB_HOST_MULTIARCH)/
+
 override_dh_strip:
 	dh_strip --dbg-package=pcsx2-dbg
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/pcsx2.git