[apertium] 01/01: Added patch 00-parallel-ftbfs.patch to fix #886361

Kartik Mistry kartik at moszumanska.debian.org
Fri Jan 5 04:42:15 UTC 2018


This is an automated email from the git hooks/post-receive script.

kartik pushed a commit to branch master
in repository apertium.

commit 131ccdfc16b80d92a832eb8b8147b8258da1a372
Author: Kartik Mistry <kartik.mistry at gmail.com>
Date:   Fri Jan 5 10:12:07 2018 +0530

    Added patch 00-parallel-ftbfs.patch to fix #886361
---
 debian/changelog                       |  8 +++
 debian/patches/00-parallel-ftbfs.patch | 89 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 98 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b6d732f..0499c8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apertium (3.4.2~r68466-4) unstable; urgency=medium
+
+  * debian/patches/00-parallel-ftbfs.patch:
+    + Added patch to fix frequent parallel FTBFS. Patch by Adrian Bunk
+      <bunk at debian.org> (Closes: #886361)
+
+ -- Kartik Mistry <kartik at debian.org>  Fri, 05 Jan 2018 10:11:44 +0530
+
 apertium (3.4.2~r68466-3) unstable; urgency=low
 
   [ Tino Didriksen ]
diff --git a/debian/patches/00-parallel-ftbfs.patch b/debian/patches/00-parallel-ftbfs.patch
new file mode 100644
index 0000000..a062696
--- /dev/null
+++ b/debian/patches/00-parallel-ftbfs.patch
@@ -0,0 +1,89 @@
+Description: Fix parallel FTBFS
+ Tell automake that libapertium3 is a self-built library
+ so that proper dependencies are added.
+Author: Adrian Bunk <bunk at debian.org>
+
+--- apertium-3.4.2~r68466.orig/apertium/Makefile.am
++++ apertium-3.4.2~r68466/apertium/Makefile.am
+@@ -226,7 +226,7 @@ apertium_DATA = deformat.xsl reformat.xs
+ 
+ apertium_pretransfer_SOURCES = apertium_pretransfer.cc
+ apertium_multiple_translations_SOURCES = apertium-multiple-translations.cc
+-apertium_multiple_translations_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_multiple_translations_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ apertium_destxt_SOURCES = apertium_destxt.cc
+ apertium_retxt_SOURCES = apertium_retxt.cc
+ apertium_deshtml_SOURCES = apertium_deshtml.cc
+@@ -249,55 +249,55 @@ apertium_repptx_SOURCES = apertium_reppt
+ apertium_desmediawiki_SOURCES = apertium_desmediawiki.cc
+ apertium_remediawiki_SOURCES = apertium_remediawiki.cc
+ apertium_prelatex_SOURCES = apertium_prelatex.cc
+-apertium_prelatex_LDADD= $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_prelatex_LDADD= $(APERTIUM_LIBS) libapertium3.la
+ apertium_postlatex_SOURCES = apertium_postlatex.cc
+-apertium_postlatex_LDADD= $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_postlatex_LDADD= $(APERTIUM_LIBS) libapertium3.la
+ apertium_postlatex_raw_SOURCES = apertium_postlatex_raw.cc
+-apertium_postlatex_raw_LDADD= $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_postlatex_raw_LDADD= $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_tagger_SOURCES = apertium_tagger.cc
+-apertium_tagger_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_tagger_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_tmxbuild_SOURCES = apertium_tmxbuild.cc
+-apertium_tmxbuild_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_tmxbuild_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_preprocess_transfer_SOURCES = transferpp.cc
+ apertium_preprocess_transfer_LDADD = $(APERTIUM_LIBS) \
+-                                     -lapertium$(GENERIC_MAJOR_VERSION)
++                                     libapertium3.la
+ 
+ apertium_filter_ambiguity_SOURCES = apertium_filter_ambiguity.cc
+ apertium_filter_ambiguity_LDADD = $(APERTIUM_LIBS) \
+-                                  -lapertium$(GENERIC_MAJOR_VERSION)
++                                  libapertium3.la
+ 
+ apertium_transfer_SOURCES = apertium_transfer.cc
+-apertium_transfer_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_transfer_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_interchunk_SOURCES = apertium_interchunk.cc
+-apertium_interchunk_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_interchunk_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_postchunk_SOURCES = apertium_postchunk.cc
+-apertium_postchunk_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_postchunk_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ ###apertium_lextor_SOURCES = apertium_lextor.cc
+-###apertium_lextor_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++###apertium_lextor_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ #apertium_lextor_eval_SOURCES = apertium-lextor-eval.C
+-#apertium_lextor_eval_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++#apertium_lextor_eval_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_tagger_apply_new_rules_SOURCES = apertium_tagger_apply_new_rules.cc
+-apertium_tagger_apply_new_rules_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_tagger_apply_new_rules_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ apertium_tagger_readwords_SOURCES = apertium_tagger_readwords.cc
+-apertium_tagger_readwords_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++apertium_tagger_readwords_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ ###apertium_lextor_search_SOURCES = apertium-lextor-search.C
+-###apertium_lextor_search_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++###apertium_lextor_search_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ ###pruebas_lextor_SOURCES = pruebas-lextor.C
+-###pruebas_lextor_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++###pruebas_lextor_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ ###apertium_gen_wlist_lextor_translation_SOURCES = apertium_gen_wlist_lextor_translation.cc
+-###apertium_gen_wlist_lextor_translation_LDADD = $(APERTIUM_LIBS) -lapertium$(GENERIC_MAJOR_VERSION)
++###apertium_gen_wlist_lextor_translation_LDADD = $(APERTIUM_LIBS) libapertium3.la
+ 
+ 
+ if WINDOWS
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e155371
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00-parallel-ftbfs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/apertium.git



More information about the debian-science-commits mailing list