diff -Nru libbsd-0.3.0/debian/changelog libbsd-0.3.0/debian/changelog --- libbsd-0.3.0/debian/changelog 2012-02-29 17:57:59.000000000 +0100 +++ libbsd-0.3.0/debian/changelog 2012-03-23 14:00:26.000000000 +0100 @@ -1,3 +1,9 @@ +libbsd (0.3.0-1build2) precise; urgency=low + + * Fixed cross building - LP: #963060 + + -- Marcin Juszkiewicz Fri, 23 Mar 2012 13:55:59 +0100 + libbsd (0.3.0-1build1) precise; urgency=low * No-change rebuild against current pkgbinarymangler to fix broken diff -Nru libbsd-0.3.0/debian/control libbsd-0.3.0/debian/control --- libbsd-0.3.0/debian/control 2011-06-02 20:27:56.000000000 +0200 +++ libbsd-0.3.0/debian/control 2012-03-23 13:55:54.000000000 +0100 @@ -1,7 +1,8 @@ Source: libbsd Priority: optional Section: libs -Maintainer: Debian GNU/kFreeBSD +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNU/kFreeBSD Uploaders: Hector Garcia , Guillem Jover , Aurelien Jarno Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/libbsd/ diff -Nru libbsd-0.3.0/debian/patches/do-not-hardcode-gcc libbsd-0.3.0/debian/patches/do-not-hardcode-gcc --- libbsd-0.3.0/debian/patches/do-not-hardcode-gcc 1970-01-01 01:00:00.000000000 +0100 +++ libbsd-0.3.0/debian/patches/do-not-hardcode-gcc 2012-03-23 14:00:26.000000000 +0100 @@ -0,0 +1,15 @@ +Description: Do not hardcode gcc as compiler +Author: Marcin Juszkiewicz +Bug-Ubuntu: https://launchpad.net/bugs/963060 +Last-Update: 2012-03-23 + +--- libbsd-0.3.0.orig/Makefile ++++ libbsd-0.3.0/Makefile +@@ -119,7 +119,6 @@ LIB_STATIC_OBJS := $(LIB_SRCS:%.c=%.o) + LIB_SHARED_OBJS := $(LIB_SRCS:%.c=%.lo) + + AR = ar +-CC = gcc + CCLD = $(CC) + + # Set default values for user variables diff -Nru libbsd-0.3.0/debian/patches/series libbsd-0.3.0/debian/patches/series --- libbsd-0.3.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libbsd-0.3.0/debian/patches/series 2012-03-23 13:56:33.000000000 +0100 @@ -0,0 +1 @@ +do-not-hardcode-gcc diff -Nru libbsd-0.3.0/debian/rules libbsd-0.3.0/debian/rules --- libbsd-0.3.0/debian/rules 2011-06-02 20:21:58.000000000 +0200 +++ libbsd-0.3.0/debian/rules 2012-03-23 13:55:07.000000000 +0100 @@ -7,6 +7,7 @@ CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS) LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) lib := libbsd0 libdbg := $(lib)-dbg @@ -18,7 +19,7 @@ build-arch: dh_testdir - $(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + $(MAKE) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(DEB_HOST_GNU_TYPE)-gcc" build: build-indep build-arch