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

Bug#957230: freebsd-buildutils: ftbfs with GCC-10



I am uploading a NMU to fix this. The debdiff is attached.
diff -Nru freebsd-glue-0.2.22/debian/changelog freebsd-glue-0.2.22+nmu1/debian/changelog
--- freebsd-glue-0.2.22/debian/changelog	2016-03-05 16:44:54.000000000 +0100
+++ freebsd-glue-0.2.22+nmu1/debian/changelog	2023-08-07 01:20:16.000000000 +0200
@@ -1,3 +1,12 @@
+freebsd-glue (0.2.22+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build with gcc-9. (Closes: #964661)
+  * Include #pragma once in md5.h for freebsd-buildutils.
+  * Temporarily include lorder/tsort workaround. (Closes: #964661)
+
+ -- Bastian Germann <bage@debian.org>  Mon, 07 Aug 2023 01:20:16 +0200
+
 freebsd-glue (0.2.22) unstable; urgency=medium
 
   * Actually use the proper build architecture compiler
diff -Nru freebsd-glue-0.2.22/debian/control freebsd-glue-0.2.22+nmu1/debian/control
--- freebsd-glue-0.2.22/debian/control	2016-03-05 02:08:01.000000000 +0100
+++ freebsd-glue-0.2.22+nmu1/debian/control	2023-08-07 01:18:20.000000000 +0200
@@ -7,6 +7,7 @@
  Steven Chamberlain <steven@pyro.eu.org>,
 Build-Depends:
  debhelper (>= 8.0),
+ gcc-9,
  kfreebsd-kernel-headers (>= 10.0~3) [kfreebsd-any],
  freebsd-mk,
  bmake,
diff -Nru freebsd-glue-0.2.22/debian/lorder freebsd-glue-0.2.22+nmu1/debian/lorder
--- freebsd-glue-0.2.22/debian/lorder	1970-01-01 01:00:00.000000000 +0100
+++ freebsd-glue-0.2.22+nmu1/debian/lorder	2023-08-07 01:20:16.000000000 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo $@
diff -Nru freebsd-glue-0.2.22/debian/rules freebsd-glue-0.2.22+nmu1/debian/rules
--- freebsd-glue-0.2.22/debian/rules	2016-03-05 01:54:10.000000000 +0100
+++ freebsd-glue-0.2.22+nmu1/debian/rules	2023-08-07 01:20:16.000000000 +0200
@@ -6,7 +6,7 @@
 # Determine host architecture compiler
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifeq ($(origin CC),default)
-CC := $(DEB_HOST_GNU_TYPE)-gcc
+CC := $(DEB_HOST_GNU_TYPE)-gcc-9
 endif
 
 # Determine build architecture compiler
@@ -23,7 +23,7 @@
 endif
 
 DESTDIR = $(CURDIR)/debian/tmp
-PATH := /usr/lib/freebsd:$(PATH)
+PATH := $(CURDIR)/debian:/usr/lib/freebsd:$(PATH)
 PMAKE := \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
diff -Nru freebsd-glue-0.2.22/debian/tsort freebsd-glue-0.2.22+nmu1/debian/tsort
--- freebsd-glue-0.2.22/debian/tsort	1970-01-01 01:00:00.000000000 +0100
+++ freebsd-glue-0.2.22+nmu1/debian/tsort	2023-08-07 01:20:16.000000000 +0200
@@ -0,0 +1,2 @@
+#!/bin/sh
+sort $@
diff -Nru freebsd-glue-0.2.22/include/md5.h freebsd-glue-0.2.22+nmu1/include/md5.h
--- freebsd-glue-0.2.22/include/md5.h	2014-08-25 21:40:17.000000000 +0200
+++ freebsd-glue-0.2.22+nmu1/include/md5.h	2023-08-07 01:20:16.000000000 +0200
@@ -1 +1,2 @@
+#pragma once
 #include <bsd/md5.h>

Reply to: