From: Ronan Le Martret Date: Tue, 16 Jul 2013 15:38:28 +0000 (+0200) Subject: - modify for perl macro. X-Git-Tag: rev_0.4~276 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9563767a858a3ab1180687f16643a49d4c380108;p=scm%2Fbb%2Ftizen.git - modify for perl macro. --- diff --git a/meta-tizen-ivi/recipes-tizen/git/git.inc b/meta-tizen-ivi/recipes-tizen/git/git.inc index cd738a0..82bcb93 100644 --- a/meta-tizen-ivi/recipes-tizen/git/git.inc +++ b/meta-tizen-ivi/recipes-tizen/git/git.inc @@ -64,10 +64,10 @@ git-core_files += "GPL-2.0 COPYING" git-core_files += "/usr/bin/git" git-core_files += "/usr/share/git-core/" git-core_files += "/usr/libexec/git" -git-core_files += "/Git.pm" -git-core_files += "/Git/" -git-core_files += "/Git/*.pm" -git-core_files += "/auto/Git/" +git-core_files += "/usr/lib/perl/5.14.3/Git.pm" +git-core_files += "/usr/lib/perl/5.14.3/Git/" +git-core_files += "/usr/lib/perl/5.14.3/Git/*.pm" +git-core_files += "/usr/lib/perl/5.14.3/auto/Git/" git-email_files = "" git-email_files += "git.manifest" diff --git a/meta-tizen-ivi/recipes-tizen/help2man/help2man-native_git.bb b/meta-tizen-ivi/recipes-tizen/help2man/help2man-native_git.bb deleted file mode 100644 index 95b4f02..0000000 --- a/meta-tizen-ivi/recipes-tizen/help2man/help2man-native_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require help2man.inc - -PRIORITY = "9" - -inherit native - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/platform/upstream/help2man;protocol=ssh;tag=submit/tizen/20130710.131504" -require help2man-native-extraconf.inc - diff --git a/meta-tizen-ivi/recipes-tizen/libsolv/libsolv.inc b/meta-tizen-ivi/recipes-tizen/libsolv/libsolv.inc index 895b604..e12a698 100644 --- a/meta-tizen-ivi/recipes-tizen/libsolv/libsolv.inc +++ b/meta-tizen-ivi/recipes-tizen/libsolv/libsolv.inc @@ -25,7 +25,7 @@ libsolv_files += "/usr/lib/libsolvext.so.*" perl-solv_files = "" perl-solv_files += "libsolv.manifest" -perl-solv_files += "/*" +perl-solv_files += "/usr/lib/perl/5.14.3/*" libsolv-tools_files = "" libsolv-tools_files += "libsolv.manifest" diff --git a/meta-tizen-ivi/recipes-tizen/perl-TimeDate/perl-TimeDate.inc b/meta-tizen-ivi/recipes-tizen/perl-TimeDate/perl-TimeDate.inc index 905cf23..d349dfb 100644 --- a/meta-tizen-ivi/recipes-tizen/perl-TimeDate/perl-TimeDate.inc +++ b/meta-tizen-ivi/recipes-tizen/perl-TimeDate/perl-TimeDate.inc @@ -10,8 +10,8 @@ PACKAGES += "perl-TimeDate" perl-TimeDate_files = "" perl-TimeDate_files += "perl-TimeDate.manifest" -perl-TimeDate_files += "/Date/*" -perl-TimeDate_files += "/Time/*" +perl-TimeDate_files += "/usr/lib/perl/5.14.3/Date/*" +perl-TimeDate_files += "/usr/lib/perl/5.14.3/Time/*" perl-TimeDate_files += "/usr/share/man/man3/*.3*" FILES_${PN} = "${perl-TimeDate_files}" diff --git a/meta-tizen-ivi/recipes-tizen/perl-XML-Simple/perl-XML-Simple.inc b/meta-tizen-ivi/recipes-tizen/perl-XML-Simple/perl-XML-Simple.inc index 4cd704b..6b37e3d 100644 --- a/meta-tizen-ivi/recipes-tizen/perl-XML-Simple/perl-XML-Simple.inc +++ b/meta-tizen-ivi/recipes-tizen/perl-XML-Simple/perl-XML-Simple.inc @@ -11,8 +11,8 @@ PACKAGES += "perl-XML-Simple" perl-XML-Simple_files = "" perl-XML-Simple_files += "perl-XML-Simple.manifest" perl-XML-Simple_files += "/usr/share/man/man?/*" -perl-XML-Simple_files += "/XML" -perl-XML-Simple_files += "/auto/XML" +perl-XML-Simple_files += "/usr/lib/perl/5.14.3/XML" +perl-XML-Simple_files += "/usr/lib/perl/5.14.3/auto/XML" FILES_${PN} = "${perl-XML-Simple_files}" diff --git a/meta-tizen-ivi/recipes-tizen/perl-XML-Twig/perl-XML-Twig.inc b/meta-tizen-ivi/recipes-tizen/perl-XML-Twig/perl-XML-Twig.inc index 5ad336b..5137ff8 100644 --- a/meta-tizen-ivi/recipes-tizen/perl-XML-Twig/perl-XML-Twig.inc +++ b/meta-tizen-ivi/recipes-tizen/perl-XML-Twig/perl-XML-Twig.inc @@ -10,9 +10,9 @@ PACKAGES += "perl-XML-Twig" perl-XML-Twig_files = "" perl-XML-Twig_files += "perl-XML-Twig.manifest" -perl-XML-Twig_files += "/XML" -perl-XML-Twig_files += "/XML/Twig.pm" -perl-XML-Twig_files += "/XML/Twig" +perl-XML-Twig_files += "/usr/lib/perl/5.14.3/XML" +perl-XML-Twig_files += "/usr/lib/perl/5.14.3/XML/Twig.pm" +perl-XML-Twig_files += "/usr/lib/perl/5.14.3/XML/Twig" perl-XML-Twig_files += "/usr/bin/xml_grep" perl-XML-Twig_files += "/usr/bin/xml_merge" perl-XML-Twig_files += "/usr/bin/xml_pp" diff --git a/meta-tizen-ivi/recipes-tizen/perl-gettext/perl-gettext-extraconf.inc b/meta-tizen-ivi/recipes-tizen/perl-gettext/perl-gettext-extraconf.inc index e69de29..90af060 100644 --- a/meta-tizen-ivi/recipes-tizen/perl-gettext/perl-gettext-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/perl-gettext/perl-gettext-extraconf.inc @@ -0,0 +1 @@ +inherit cpan \ No newline at end of file diff --git a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc index 54215b0..d310214 100644 --- a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc +++ b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc @@ -32,7 +32,7 @@ default_git_src=review.tizen.org [tizen_ivi_blacklist] runtime=automake, eglibc, coreutils, db, gcc, gcc-runtime, gdbm, gettext, libgcc, linux-libc-headers, m4, perl, qemu, glibc, help2man -native=acl, apr,apr-util, attr, autoconf, automake, beecrypt, binutils, bison, bzip2, cmake, db, db4, e2fsprogs, eglibc, elfutils, expat, file, flex, gcc, gdbm, gettext, gettext-minimal, gmp, gnu-config, gnutls, gperf, icu, intltool, kconfig-frontends, kmodacl, libcap, libffi, libffi47, libffi-native, libmpc, libpcre, libtasn1, libtool, lzo, m4, mpfr, ncurses, neon, ocf-linux, openssl, opkg-utils, ossp-uuid, pam, pax-utils, pcre, perl, pigz, pkgconfig, pkg-config, pkgconfig-native, popt, prelink, pseudo, psmisc, qemu, quilt, readline, rpm, sqlite3, subversion, unifdef, util-linux, xz, zlib +native=acl, apr,apr-util, attr, autoconf, automake, beecrypt, binutils, bison, bzip2, cmake, db, db4, e2fsprogs, eglibc, elfutils, expat, file, flex, gcc, gdbm, gettext, gettext-minimal, gmp, gnu-config, gnutls, gperf, icu, intltool, kconfig-frontends, kmodacl, libcap, libffi, libffi47, libffi-native, libmpc, libpcre, libtasn1, libtool, lzo, m4, mpfr, ncurses, neon, ocf-linux, openssl, opkg-utils, ossp-uuid, pam, pax-utils, pcre, perl, pigz, pkgconfig, pkg-config, pkgconfig-native, popt, prelink, pseudo, psmisc, qemu, quilt, readline, rpm, sqlite3, subversion, unifdef, util-linux, xz, zlib, help2man [tizen_ivi_autoreconf] #specify witch recipes do not execute autoreconf during the macro "%configure". diff --git a/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/etc/macros.perl b/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/etc/macros.perl index fd12b5e..17958b9 100644 --- a/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/etc/macros.perl +++ b/proto-meta-Tizen_ivi_3.0/rpm_tizen_macro/etc/macros.perl @@ -3,23 +3,24 @@ # Useful perl macros (from Artur Frysiak ) # -%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch) -%perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib) -%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) -%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) -%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) -%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) +# RLM Need to be rewrite. +%perl_sitearch %{_buildPrefix}/usr/lib/perl/%{perl_version}/ +%perl_sitelib %{_buildPrefix}/usr/lib/perl/%{perl_version}/ +%perl_vendorarch %{_buildPrefix}/usr/lib/perl/%{perl_version}/ +%perl_vendorlib %{_buildPrefix}/usr/lib/perl/%{perl_version}/ +%perl_archlib %{_buildPrefix}/usr/lib/perl/%{perl_version}/ +%perl_privlib %{_buildPrefix}/usr/lib/perl/%{perl_version}/ # More useful perl macros (from Raul Dias ) # -%perl_version %(perl -V:version | sed "s!.*='!!;s!'.*!!") -%perl_man1ext %(perl -V:man1ext | sed "s!.*='!!;s!'.*!!") -%perl_man3ext %(perl -V:man3ext | sed "s!.*='!!;s!'.*!!") -%perl_man1dir %(perl -V:man1dir | sed "s!.*='!!;s!'.*!!") -%perl_man3dir %(perl -V:man3dir | sed "s!.*='!!;s!'.*!!") -%perl_installman1dir %(perl -V:installman1dir | sed "s!.*='!!;s!'.*!!") -%perl_installman3dir %(perl -V:installman3dir | sed "s!.*='!!;s!'.*!!") -%perl_installarchlib %(perl -V:installarchlib | sed "s!.*='!!;s!'.*!!") +%perl_version 5.14.3 +%perl_man1ext %{_buildPrefix}%(perl -V:man1ext | sed "s!.*='!!;s!'.*!!") +%perl_man3ext %{_buildPrefix}%(perl -V:man3ext | sed "s!.*='!!;s!'.*!!") +%perl_man1dir %{_buildPrefix}%(perl -V:man1dir | sed "s!.*='!!;s!'.*!!") +%perl_man3dir %{_buildPrefix}%(perl -V:man3dir | sed "s!.*='!!;s!'.*!!") +%perl_installman1dir %{_buildPrefix}%(perl -V:installman1dir | sed "s!.*='!!;s!'.*!!") +%perl_installman3dir %{_buildPrefix}%(perl -V:installman3dir | sed "s!.*='!!;s!'.*!!") +%perl_installarchlib %{_buildPrefix}/usr/lib/perl/%{perl_version}/ %perl_prefix %{buildroot} # suse specific macros 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 6b7b1ae..77888d5 100644 --- 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,7 +1,16 @@ diff --git a/packaging/texinfo.spec b/packaging/texinfo.spec -index 8be9df1..58d0f9b 100644 +index 8be9df1..cc80f56 100644 --- a/packaging/texinfo.spec +++ b/packaging/texinfo.spec +@@ -126,7 +126,7 @@ popd + HOST=%{_target_cpu}-tizen-linux + CFLAGS="$RPM_OPT_FLAGS -pipe" + LDFLAGS="" +- CC=gcc ++ CC=%__cc + export CFLAGS LDFLAGS CC + export LD_AS_NEEDED=0 + AUTOPOINT=true autoreconf -fi @@ -160,8 +160,8 @@ popd make DESTDIR=%{buildroot} \ infodir=%{_infodir} \