[Glibc-bsd-commits] r5295 - trunk/freebsd-glue/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-02 19:16:17 +0000 (Thu, 02 Jan 2014)
New Revision: 5295

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/control
   trunk/freebsd-glue/debian/rules
Log:
Explicitly request gcc-4.8 as sbuild can't handle build dependencies properly (sigh).

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2014-01-02 18:56:11 UTC (rev 5294)
+++ trunk/freebsd-glue/debian/changelog	2014-01-02 19:16:17 UTC (rev 5295)
@@ -1,3 +1,10 @@
+freebsd-glue (0.2.13) unstable; urgency=low
+
+  * Explicitly request gcc-4.8 as sbuild can't handle build dependencies
+    properly (sigh).
+
+ -- Robert Millan <rmh at debian.org>  Thu, 02 Jan 2014 20:15:04 +0100
+
 freebsd-glue (0.2.12) unstable; urgency=low
 
   * Invoke FreeBSD make explicitly as fmake.

Modified: trunk/freebsd-glue/debian/control
===================================================================
--- trunk/freebsd-glue/debian/control	2014-01-02 18:56:11 UTC (rev 5294)
+++ trunk/freebsd-glue/debian/control	2014-01-02 19:16:17 UTC (rev 5295)
@@ -10,7 +10,7 @@
  libdb-dev,
  zlib1g-dev,
 # For -Wno-error=maybe-uninitialized
- gcc (>= 4:4.8) | gcc-4.8,
+ gcc-4.8,
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-glue/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-glue/
 Standards-Version: 3.9.3

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2014-01-02 18:56:11 UTC (rev 5294)
+++ trunk/freebsd-glue/debian/rules	2014-01-02 19:16:17 UTC (rev 5295)
@@ -18,6 +18,7 @@
 	CFLAGS="$(CFLAGS) -O2" \
 	DESTDIR="$(DESTDIR)" \
 	fmake \
+	CC=gcc-4.8 \
 	$(NULL)
 PMAKE_UDEB := \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
@@ -25,6 +26,7 @@
 	CFLAGS="$(CFLAGS) -Os" \
 	DESTDIR="$(DESTDIR)-udeb" \
 	fmake \
+	CC=gcc-4.8 \
 	RESCUE=yes \
 	$(NULL)