[Glibc-bsd-commits] r5342 - trunk/freebsd-libs/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-18 00:18:37 +0000 (Sat, 18 Jan 2014)
New Revision: 5342

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/rules
Log:
Improve detection of FTBFS problems on foreign platforms by passing __FREEBSD_GLUE_USE_EMBEDDED_HEADERS flag to freebsd-glue.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-01-18 00:16:08 UTC (rev 5341)
+++ trunk/freebsd-libs/debian/changelog	2014-01-18 00:18:37 UTC (rev 5342)
@@ -1,3 +1,10 @@
+freebsd-libs (10.0-2) UNRELEASED; urgency=low
+
+  * Improve detection of FTBFS problems on foreign platforms by passing
+    __FREEBSD_GLUE_USE_EMBEDDED_HEADERS flag to freebsd-glue.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 18 Jan 2014 01:18:08 +0100
+
 freebsd-libs (10.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2014-01-18 00:16:08 UTC (rev 5341)
+++ trunk/freebsd-libs/debian/control	2014-01-18 00:18:37 UTC (rev 5342)
@@ -14,7 +14,7 @@
  libexpat-dev [kfreebsd-any],
 # libncurses5-dev: needed by libalias
  libncurses5-dev [kfreebsd-any],
- freebsd-glue (>= 0.2.5~),
+ freebsd-glue (>= 0.2.17~),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-libs/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-libs/
 Standards-Version: 3.9.4

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2014-01-18 00:16:08 UTC (rev 5341)
+++ trunk/freebsd-libs/debian/rules	2014-01-18 00:18:37 UTC (rev 5342)
@@ -45,10 +45,18 @@
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = \
+CFLAGS += -I$(CURDIR)/debian/local/include
+PMAKE_COMMON = \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
-	COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 \
+	NO_WERROR=1 NOGCCERROR=1 \
         NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) make
+PMAKE = \
+	CFLAGS="$(CFLAGS)" \
+	$(PMAKE_COMMON)
+PMAKE_FOREIGN = \
+	CFLAGS="$(CFLAGS) -D__FREEBSD_GLUE_USE_EMBEDDED_HEADERS" \
+	$(PMAKE_COMMON)
+
 kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 get-orig-source:
@@ -146,12 +154,12 @@
 
 build-elf: build-elf-stamp
 build-elf-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libelf SHLIBDIR=./
+	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libelf SHLIBDIR=./
 	touch $@
 
 build-dwarf: build-dwarf-stamp
 build-dwarf-stamp: build-elf
-	$(PMAKE) -C $(CURDIR)/lib/libdwarf SHLIBDIR=./
+	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libdwarf SHLIBDIR=./
 	touch $@
 
 build-memstat: build-memstat-stamp
@@ -161,7 +169,7 @@
 
 build-sbuf: build-sbuf-stamp
 build-sbuf-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libsbuf SHLIBDIR=./
+	$(PMAKE_FOREIGN) -C $(CURDIR)/lib/libsbuf SHLIBDIR=./
 	touch $@
 
 build-usbhid: build-usbhid-stamp