- solve texinfo compile.

diff --git a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-extraconf.inc b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-extraconf.inc
index 5906999..3e222e2 100644 (file)
--- a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-extraconf.inc
+++ b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-extraconf.inc
@@ -1,23 +1,3 @@
 inherit gettext
 
 
-TARGET_PATCH = "file://use_host_makedoc.patch"
-TARGET_PATCH_class-native = ""
-
-SRC_URI += "file://disable-native-tools.patch \
-           file://gettext-macros.patch \
-           file://use_host_makedoc.patch \
-           file://dont-depend-on-help2man.patch \
-           file://missing.patch \
-           ${TARGET_PATCH} \
-           "
-
-do_patch_append () {
- echo RLM begining of do_patch
- cat ${WORKDIR}/disable-native-tools.patch | patch -s -p1 --fuzz=2
- #cat ${WORKDIR}/gettext-macros.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/use_host_makedoc.patch | patch -s -p1 --fuzz=2
- cat ${WORKDIR}/dont-depend-on-help2man.patch | patch -s -p1 --fuzz=2
-  cat ${WORKDIR}/missing.patch | patch -s -p1 --fuzz=2  
- echo RLM end of do_patch
-}
\ No newline at end of file

diff --git a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-native-extraconf.inc b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-native-extraconf.inc
index 61a6d05..4b36262 100644 (file)
--- a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-native-extraconf.inc
+++ b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-native-extraconf.inc
@@ -1 +1,14 @@
-DEPENDS_class-native = "zlib-native ncurses-native"
\ No newline at end of file
+DEPENDS_class-native = "zlib-native ncurses-native"
+
+SRC_URI += "file://disable-native-tools.patch \
+           file://dont-depend-on-help2man.patch \
+           file://missing.patch \
+           "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/disable-native-tools.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/dont-depend-on-help2man.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/missing.patch | patch -s -p1 --fuzz=2  
+ echo RLM end of do_patch
+}
\ No newline at end of file

diff --git a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-oe-extraconf.inc
index e69de29..0315ece 100644 (file)
--- a/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-oe-extraconf.inc
+++ b/meta-tizen-ivi/recipes-tizen/texinfo/texinfo-oe-extraconf.inc
@@ -0,0 +1,14 @@
+SRC_URI += "file://disable-native-tools.patch \
+           file://use_host_makedoc.patch \
+           file://dont-depend-on-help2man.patch \
+           file://missing.patch \
+           "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/disable-native-tools.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/use_host_makedoc.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/dont-depend-on-help2man.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/missing.patch | patch -s -p1 --fuzz=2  
+ echo RLM end of do_patch
+}
\ No newline at end of file

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/texinfo-yocto.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/texinfo-yocto.spec.patch
new file mode 100644 (file)
index 0000000..1cd5901
--- /dev/null
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/texinfo-yocto.spec.patch
@@ -0,0 +1,24 @@
+diff --git a/packaging/texinfo.spec b/packaging/texinfo.spec
+index dc288dd..0f795c0 100644
+--- a/packaging/texinfo.spec
++++ b/packaging/texinfo.spec
+@@ -137,8 +137,6 @@ popd
+       --infodir=%{_infodir}           \
+       --without-included-gettext      \
+       --enable-nls
+-    PATH=${PWD}/makeinfo:${PWD}/util:$PATH
+-    export PATH
+     make %{?_smp_mflags};
+ pushd ../texi2html-%{version_t2h}
+     ./configure --build=$HOST         \
+@@ -160,8 +158,8 @@ popd
+     make DESTDIR=%{buildroot} \
+       infodir=%{_infodir}        \
+       htmldir=%{_defaultdocdir}/texi2html install
+-    mkdir -p %{buildroot}/sbin
+-    mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/
++    mkdir -p %{buildroot}%{_buildPrefix}/sbin
++    mv %{buildroot}%{_bindir}/install-info %{buildroot}%{_buildPrefix}/sbin/
+     ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info
+     mkdir -p %{buildroot}%{_infodir}
+     install -m 644 %{S:10}       %{buildroot}%{_infodir}/dir

diff --git a/proto-meta-Tizen_ivi_3.0/specfile-patch/texinfo.spec.patch b/proto-meta-Tizen_ivi_3.0/specfile-patch/texinfo.spec.patch
index 77888d5..2e55bb4 100644 (file)
--- a/proto-meta-Tizen_ivi_3.0/specfile-patch/texinfo.spec.patch
+++ b/proto-meta-Tizen_ivi_3.0/specfile-patch/texinfo.spec.patch
@@ -1,5 +1,5 @@
 diff --git a/packaging/texinfo.spec b/packaging/texinfo.spec
-index 8be9df1..cc80f56 100644
+index 8be9df1..dc288dd 100644
 --- a/packaging/texinfo.spec
 +++ b/packaging/texinfo.spec
 @@ -126,7 +126,7 @@ popd
@@ -11,14 +11,3 @@ index 8be9df1..cc80f56 100644
      export CFLAGS LDFLAGS CC
      export LD_AS_NEEDED=0
      AUTOPOINT=true autoreconf -fi
-@@ -160,8 +160,8 @@ popd
-     make DESTDIR=%{buildroot} \
-       infodir=%{_infodir}        \
-       htmldir=%{_defaultdocdir}/texi2html install
--    mkdir -p %{buildroot}/sbin
--    mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/
-+    mkdir -p %{buildroot}%{_buildPrefix}/sbin
-+    mv %{buildroot}%{_bindir}/install-info %{buildroot}%{_buildPrefix}/sbin/
-     ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info
-     mkdir -p %{buildroot}%{_infodir}
-     install -m 644 %{S:10}       %{buildroot}%{_infodir}/dir