summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Hovland <erik@hovland.org>2006-05-15 20:48:54 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-15 20:48:54 +0000
commit9c257cb57a9bc7bbbf90310cf592aeaa24cc1960 (patch)
tree2bb3bc938fb45695e39eeadbb7e3284bf7bfd12b
parent90e48aeb042edb8375acef4b0443e5a0a1cb19bd (diff)
parentceb9beb6476d646012e9ba52f2a67eb0038f90ae (diff)
merge of 599c09d67423118adcf4ed6ee44637260778ff74
and 8fbc8e73670d1f0b1c156b5be2c15cb389f2128e
-rw-r--r--packages/glibc/glibc_2.3.5+cvs20050627.bb5
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h36006
-rw-r--r--packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h36006
-rw-r--r--packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb2
4 files changed, 16 insertions, 3 deletions
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 61e3e84d6d..a5fe3e6e40 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -103,7 +103,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/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600
index 97aeac5392..0c3aca3e10 100644
--- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600
+++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600
@@ -235,7 +235,11 @@ CONFIG_ALIGNMENT_TRAP=y
#
# Parallel port support
#
-# CONFIG_PARPORT is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_NOT_PC=y
#
# Memory Technology Devices (MTD)
diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600
index ad30591336..dfff54a0d1 100644
--- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600
+++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600
@@ -235,7 +235,11 @@ CONFIG_ALIGNMENT_TRAP=y
#
# Parallel port support
#
-# CONFIG_PARPORT is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_NOT_PC=y
#
# Memory Technology Devices (MTD)
diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
index d3166a99f4..5a911dba85 100644
--- a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -11,4 +11,4 @@ XORG_PN = "libXcomposite"
include xorg-xlibs.inc
SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
- file://change-include-order.patch;patch=1"
+ file://change-include-order.patch;patch=1" \ No newline at end of file