From 20674b19d0a0c49013f042a5ee367ccfde84ee67 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 27 Apr 2006 21:19:02 +0000 Subject: anthy-native: build fix --- packages/anthy/anthy-native/.mtn2git_empty | 0 .../native-mkanthydic-mkdepgraph.patch | 22 ++++++++++++ packages/anthy/anthy-native_6801.bb | 6 ---- packages/anthy/anthy/.mtn2git_empty | 0 .../anthy/anthy/native-mkanthydic-mkdepgraph.patch | 40 ++++++++++++++++++++++ packages/anthy/anthy_6801.bb | 2 +- .../anthy-use-native-mkanthydic-mkdepgraph.patch | 40 ---------------------- .../install-native-mkanthydic-mkdepgraph.patch | 22 ------------ 8 files changed, 63 insertions(+), 69 deletions(-) create mode 100644 packages/anthy/anthy-native/.mtn2git_empty create mode 100644 packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch create mode 100644 packages/anthy/anthy/.mtn2git_empty create mode 100644 packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch delete mode 100644 packages/anthy/files/anthy-use-native-mkanthydic-mkdepgraph.patch delete mode 100644 packages/anthy/files/install-native-mkanthydic-mkdepgraph.patch diff --git a/packages/anthy/anthy-native/.mtn2git_empty b/packages/anthy/anthy-native/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch new file mode 100644 index 0000000000..209232ed6d --- /dev/null +++ b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch @@ -0,0 +1,22 @@ +--- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:08:56 +0200 ++++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:11:18 +0200 +@@ -15,7 +15,7 @@ + udict dict.args.in + + # Generate the dictionary +-noinst_PROGRAMS = mkanthydic ++bin_PROGRAMS = mkanthydic + mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h + mkanthydic_LDADD = ../src-diclib/libanthydic.la + +--- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:08:33 +0200 ++++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:11:28 +0200 +@@ -9,7 +9,7 @@ + EXTRA_DIST = indepword.txt $(DEPWORDS) + + # Generate the dictionary +-noinst_PROGRAMS = mkdepgraph ++bin_PROGRAMS = mkdepgraph + mkdepgraph_SOURCES = mkdepgraph.c + mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la + diff --git a/packages/anthy/anthy-native_6801.bb b/packages/anthy/anthy-native_6801.bb index eed500560c..dbcf851024 100644 --- a/packages/anthy/anthy-native_6801.bb +++ b/packages/anthy/anthy-native_6801.bb @@ -1,9 +1,3 @@ require anthy_${PV}.bb DEPENDS ="" inherit native - - -do_stage() { - autotools_stage_all -} - diff --git a/packages/anthy/anthy/.mtn2git_empty b/packages/anthy/anthy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch new file mode 100644 index 0000000000..e5cecbf570 --- /dev/null +++ b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch @@ -0,0 +1,40 @@ +--- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:14:58 +0200 ++++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:15:13 +0200 +@@ -15,12 +15,12 @@ + udict dict.args.in + + # Generate the dictionary +-noinst_PROGRAMS = mkanthydic +-mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h +-mkanthydic_LDADD = ../src-diclib/libanthydic.la ++#noinst_PROGRAMS = mkanthydic ++#mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h ++#mkanthydic_LDADD = ../src-diclib/libanthydic.la + +-anthy.dic : mkanthydic +- ./mkanthydic -f ./dict.args ++anthy.dic : ++ mkanthydic -f ./dict.args + + + # To install +--- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:14:03 +0200 ++++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:15:43 +0200 +@@ -9,12 +9,12 @@ + EXTRA_DIST = indepword.txt $(DEPWORDS) + + # Generate the dictionary +-noinst_PROGRAMS = mkdepgraph +-mkdepgraph_SOURCES = mkdepgraph.c +-mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la ++#noinst_PROGRAMS = mkdepgraph ++#mkdepgraph_SOURCES = mkdepgraph.c ++#mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la + +-anthy.dep : mkdepgraph +- ./mkdepgraph ++anthy.dep : ++ mkdepgraph + + # To install + pkgdata_DATA = anthy.dep diff --git a/packages/anthy/anthy_6801.bb b/packages/anthy/anthy_6801.bb index e74b1cda6e..c277639430 100644 --- a/packages/anthy/anthy_6801.bb +++ b/packages/anthy/anthy_6801.bb @@ -10,7 +10,7 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/15893/anthy-6801.tar.gz \ file://not_build_elc.patch;patch=1 \ file://2ch_t.patch;patch=1 \ file://change_anthy_dic_path.patch;patch=1 \ - file://anthy-use-native-mkanthydic-mkdepgraph.patch;patch=1" + file://native-mkanthydic-mkdepgraph.patch;patch=1" S = "${WORKDIR}/anthy-${PV}" inherit autotools pkgconfig diff --git a/packages/anthy/files/anthy-use-native-mkanthydic-mkdepgraph.patch b/packages/anthy/files/anthy-use-native-mkanthydic-mkdepgraph.patch deleted file mode 100644 index e5cecbf570..0000000000 --- a/packages/anthy/files/anthy-use-native-mkanthydic-mkdepgraph.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:14:58 +0200 -+++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:15:13 +0200 -@@ -15,12 +15,12 @@ - udict dict.args.in - - # Generate the dictionary --noinst_PROGRAMS = mkanthydic --mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h --mkanthydic_LDADD = ../src-diclib/libanthydic.la -+#noinst_PROGRAMS = mkanthydic -+#mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h -+#mkanthydic_LDADD = ../src-diclib/libanthydic.la - --anthy.dic : mkanthydic -- ./mkanthydic -f ./dict.args -+anthy.dic : -+ mkanthydic -f ./dict.args - - - # To install ---- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:14:03 +0200 -+++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:15:43 +0200 -@@ -9,12 +9,12 @@ - EXTRA_DIST = indepword.txt $(DEPWORDS) - - # Generate the dictionary --noinst_PROGRAMS = mkdepgraph --mkdepgraph_SOURCES = mkdepgraph.c --mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la -+#noinst_PROGRAMS = mkdepgraph -+#mkdepgraph_SOURCES = mkdepgraph.c -+#mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la - --anthy.dep : mkdepgraph -- ./mkdepgraph -+anthy.dep : -+ mkdepgraph - - # To install - pkgdata_DATA = anthy.dep diff --git a/packages/anthy/files/install-native-mkanthydic-mkdepgraph.patch b/packages/anthy/files/install-native-mkanthydic-mkdepgraph.patch deleted file mode 100644 index 209232ed6d..0000000000 --- a/packages/anthy/files/install-native-mkanthydic-mkdepgraph.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:08:56 +0200 -+++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:11:18 +0200 -@@ -15,7 +15,7 @@ - udict dict.args.in - - # Generate the dictionary --noinst_PROGRAMS = mkanthydic -+bin_PROGRAMS = mkanthydic - mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h - mkanthydic_LDADD = ../src-diclib/libanthydic.la - ---- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:08:33 +0200 -+++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:11:28 +0200 -@@ -9,7 +9,7 @@ - EXTRA_DIST = indepword.txt $(DEPWORDS) - - # Generate the dictionary --noinst_PROGRAMS = mkdepgraph -+bin_PROGRAMS = mkdepgraph - mkdepgraph_SOURCES = mkdepgraph.c - mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la - -- cgit v1.2.3