summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Hovland <erik@hovland.org>2006-05-24 18:56:25 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-24 18:56:25 +0000
commit6db44b3bfd1f07a773ad03e28d6d4b88d0b0dfc2 (patch)
tree3da7a3f2512ec16ee5bd7d43ceb53a2a12ee0482
parent2e3d6f2d0fe091f0b3442ad217e18d07026125a8 (diff)
parent2b82709ff01a6f234554f2c952c1123c3fea17d7 (diff)
merge of 2d6f8bd4b71a9ad4cd46736ff74dcf0bae763780
and 6d9a6d263913c8c725780872fe2f13329fcfb1b8
-rw-r--r--packages/glibc/glibc_2.3.5+cvs20050627.bb5
-rw-r--r--packages/xlibs/libxss_1.0.1.bb9
2 files changed, 12 insertions, 2 deletions
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 86ddc91fd0..024ba1d901 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -106,7 +106,12 @@ do_munge() {
addtask munge before do_patch after do_unpack
+export default_mmap_threshold_familiar = "32*1024"
+
do_configure () {
+ if [ "x$default_mmap_threshold" != "x" ]; then
+ echo "malloc-CPPFLAGS=-DDEFAULT_MMAP_THRESHOLD=\"(${default_mmap_threshold})\"" >configparms
+ 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
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb
index 92dd4c82c4..54abc86a23 100644
--- a/packages/xlibs/libxss_1.0.1.bb
+++ b/packages/xlibs/libxss_1.0.1.bb
@@ -7,9 +7,14 @@ DEPENDS = "libx11 libxext xextproto scrnsaverproto"
PROVIDES = "libxss"
RREPLACES = "libxss"
-XORG_PN = "libXScrnSaver"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2"
+S = "${WORKDIR}/libXScrnSaver-${PV}"
-include xorg-xlibs.inc
+inherit autotools pkgconfig
#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}