Commit e65692a4 authored by Samuel Thibault's avatar Samuel Thibault Committed by Samuel Thibault

Import Debian changes 3.01h+2-2

mbrola (3.01h+2-2) unstable; urgency=medium

  * Add libstrongexit.so workaround. mbrola crashes on exit() cleanup, so
    don't bother trying to exit cleanly, mbrola does close the output file
    fine anyway (Closes: #856331).
    - install: install libstrongexit.so and wrapper script to use it
    - control:
      - build-depend on gcc-multilib on amd64 for cross-compiling 32bit
      libstrongexit.so
      - build-depend on dh-exec for multiarch path
      - depend on dpkg-dev for multiarch path at exec.
parent 3d2aee15
mbrola (3.01h+2-2) unstable; urgency=medium
* Add libstrongexit.so workaround. mbrola crashes on exit() cleanup, so
don't bother trying to exit cleanly, mbrola does close the output file
fine anyway (Closes: #856331).
- install: install libstrongexit.so and wrapper script to use it
- control:
- build-depend on gcc-multilib on amd64 for cross-compiling 32bit
libstrongexit.so
- build-depend on dh-exec for multiarch path
- depend on dpkg-dev for multiarch path at exec.
-- Samuel Thibault <sthibault@debian.org> Tue, 28 Feb 2017 14:26:24 +0100
mbrola (3.01h+2-1) unstable; urgency=medium
* Add armhf build from upstream (Closes: 839021).
......
......@@ -2,7 +2,7 @@ Source: mbrola
Section: non-free/sound
Priority: optional
Maintainer: Samuel Thibault <sthibault@debian.org>
Build-Depends: debhelper (>= 10), unzip, libc6-i386 [amd64] | libc6:i386 [amd64]
Build-Depends: debhelper (>= 10), dh-exec (>= 0.3), unzip, libc6-dev-i386 [amd64] | libc6-dev:i386 [amd64], gcc-multilib [amd64]
Standards-Version: 3.9.8
Homepage: http://tcts.fpms.ac.be/synthesis/
XS-Autobuild: yes
......@@ -10,7 +10,7 @@ XS-Autobuild: yes
Package: mbrola
Architecture: i386 amd64 alpha powerpc sparc armel armhf
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends} [!amd64], libc6:i386 [amd64] | libc6-i386 [amd64]
Depends: ${misc:Depends}, ${shlibs:Depends} [!amd64], libc6:i386 [amd64] | libc6-i386 [amd64], dpkg-dev
Suggests: mbrola-voice, espeak, cicero
Description: Multilingual software speech synthesizer
Mbrola is Thierry Dutoit's phonemizer for multilingual speech synthesis. The
......
mbrola /usr/bin
#! /usr/bin/dh-exec
mbrola /usr/lib/${DEB_HOST_MULTIARCH}/mbrola
debian/strongexit/libstrongexit.so /usr/lib/${DEB_HOST_MULTIARCH}/mbrola
debian/strongexit/mbrola /usr/bin
......@@ -4,6 +4,7 @@
dh $@
DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
README_ZIPBALL=mbr301h_i386-ppc-alpha-ultra.zip
TARBALL=
......@@ -17,7 +18,9 @@ endif
ifeq ($(DEB_HOST_ARCH),amd64)
ZIPBALL=mbr301h_i386-ppc-alpha-ultra.zip
# See end of README.Debian
FILENAME=unpacked/mbrola-linux-i386
CFLAGS+=-m32
endif
ifeq ($(DEB_HOST_ARCH),alpha)
......@@ -65,3 +68,10 @@ override_dh_auto_build: unpack
cp -f $(FILENAME) mbrola
chmod u+w,+x mbrola
strip mbrola
$(MAKE) -C debian/strongexit
override_dh_auto_clean:
$(MAKE) clean -C debian/strongexit
override_dh_shlibdeps:
dh_shlibdeps -- -e debian/mbrola/usr/lib/$(DEB_HOST_MULTIARCH)/mbrola/mbrola
mbrola source: depends-on-build-essential-package-without-using-version libc6-dev [build-depends: libc6-dev:i386 [amd64]]
LIB=libstrongexit.so
all: $(LIB)
$(LIB): strongexit.c
$(CC) $(CFLAGS) $< -o $@ -shared -fPIC $(LDFLAGS)
clean:
rm -f $(LIB)
#!/bin/bash
# mbrola crashes on exit() cleanup, so don't bother trying to exit cleanly,
# mbrola does close the output file fine anyway (see #856331)
DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
LD_PRELOAD=/usr/lib/$DEB_HOST_MULTIARCH/mbrola/libstrongexit.so exec /usr/lib/$DEB_HOST_MULTIARCH/mbrola/mbrola "$@"
#define _GNU_SOURCE
#include <unistd.h>
#ifdef __i386__
#define SYS_exit 1
#else
#include <sys/syscall.h>
#endif
void exit(int status) {
syscall(SYS_exit, status);
while(1);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment