Package: src:bogl
Version: 0.1.18-13
Severity: important
Tags: patch
I've uploaded bogl to Ubuntu with the following changes:
* debian/patches/makefile: Use DEB_HOST vars consistently, rather than
incorrectly using DEB_BUILD and uname to guess what we're building.
* debian/patches/makefile: Don't build vga16 on arm, due to glibc 2.30.
To expand on this slightly, I've fixed up the usage of DEB_BUILD vars
and uname in the makefile patch to get all the info about our build
target, not the build system (ie: using DEB_HOST_ vars). These were
drive-by fixes noticed when making the actual FTBFS fix:
glibc 2.30 removed the sys/io.h emulation that allowed vga16 to build,
though it almost certainly didn't really work anywhere. This stops
building vga16 on 32-bit ARM, fixing the FTBFS with glibc 2.30.
... Adam
-- System Information:
Debian Release: buster/sid
APT prefers eoan
APT policy: (500, 'eoan')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.3.0-10-lowlatency (SMP w/4 CPU cores; PREEMPT)
Kernel taint flags: TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru bogl-0.1.18/debian/changelog bogl-0.1.18/debian/changelog
--- bogl-0.1.18/debian/changelog 2019-04-22 17:06:13.000000000 -0600
+++ bogl-0.1.18/debian/changelog 2019-09-20 04:10:28.000000000 -0600
@@ -1,3 +1,11 @@
+bogl (0.1.18-13ubuntu2) eoan; urgency=medium
+
+ * debian/patches/makefile: Use DEB_HOST vars consistently, rather than
+ incorrectly using DEB_BUILD and uname to guess what we're building.
+ * debian/patches/makefile: Don't build vga16 on arm, due to glibc 2.30.
+
+ -- Adam Conrad <[email protected]> Fri, 20 Sep 2019 04:10:28 -0600
+
bogl (0.1.18-13ubuntu1) eoan; urgency=low
* Merge from Debian unstable. Remaining changes:
diff -Nru bogl-0.1.18/debian/patches/makefile
bogl-0.1.18/debian/patches/makefile
--- bogl-0.1.18/debian/patches/makefile 2018-03-08 21:25:51.000000000 -0700
+++ bogl-0.1.18/debian/patches/makefile 2019-09-20 04:10:28.000000000 -0600
@@ -35,8 +35,8 @@
ALLCFLAGS = $(CFLAGS) $(WARNCFLAGS) $(FBCFLAGS)
-architecture := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-+architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-+os := $(shell uname)
++architecture := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
++os := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
LIBOBJECTS = $(LIBBOGLOBJECTS) $(LIBBOMLOBJECTS) $(LIBBOWLOBJECTS) \
$(LIBRSRCOBJECTS)
@@ -51,7 +51,7 @@
+bogl-test.c bogl.h boglP.h boml.c \
+boml.h bowl.c bowl.h pngtobogl.c
+
-+ifeq ($(os),Linux)
++ifeq ($(os),linux)
+ SOURCES_DEP += bogl-pcfb.c bogl-pcfb.h bogl-tcfb.c bogl-tcfb.h
bowl-boxes.c bogl.c
ifeq (,)
@@ -60,7 +60,7 @@
endif
-ifneq (,$(filter i386 arm ia64 x86_64,$(architecture)))
-+ifneq (,$(filter i386 arm ia64 amd64,$(architecture)))
++ifneq (,$(filter i386 ia64 amd64,$(architecture)))
FBCFLAGS += -DBOGL_VGA16_FB=1
LIBBOGLOBJECTS += bogl-vga16.o
SOURCES_DEP += bogl-vga16.c bogl-vga16.h
@@ -74,7 +74,7 @@
# libutf8/libutf8_plug.so unifont-reduced.bgf
-all: depend $(SHARED_LIB) $(LIB) bterm bdftobogl reduce-font
+all: depend
-+ifeq ($(os),Linux)
++ifeq ($(os),linux)
+all: $(SHARED_LIB) $(LIB) bterm bdftobogl pngtobogl
+endif
+all: reduce-font
@@ -96,7 +96,7 @@
install: all
- install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl
$(DESTDIR)/usr/bin
+ install -d $(DESTDIR)/usr/bin
-+ifeq ($(os),Linux)
++ifeq ($(os),linux)
+ install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl
install -m644 $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SHARED_LIB)
ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(DEVLINK)
