Source: mariadb-10.1
Version: 10.1.21-2
Severity: normal
Tags: patch
The package was failing to build because it was unconditionally trying to
install systemd files and Linux-only utilities. Patch attached (tested
on kfreebsd-amd64).
Regards,
James
>From e30d6b243b57664ef398df2b00534041a2109b0b Mon Sep 17 00:00:00 2001
From: James Clarke <jrt...@debian.org>
Date: Thu, 26 Jan 2017 18:59:28 +0000
Subject: [PATCH] Fix FTBFS on non-Linux architectures
---
debian/mariadb-server-10.1.install | 9 +++++----
debian/rules | 3 +++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/debian/mariadb-server-10.1.install b/debian/mariadb-server-10.1.install
old mode 100644
new mode 100755
index 03def793..f4a875db
--- a/debian/mariadb-server-10.1.install
+++ b/debian/mariadb-server-10.1.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
debian/additions/debian-start etc/mysql
debian/additions/debian-start.inc.sh usr/share/mysql
debian/additions/echo_stderr usr/share/mysql
@@ -5,15 +6,15 @@ debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks
etc/apparmor.d/usr.sbin.mysqld
-lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
+[linux-any] lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
usr/bin/aria_chk
usr/bin/aria_dump_log
usr/bin/aria_ftdump
usr/bin/aria_pack
usr/bin/aria_read_log
-usr/bin/galera_new_cluster
-usr/bin/galera_recovery
-usr/bin/mariadb-service-convert
+[linux-any] usr/bin/galera_new_cluster
+[linux-any] usr/bin/galera_recovery
+[linux-any] usr/bin/mariadb-service-convert
usr/bin/msql2mysql
usr/bin/my_print_defaults
usr/bin/myisam_ftdump
diff --git a/debian/rules b/debian/rules
index 197a54e1..a50a9d91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ BUILDDIR := builddir
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
@@ -125,9 +126,11 @@ override_dh_auto_install:
# If Mroonga plugin was not built skip the package
[ -f $(BUILDDIR)/storage/mroonga/ha_mroonga.so ] || sed -i -e "/Package: mariadb-plugin-mroonga/,+9d" debian/control
+ifneq (,$(filter linux,$(DEB_BUILD_ARCH_OS)))
# Copy systemd files to a location available for dh_installinit
cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.1.mariadb.service
cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.1.mariadb@.service
+endif
# make install
cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP)
--
2.11.0
