From 20dbec52117b8c95625657b6616b474d5a8f4ba3 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 16 Apr 2013 15:38:51 +0200 Subject: [PATCH] - resolve groff. --- Tizen_TZ_package/spec2yocto.py | 2 +- .../recipes-tizen/groff/groff-extraconf.inc | 11 ++++ .../recipes-tizen/groff/groff-oe-extraconf.inc | 1 + .../recipes-tizen/groff/groff/groff.spec.patch | 65 ++++++++++++++++++++++ 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 meta-tizen-ivi/recipes-tizen/groff/groff/groff.spec.patch diff --git a/Tizen_TZ_package/spec2yocto.py b/Tizen_TZ_package/spec2yocto.py index 7fd2a7b..126878e 100755 --- a/Tizen_TZ_package/spec2yocto.py +++ b/Tizen_TZ_package/spec2yocto.py @@ -290,7 +290,7 @@ class specParser: if pkgName in [ "glibc"]: command += " --define='_sbindir /usr/sbin'" - if pkgName in ["freetype","popt","pcre","which","findutils","tizen-coreutils","python","ncurses","dlog","texinfo"]: + if pkgName in ["freetype","popt","pcre","which","findutils","tizen-coreutils","python","ncurses","dlog","texinfo","groff"]: oe_runconf2='''oe_runconf2''' command += " --define='%%_configure %s'" % oe_runconf2 diff --git a/meta-tizen-ivi/recipes-tizen/groff/groff-extraconf.inc b/meta-tizen-ivi/recipes-tizen/groff/groff-extraconf.inc index e69de29..0e7f144 100644 --- a/meta-tizen-ivi/recipes-tizen/groff/groff-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/groff/groff-extraconf.inc @@ -0,0 +1,11 @@ +EXTRA_OECONF = "--without-x" +PARALLEL_MAKE = "" + +SRC_URI += "file://groff.spec.patch \ + " + +do_patch () { + echo RLM begining of do_patch + cat ${WORKDIR}/groff.spec.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/groff/groff-oe-extraconf.inc b/meta-tizen-ivi/recipes-tizen/groff/groff-oe-extraconf.inc index e69de29..1166e62 100644 --- a/meta-tizen-ivi/recipes-tizen/groff/groff-oe-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/groff/groff-oe-extraconf.inc @@ -0,0 +1 @@ +DEPENDS = "groff-native" \ No newline at end of file diff --git a/meta-tizen-ivi/recipes-tizen/groff/groff/groff.spec.patch b/meta-tizen-ivi/recipes-tizen/groff/groff/groff.spec.patch new file mode 100644 index 0000000..48b097e --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/groff/groff/groff.spec.patch @@ -0,0 +1,65 @@ +diff --git a/packaging/groff.spec b/packaging/groff.spec +index 6fe6cab..fb852ff 100644 +--- a/packaging/groff.spec ++++ b/packaging/groff.spec +@@ -69,28 +69,43 @@ language and documentation for creating PDF files. + + %build + cp %{SOURCE1001} . ++ ++ if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then ++ sed -i \ ++ -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \ ++ -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \ ++ -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ ++ -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \ ++ ${S}/contrib/*/Makefile.sub \ ++ ${S}/doc/Makefile.in \ ++ ${S}/doc/Makefile.sub ++ fi ++ + %configure --enable-multibyte +-make ++ ++ ++ ++%__make + + %install + rm -rf ${RPM_BUILD_ROOT} + mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir} +-make install manroot=${RPM_BUILD_ROOT}%{_mandir} \ +- bindir=%{buildroot}%{_bindir} \ +- mandir=%{buildroot}%{_mandir} \ +- prefix=%{buildroot}/usr \ +- exec_prefix=%{buildroot}/usr \ +- sbindir=%{buildroot}%{_exec_prefix}/sbin \ +- sysconfdir=%{buildroot}/etc \ +- datadir=%{buildroot}/usr/share \ +- infodir=%{buildroot}/%{_prefix}/info \ +- sysconfdir=%{buildroot}/etc \ +- includedir=%{buildroot}/usr/include \ +- libdir=%{buildroot}/%{_libdir} \ +- libexecdir=%{buildroot}/usr/libexec \ +- localstatedir=%{buildroot}/var \ +- sharedstatedir=%{buildroot}/usr/com \ +- infodir=%{buildroot}/usr/share/info ++%makeinstall manroot=%{_mandir} \ ++ bindir=%{_bindir} \ ++ mandir=%{_mandir} \ ++ prefix=%_usr \ ++ exec_prefix=%_usr \ ++ sbindir=%_sbindir \ ++ sysconfdir=%_sysconfdir \ ++ datadir=%_datadir \ ++ infodir=%_infodir \ ++ sysconfdir=%_sysconfdir \ ++ includedir=%_includedir \ ++ libdir=%{_libdir} \ ++ libexecdir=%_libexecdir\ ++ localstatedir=%_var \ ++ sharedstatedir=%_sharedstatedir \ ++ infodir=%_infodir + + #install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir} + ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac -- 2.7.4