[Pkg-xen-changes] [xen] 02/09: merge patched-feature/multiarch into feature/multiarch

[Bastian Blank]

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

waldi pushed a commit to branch develop
in repository xen.

commit 23a0992005d99a969b1341421fc7032d1f66e134
Merge: c88ce74 93bead8
Author: Bastian Blank <waldi at debian.org>
Date:   Tue Aug 26 17:17:44 2014 +0200

    merge patched-feature/multiarch into feature/multiarch

 config/StdGNU.mk                                   |  6 ++--
 debian/.git-dpm                                    |  4 +--
 ...0-Set-library-path-to-multi-arch-location.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 825e495,0000000..0c1e11f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 67c0cb5a0a066779caa8c56831ecc896cadbb7cd
- 67c0cb5a0a066779caa8c56831ecc896cadbb7cd
++93bead88e51dce30e9c5ffb8e899f4f0f6897c64
++93bead88e51dce30e9c5ffb8e899f4f0f6897c64
 +960b45d65509eb156ccdac8f50a31ffa28e963a1
 +960b45d65509eb156ccdac8f50a31ffa28e963a1
 +xen_4.4.0.orig.tar.xz
 +39aaa0627cd93920be8d12e4c63042c23d653c8c
 +3767352
diff --cc debian/patches/0040-Set-library-path-to-multi-arch-location.patch
index 0000000,0000000..3846913
new file mode 100644
--- /dev/null
+++ b/debian/patches/0040-Set-library-path-to-multi-arch-location.patch
@@@ -1,0 -1,0 +1,36 @@@
++From 93bead88e51dce30e9c5ffb8e899f4f0f6897c64 Mon Sep 17 00:00:00 2001
++From: Bastian Blank <waldi at debian.org>
++Date: Tue, 26 Aug 2014 17:17:34 +0200
++Subject: Set library path to multi-arch location
++
++---
++ config/StdGNU.mk | 6 ++++--
++ 1 file changed, 4 insertions(+), 2 deletions(-)
++
++diff --git a/config/StdGNU.mk b/config/StdGNU.mk
++index b566b5c..0f1776d 100644
++--- a/config/StdGNU.mk
+++++ b/config/StdGNU.mk
++@@ -1,3 +1,5 @@
+++include /usr/share/dpkg/architecture.mk
+++
++ AS         = $(CROSS_COMPILE)as
++ LD         = $(CROSS_COMPILE)ld
++ ifeq ($(clang),y)
++@@ -30,14 +32,14 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
++ PREFIX ?= /usr
++ BINDIR = $(PREFIX)/bin
++ INCLUDEDIR = $(PREFIX)/include
++-LIBDIR = $(PREFIX)/lib
+++LIBDIR = $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
++ SHAREDIR = $(PREFIX)/share
++ MANDIR = $(SHAREDIR)/man
++ MAN1DIR = $(MANDIR)/man1
++ MAN8DIR = $(MANDIR)/man8
++ SBINDIR = $(PREFIX)/sbin
++ 
++-PRIVATE_PREFIX = $(LIBDIR)/xen-$(XEN_VERSION)
+++PRIVATE_PREFIX = $(PREFIX)/lib/xen-$(XEN_VERSION)
++ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
++ PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
++ 
diff --cc debian/patches/series
index 7485b58,0000000..2fbad3a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,39 -1,0 +1,40 @@@
 +0001-version.patch
 +0002-config-prefix.diff.patch
 +0003-tools-libfsimage-abiname.diff.patch
 +0004-tools-libxc-abiname.diff.patch
 +0005-tools-libxl-abiname.diff.patch
 +0006-tools-xenstat-abiname.diff.patch
 +0007-tools-rpath.diff.patch
 +0008-tools-blktap2-prefix.diff.patch
 +0009-tools-console-prefix.diff.patch
 +0010-tools-libfsimage-prefix.diff.patch
 +0011-tools-libfsimage-rpath.diff.patch
 +0012-tools-libxl-prefix.diff.patch
 +0013-tools-misc-prefix.diff.patch
 +0014-tools-misc-rpath.diff.patch
 +0015-tools-pygrub-prefix.diff.patch
 +0016-tools-python-prefix.diff.patch
 +0017-tools-python-rpath.diff.patch
 +0018-tools-xcutils-rpath.diff.patch
 +0019-tools-xenmon-prefix.diff.patch
 +0020-tools-xenmon-rpath.diff.patch
 +0021-tools-xenpaging-prefix.diff.patch
 +0022-tools-xenstat-prefix.diff.patch
 +0023-tools-xenstat-rpath.diff.patch
 +0024-tools-xenstore-prefix.diff.patch
 +0025-tools-xenstore-rpath.diff.patch
 +0026-tools-xentrace-prefix.diff.patch
 +0027-tools-xentrace-rpath.diff.patch
 +0028-tools-python-xen-relative-path.diff.patch
 +0029-tools-misc-xend-startup.diff.patch
 +0030-tools-disable.diff.patch
 +0031-tools-examples-xend-disable-network.diff.patch
 +0032-tools-examples-xend-disable-relocation.diff.patch
 +0033-tools-pygrub-remove-static-solaris-support.patch
 +0034-tools-include-install.diff.patch
 +0035-tools-xenmon-install.diff.patch
 +0036-tools-hotplug-udevrules.diff.patch
 +0037-tools-python-shebang.diff.patch
 +0038-tools-ocaml-fix-build.diff.patch
 +0039-tools-xenstore-compatibility.diff.patch
++0040-Set-library-path-to-multi-arch-location.patch

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