Control: found -1 5.2.0-3
Control: tags -1 patch

Hi,

trafficserver FTBFS again on arm64 because it is illegal to use sed or
another shell command outside of a makefile recipe (I know that wasn't
what was originally intended to be done).

I've written a patch which fixes this using dh_install -X which I think
is a bit more readable.

Thanks,
James
diff -ur a/debian/rules b/debian/rules
--- a/debian/rules	2015-03-02 10:43:04.000000000 +0000
+++ b/debian/rules	2015-03-18 13:57:55.336226091 +0000
@@ -18,14 +18,17 @@
 	--enable-experimental-plugins --enable-reclaimable-freelist\
         $(shell dpkg-buildflags --export=configure)
 
+dh_install_flags :=
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	configure_flags += --enable-wccp --enable-linux-native-aio
+else
+	# Remove Linux-specific plugin
+	dh_install_flags += -Xhealthchecks.so
 endif
 
 ifneq (,$(findstring $(DEB_BUILD_ARCH),arm64 ppc64el))
 	configure_flags += --disable-luajit
-	sed -i '/\/tslua\.so$$/d' \
-		debian/trafficserver-experimental-plugins.install
+	dh_install_flags += -Xtslua.so
 endif
 
 %:
@@ -41,14 +44,9 @@
 	rm -f debian/tmp/usr/lib/trafficserver/lib*.la
 	rm -f debian/tmp/usr/lib/trafficserver/modules/*.la
 	rm -f debian/tmp/usr/lib/trafficserver/lib*.a
-ifneq ($(DEB_HOST_ARCH_OS),linux)
-	# Remove Linux-specific plugin
-	sed -i '/\/healthchecks\.so$$/d' \
-		debian/trafficserver-experimental-plugins.install
-endif
 
 override_dh_install:
-	dh_install --list-missing
+	dh_install --list-missing $(dh_install_flags)
 	./debian/change_config.pl debian/trafficserver/etc/trafficserver/records.config
 
 override_dh_fixperms:

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to