diff options
| -rw-r--r-- | packages/glibc/glibc_cvs.bb | 25 | ||||
| -rw-r--r-- | packages/kaffe/kaffe-gtk_1.1.5.bb | 10 | ||||
| -rw-r--r-- | packages/kaffe/kaffe-gtk_cvs.bb | 2 | ||||
| -rw-r--r-- | packages/kaffe/kaffe.inc | 4 |
4 files changed, 26 insertions, 15 deletions
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index be54e0f063..c8e8ba3735 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -6,10 +6,10 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r1" -PV = "2.3.3+cvs${CVSDATE}" +PR = "r0" +PV = "2.3.4+cvs${CVSDATE}" -GLIBC_ADDONS ?= "linuxthreads" +GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" DEFAULT_PREFERENCE = "-1" @@ -38,15 +38,16 @@ INHIBIT_DEFAULT_DEPS = "1" # file://noinfo.patch;patch=1 # file://ldconfig.patch;patch=1;pnum=0 +# file://arm-no-hwcap.patch;patch=1;pnum=0 \ +# file://arm-memcpy.patch;patch=1;pnum=0 \ +# file://arm-longlong.patch;patch=1;pnum=0 \ +# file://arm-machine-gmon.patch;patch=1;pnum=0 \ +# \ +# file://arm-ioperm.patch;patch=1;pnum=0 \ +# file://ldd.patch;patch=1;pnum=0 \ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \ - file://arm-ioperm.patch;patch=1;pnum=0 \ - file://ldd.patch;patch=1;pnum=0 \ + cvs://anoncvs@sources.redhat.com/cvs/glibc;module=ports \ file://fhs-linux-paths.patch;patch=1 \ - file://arm-no-hwcap.patch;patch=1;pnum=0 \ - file://arm-memcpy.patch;patch=1;pnum=0 \ - file://arm-longlong.patch;patch=1;pnum=0 \ - file://arm-machine-gmon.patch;patch=1;pnum=0 \ - \ file://etc/ld.so.conf \ file://generate-supported.mk" @@ -76,6 +77,8 @@ def get_glibc_fpu_setting(bb, d): return "" do_configure () { +# Integrate ports into tree + if [ ! -d ${S}/ports ]; then mv ${WORKDIR}/ports ${S}; fi # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now # don't pass CPPFLAGS into configure, since it upsets the kernel-headers @@ -93,8 +96,6 @@ rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ rusers.x spray.x nfs_prot.x rquota.x key_prot.x" do_compile () { - # this really is arm specific - touch ${S}/sysdeps/arm/framestate.c # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging unset LDFLAGS base_do_compile diff --git a/packages/kaffe/kaffe-gtk_1.1.5.bb b/packages/kaffe/kaffe-gtk_1.1.5.bb index e69de29bb2..d4c2be9f5c 100644 --- a/packages/kaffe/kaffe-gtk_1.1.5.bb +++ b/packages/kaffe/kaffe-gtk_1.1.5.bb @@ -0,0 +1,10 @@ +MAINTAINER = "Rene Wagner <rw@handhelds.org>" + +SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz" +S = "${WORKDIR}/kaffe-${PV}" + +include kaffe.inc + +DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib xtst kaffeh-native" + +EXTRA_OECONF += "" diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb index 840314ac4d..10b4adf506 100644 --- a/packages/kaffe/kaffe-gtk_cvs.bb +++ b/packages/kaffe/kaffe-gtk_cvs.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/kaffe" include kaffe.inc -DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib kaffeh-native" +DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib xtst kaffeh-native" EXTRA_OECONF += "" diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc index db913aee51..0cede21082 100644 --- a/packages/kaffe/kaffe.inc +++ b/packages/kaffe/kaffe.inc @@ -73,13 +73,13 @@ rmic \ rmiregistry \ serialver" -pkg_postinst() { +pkg_postinst_${PN} () { for name in ${alternative_names}; do update-alternatives --install ${bindir}/$name $name ${libdir}/${PN}/jre/bin/$name 300 done } -pkg_postrm() { +pkg_postrm_${PN} () { for name in ${alternative_names}; do update-alternatives --remove $name ${libdir}/${PN}/jre/bin/$name done |