[oe-commits] org.oe.dev merge of 'ac891e557582299a2c482837fc1a4741608997eb'
oe commit
oe at amethyst.openembedded.net
Mon Apr 7 04:14:20 UTC 2008
merge of 'ac891e557582299a2c482837fc1a4741608997eb'
and 'c7dd0d08fe79367defca06f3c2108b3dae4fead1'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6e248da05f9aa427bf163bce47773b14b6a57833
ViewMTN: http://monotone.openembedded.org/revision/info/6e248da05f9aa427bf163bce47773b14b6a57833
Files:
1
packages/gnome/goffice_0.2.1.bb
packages/libpcre/files/native-rpath-link.patch
packages/gnome/goffice_0.3.2.bb
packages/gnome/goffice_0.6.2.bb
packages/gnumeric/gnumeric_1.6.3.bb
packages/gnumeric/gnumeric_1.8.2.bb
packages/libgsf/libgsf_1.14.2.bb
packages/libgsf/libgsf_1.14.8.bb
packages/libpcre/libpcre-native_4.4.bb
packages/libpcre/libpcre-native_7.6.bb
packages/libpcre/libpcre_4.4.bb
packages/libpcre/libpcre_7.6.bb
packages/libpcre/files/pcre-cross.patch
packages/gnumeric/files/remove-docs.patch
packages/glibc/eglibc-svn
packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch
packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch
packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch
conf/distro/include/sane-srcrevs.inc
packages/glibc/eglibc-package.bbclass
packages/glibc/eglibc_svn.bb
Diffs:
#
# mt diff -rac891e557582299a2c482837fc1a4741608997eb -r6e248da05f9aa427bf163bce47773b14b6a57833
#
#
#
# delete "packages/gnome/goffice_0.2.1.bb"
#
# delete "packages/libpcre/files/native-rpath-link.patch"
#
# rename "packages/gnome/goffice_0.3.2.bb"
# to "packages/gnome/goffice_0.6.2.bb"
#
# rename "packages/gnumeric/gnumeric_1.6.3.bb"
# to "packages/gnumeric/gnumeric_1.8.2.bb"
#
# rename "packages/libgsf/libgsf_1.14.2.bb"
# to "packages/libgsf/libgsf_1.14.8.bb"
#
# rename "packages/libpcre/libpcre-native_4.4.bb"
# to "packages/libpcre/libpcre-native_7.6.bb"
#
# rename "packages/libpcre/libpcre_4.4.bb"
# to "packages/libpcre/libpcre_7.6.bb"
#
# add_file "packages/libpcre/files/pcre-cross.patch"
# content [b054d55f39a11ecec6235479cc833c5613f4c103]
#
# patch "packages/gnome/goffice_0.6.2.bb"
# from [a51f4ad32f33f65b825942fe4513339371cc46f0]
# to [eb47cdc7c9b1add6e3fb541828691b17a69c3094]
#
# patch "packages/gnumeric/files/remove-docs.patch"
# from [0ac9e20e076f6c75ea79936763218fe84bc18b68]
# to [2c8e420129b3ac4e052eb8e3a7482f191bfb6614]
#
# patch "packages/gnumeric/gnumeric_1.8.2.bb"
# from [56d6d168c121708269efaac30877ca421cd283b9]
# to [ea49c85d73dfb41e834abf4ce6c61222c9e129a5]
#
# patch "packages/libpcre/libpcre-native_7.6.bb"
# from [ed1f69edae4a3f980279b01f41cff189d07002d0]
# to [c4ac31ba20193fddeaddb6cb93290479579b9ad2]
#
# patch "packages/libpcre/libpcre_7.6.bb"
# from [984032d4632ad803f48b7e387b39cad745c99917]
# to [603909433dfd8e32909049de4d3e77a2552f140d]
#
============================================================
--- packages/libpcre/files/pcre-cross.patch b054d55f39a11ecec6235479cc833c5613f4c103
+++ packages/libpcre/files/pcre-cross.patch b054d55f39a11ecec6235479cc833c5613f4c103
@@ -0,0 +1,25 @@
+To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise
+it needs to pass special variables.
+
+It would be nice to implement per-target compiler specification to
+automake, as it is done for linker.
+
+Even better it would be nice to implement native build time targets in
+automake.
+
+Index: pcre-7.6/Makefile.am
+===================================================================
+--- pcre-7.6.orig/Makefile.am 2008-01-23 17:58:28.000000000 +0000
++++ pcre-7.6/Makefile.am 2008-04-03 22:32:00.000000000 +0000
+@@ -147,6 +147,11 @@
+
+ noinst_PROGRAMS += dftables
+ dftables_SOURCES = dftables.c
++dftables_LINK = $(LINK_FOR_BUILD) -o $@
++dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
++
++dftables.o: $(srcdir)/dftables.c
++ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c
+
+ pcre_chartables.c: dftables$(EXEEXT)
+ ./dftables$(EXEEXT) $@
============================================================
--- packages/gnome/goffice_0.3.2.bb a51f4ad32f33f65b825942fe4513339371cc46f0
+++ packages/gnome/goffice_0.6.2.bb eb47cdc7c9b1add6e3fb541828691b17a69c3094
@@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE = "-1"
-DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libxml2 libart-lgpl"
+DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl"
FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug"
@@ -12,7 +12,7 @@ do_stage() {
do_stage() {
gnome_stage_includes
- oe_libinstall -so -C goffice libgoffice-0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C goffice libgoffice-0.6 ${STAGING_LIBDIR}
}
PACKAGES_DYNAMIC = "goffice-plugin-*"
============================================================
--- packages/gnumeric/files/remove-docs.patch 0ac9e20e076f6c75ea79936763218fe84bc18b68
+++ packages/gnumeric/files/remove-docs.patch 2c8e420129b3ac4e052eb8e3a7482f191bfb6614
@@ -1,8 +1,10 @@
---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000
-+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000
+Index: gnumeric-1.8.2/Makefile.am
+===================================================================
+--- gnumeric-1.8.2.orig/Makefile.am 2008-01-15 02:53:04.000000000 +0000
++++ gnumeric-1.8.2/Makefile.am 2008-04-01 22:44:44.000000000 +0000
@@ -1,4 +1,4 @@
+-SUBDIRS = . po po-functions src plugins icons templates doc tools schemas test
++SUBDIRS = . po po-functions src plugins icons templates tools schemas test
+
+ XML_I18N_XML_KIND = --pass-through
+
--SUBDIRS = . po po-functions src plugins icons templates doc schemas
-+SUBDIRS = . po po-functions src plugins icons templates schemas
- if WITH_WIN32
- SUBDIRS += tools
- endif
============================================================
--- packages/gnumeric/gnumeric_1.6.3.bb 56d6d168c121708269efaac30877ca421cd283b9
+++ packages/gnumeric/gnumeric_1.8.2.bb ea49c85d73dfb41e834abf4ce6c61222c9e129a5
@@ -1,7 +1,7 @@ S = "${WORKDIR}/gnumeric-${PV}"
LICENSE = "GPL"
SECTION = "x11/utils"
S = "${WORKDIR}/gnumeric-${PV}"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
+DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native"
DESCRIPTION = "Gnumeric spreadsheet for GNOME"
PR = "r1"
@@ -14,9 +14,14 @@ PACKAGES_DYNAMIC = "gnumeric-plugin-*"
PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-FILES_${PN}-dbg += "${libdir}/gnumeric/1.6.3/plugins/*/.debug"
+FILES_${PN}-dbg += "${libdir}/gnumeric/1.8.2/plugins/*/.debug"
FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so "
+# We need native orbit-idl with target idl files. No way to say it in a clean way:
+do_configure_append () {
+ find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
+}
+
python populate_packages_prepend () {
gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
============================================================
--- packages/libpcre/libpcre-native_4.4.bb ed1f69edae4a3f980279b01f41cff189d07002d0
+++ packages/libpcre/libpcre-native_7.6.bb c4ac31ba20193fddeaddb6cb93290479579b9ad2
@@ -7,8 +7,6 @@ PROVIDES = ""
# NOTE: consider defining PREFERRED_PROVIDER_pcre
PROVIDES = ""
-SRC_URI += "file://native-rpath-link.patch;patch=1"
-
do_compile () {
# The generation of dftables can lead to timestamp problems with ccache
# because the generated config.h seems newer. It is sufficient to ensure that the
============================================================
--- packages/libpcre/libpcre_4.4.bb 984032d4632ad803f48b7e387b39cad745c99917
+++ packages/libpcre/libpcre_7.6.bb 603909433dfd8e32909049de4d3e77a2552f140d
@@ -5,9 +5,10 @@ SECTION = "devel"
themselves still follow Perl syntax and semantics. The header file for \
the POSIX-style functions is called pcreposix.h."
SECTION = "devel"
-PR = "r8"
+PR = "r1"
LICENSE = "BSD"
-SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
+ file://pcre-cross.patch;patch=1"
S = "${WORKDIR}/pcre-${PV}"
PROVIDES = "pcre"
@@ -18,7 +19,7 @@ CFLAGS_append = " -D_REENTRANT"
LEAD_SONAME = "libpcre.so"
CFLAGS_append = " -D_REENTRANT"
-EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
+EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8"
do_compile () {
# stop libtool from trying to link with host libraries - fix from #33
@@ -29,7 +30,7 @@ do_compile () {
# because the generated config.h seems newer. It is sufficient to ensure that the
# attempt to build dftables inside make will actually work (foo_FOR_BUILD is
# only used for this).
- oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}"
+ oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC} -L${S}/lib"
}
do_stage () {
#
# mt diff -rc7dd0d08fe79367defca06f3c2108b3dae4fead1 -r6e248da05f9aa427bf163bce47773b14b6a57833
#
#
#
# add_dir "packages/glibc/eglibc-svn"
#
# add_file "packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch"
# content [99f1fa805a8dd4fff6c855278522ec939133e165]
#
# add_file "packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch"
# content [1dfede10378a1ae0075c2d3ecb4f2168f404e26f]
#
# add_file "packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch"
# content [7cce450fd367e820f4d68eba75bcc536c3ac8a0f]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [6ff9f0304e5d4462c4374384fd4e7eba9fda15a6]
# to [7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69]
#
# patch "packages/glibc/eglibc-package.bbclass"
# from [707f3f7fec8dba48bff09a80fe93f4d753d0ae20]
# to [aee684fa0a585cebef668deddd667baf05049150]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [1328dce82f5660e9a4ffa188f48b4f362872208a]
# to [f2d383f4c663c6f813536d55ba3fe9371d7e5bd7]
#
============================================================
--- packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch 99f1fa805a8dd4fff6c855278522ec939133e165
+++ packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch 99f1fa805a8dd4fff6c855278522ec939133e165
@@ -0,0 +1,12 @@
+--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.org 2008-04-04 18:44:53.000000000 -0700
++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-04-04 18:45:27.000000000 -0700
+@@ -73,6 +73,9 @@
+ # define DOCARGS_5 DOCARGS_4
+ # define UNDOCARGS_5 UNDOCARGS_4
+
++# define DOCARGS_6 DOCARGS_5
++# define UNDOCARGS_6 UNDOCARGS_5
++
+ # ifdef IS_IN_libpthread
+ # define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
+ # define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
============================================================
--- packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch 1dfede10378a1ae0075c2d3ecb4f2168f404e26f
+++ packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch 1dfede10378a1ae0075c2d3ecb4f2168f404e26f
@@ -0,0 +1,21 @@
+Index: eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
+===================================================================
+--- eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c (revision 5790)
++++ eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c (working copy)
+@@ -200,16 +200,12 @@
+ }
+
+ if (ifam->ifa_flags & (IFA_F_DEPRECATED
+- | IFA_F_TEMPORARY
+ | IFA_F_HOMEADDRESS))
+ {
+ struct in6ailist *newp = alloca (sizeof (*newp));
+ newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
+ ? in6ai_deprecated : 0)
+ | ((ifam->ifa_flags
+- & IFA_F_TEMPORARY)
+- ? in6ai_temporary : 0)
+- | ((ifam->ifa_flags
+ & IFA_F_HOMEADDRESS)
+ ? in6ai_homeaddress : 0));
+ memcpy (newp->info.addr, address ?: local,
============================================================
--- packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch 7cce450fd367e820f4d68eba75bcc536c3ac8a0f
+++ packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch 7cce450fd367e820f4d68eba75bcc536c3ac8a0f
@@ -0,0 +1,19 @@
+In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
+make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1
+
+--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig
++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+
+ #define FUTEX_WAIT 0
+ #define FUTEX_WAKE 1
============================================================
--- conf/distro/include/sane-srcrevs.inc 6ff9f0304e5d4462c4374384fd4e7eba9fda15a6
+++ conf/distro/include/sane-srcrevs.inc 7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69
@@ -22,9 +22,9 @@ SRCREV_pn-eds-dbus ?= "659"
SRCREV_pn-diversity-daemon ?= "127"
SRCREV_pn-diversity-nav ?= "238"
SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "5522"
-SRCREV_pn-eglibc-initial ?= "5522"
-SRCREV_pn-eglibc-intermediate ?= "5522"
+SRCREV_pn-eglibc ?= "5790"
+SRCREV_pn-eglibc-initial ?= "5790"
+SRCREV_pn-eglibc-intermediate ?= "5790"
SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
============================================================
--- packages/glibc/eglibc-package.bbclass 707f3f7fec8dba48bff09a80fe93f4d753d0ae20
+++ packages/glibc/eglibc-package.bbclass aee684fa0a585cebef668deddd667baf05049150
@@ -262,7 +262,7 @@ python package_do_split_gconvs () {
else:
eglibc_name = name
bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
- bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d)
+ bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % eglibc_name, d)
rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
m = re.match("(.*)_(.*)", name)
if m:
============================================================
--- packages/glibc/eglibc_svn.bb 1328dce82f5660e9a4ffa188f48b4f362872208a
+++ packages/glibc/eglibc_svn.bb f2d383f4c663c6f813536d55ba3fe9371d7e5bd7
@@ -5,6 +5,9 @@ SRC_URI = "svn://svn.eglibc.org;module=t
PV = "2.7+svnr${SRCREV}"
PR = "r4"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
+ file://eglibc-svn-arm-cargs6.patch;patch=1 \
+ file://eglibc-svn-arm-check_pf.patch;patch=1 \
+ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
file://etc/ld.so.conf \
file://generate-supported.mk"
S = "${WORKDIR}/trunk/libc"
@@ -48,8 +51,13 @@ EXTRA_OECONF += "${@get_eglibc_fpu_setti
EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
-do_configure_prepend() {
+do_unpack_append() {
+ bb.build.exec_func('do_move_ports', d)
+}
+
+do_move_ports() {
if test -d ${WORKDIR}/trunk/ports ; then
+ rm -rf ${S}/ports
mv ${WORKDIR}/trunk/ports ${S}/
fi
}
More information about the Openembedded-commits
mailing list