commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[hurd] 01/01: rules: Fix cross-build of libdde-linux26


From: Samuel Thibault
Subject: [hurd] 01/01: rules: Fix cross-build of libdde-linux26
Date: Sun, 28 Feb 2016 11:33:53 +0000

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

sthibault pushed a commit to branch master
in repository hurd.

commit 0707e46fc6713060dc00d1f46618a6dc2c558c7b
Author: Samuel Thibault <address@hidden>
Date:   Sun Feb 28 12:29:37 2016 +0100

    rules: Fix cross-build of libdde-linux26
---
 debian/changelog | 1 +
 debian/rules     | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 08c88b2..6a9ebe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hurd (1:0.7.git20160223-3) UNRELEASED; urgency=medium
 
   * control: Fix spurious build of hurd-headers-dev and libihash-dev in 
unstaged
     builds.
+  * rules: Fix cross-build of libdde-linux26.
 
  -- Samuel Thibault <address@hidden>  Sun, 28 Feb 2016 11:28:16 +0000
 
diff --git a/debian/rules b/debian/rules
index 9f020e0..4e1bcdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,12 @@ INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in))
 
 BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= 
$${source:Version}), ' -W libc0.3-dev libparted-dev zlib1g-dev libbz2-dev 
uuid-dev libblkid-dev)
 
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+       CC=gcc
+else
+       CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 %:
        dh $@ -Bbuild-deb --with autotools_dev,autoreconf --parallel
 
@@ -75,7 +81,7 @@ else
        dh_auto_build -Bbuild-deb
        cd build-deb/doc && make && makeinfo --html --split=chapter 
../../doc/hurd.texi
   ifeq (,$(filter stage3,$(DEB_BUILD_PROFILES)))
-       $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS=
+       $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS= CC=$(CC)
   endif
 endif
 

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]