tags 746058 +patch
thanks

the unversioned "tclsh" binary is no longer supplied by tcl-<version> packages, only by the tcl package (from source tcltk-defaults) hence this failure.

I first tried building with the tcl package installed but that failed with a segfault which I put down to version mismatches (admittedly this was in an arm64 qemu chroot so ymmv). I looked at patching the upstream source but it looked pretty involved. So I then took the approach of creating a directory under the build tree with a tclsh symlink in it pointing at the system's tclsh8.5 binary.

While I was there I also fixed an issue with incomplete cleanup in the clean target that I ran into.

Debdiff attatched and uploaded to debian-ports arm64. No immediate intent to NMU in debian proper.
diff -Nru sqlite-2.8.17/debian/changelog sqlite-2.8.17/debian/changelog
--- sqlite-2.8.17/debian/changelog      2014-01-06 15:20:30.000000000 +0000
+++ sqlite-2.8.17/debian/changelog      2014-05-25 22:38:51.000000000 +0100
@@ -1,3 +1,10 @@
+sqlite (2.8.17-10+arm64) unreleased; urgency=medium
+
+  * Add code in debian/rules to make build use appropriate tclsh.
+  * Fix clean target.
+
+ -- Peter Michael Green <plugw...@debian.org>  Sun, 25 May 2014 21:31:36 +0000
+
 sqlite (2.8.17-10) unstable; urgency=low
 
   * Update Standards-Version to 3.9.5 .
diff -Nru sqlite-2.8.17/debian/rules sqlite-2.8.17/debian/rules
--- sqlite-2.8.17/debian/rules  2014-01-06 15:12:07.000000000 +0000
+++ sqlite-2.8.17/debian/rules  2014-05-25 22:51:49.000000000 +0100
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export PATH:=$(CURDIR)/bin:$(PATH)
+
 CONFIGURE_EXTRA_FLAGS = config_TARGET_TCL_INC="-I/usr/include/tcl8.5" \
        config_BUILD_CFLAGS="$(CFLAGS) -DTHREADSAFE=1" \
        config_TARGET_LIBS="-ltcl8.5 -lpthread" \
@@ -12,8 +14,12 @@
 override_dh_clean:
        dh_autotools-dev_restoreconfig
        dh_clean
+       rm -rf bin
+       rm -f index.html
 
 override_dh_auto_configure:
+       mkdir bin
+       ln -s $(shell which tclsh8.5) bin/tclsh
        dh_autotools-dev_updateconfig
        dh_auto_configure -- $(CONFIGURE_EXTRA_FLAGS)
 

Reply via email to