summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-11-12 15:30:57 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-11-12 15:30:57 +0000
commit97165541f4f3bd7eae84e953e9cce7f3e1876b86 (patch)
treed2f7433bc5f0ea3e16217956501ee67ecaf2b34a
parentec5b25edc0b086d0e85c794531da02170f659913 (diff)
parentddc6020eba020272ae3b46d0e3a39de5f6bb50b8 (diff)
merge of '1eb5618e7a9c615ad27d9d1ed9285311c3a0e2cc'
and 'ace1edeb5a57c79c092da74aa3e679bf270021df'
-rw-r--r--conf/distro/include/sane-srcrevs.inc18
-rw-r--r--conf/machine/simpad.conf2
-rw-r--r--packages/apmd/apmd_3.2.2.bb2
-rw-r--r--packages/fontconfig/fontconfig_2.4.1.bb3
-rw-r--r--packages/linux/linux-openmoko/defconfig-2.6.22.511
-rw-r--r--packages/linux/linux-openmoko_2.6.22.5.bb2
-rw-r--r--packages/maemo-mapper/files/mapper-hildon1.diff20
-rw-r--r--packages/maemo-mapper/maemo-mapper_svn.bb21
-rw-r--r--packages/maemo3/hildon-1_svn.bb2
-rw-r--r--packages/maemo3/libconic/.mtn2git_empty0
-rw-r--r--packages/maemo3/libconic/dbus-api-update.patch19
-rw-r--r--packages/maemo3/libconic_0.13.bb13
-rw-r--r--packages/maemo3/libhildonfm_1.9.41.bb3
-rw-r--r--packages/monotone/monotone-6-0.37/.mtn2git_empty0
-rw-r--r--packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch11
-rw-r--r--packages/monotone/monotone-6_0.37.bb52
-rw-r--r--packages/poppler/poppler_0.6.2.bb6
-rw-r--r--packages/squid/squid-native_2.6.STABLE14.bb11
-rw-r--r--packages/squid/squid_2.6.STABLE14.bb16
-rw-r--r--site/common-glibc7
20 files changed, 200 insertions, 19 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2ee9cf29f4..864f6fe178 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -25,14 +25,14 @@ SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "606"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gypsy ?= "56"
-SRCREV_pn-hildon-1 ?= "14173"
+SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libfakekey ?= "1455"
SRCREV_pn-libgsmd ?= "3074"
SRCREV_pn-libgsmd-devel ?= "3293"
SRCREV_pn-libjana ?= "665"
-SRCREV_pn-libmokogsmd2 ?= "2950"
+SRCREV_pn-libmokogsmd2 ?= "3362"
SRCREV_pn-libmokojournal2 ?= "3217"
SRCREV_pn-libmokopanelui2 ?= "3226"
SRCREV_pn-libmokoui2 ?= "3229"
@@ -43,14 +43,14 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-openmoko ?= "3238"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
-SRCREV_pn-maemo-mapper ?= "108"
+SRCREV_pn-maemo-mapper ?= "118"
SRCREV_pn-matchbox-desktop-2 ?= "1778"
SRCREV_pn-matchbox-keyboard ?= "1739"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-moko-gtk-engine ?= "3207"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-neod ?= "2956"
+SRCREV_pn-neod ?= "3358"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
@@ -58,7 +58,7 @@ SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3338"
+SRCREV_pn-openmoko-appmanager2 ?= "3382"
SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -69,7 +69,7 @@ SRCREV_pn-openmoko-contacts2 ?= "358"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "659"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3298"
+SRCREV_pn-openmoko-dialer2 ?= "3361"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -81,7 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-panel-battery ?= "3272"
+SRCREV_pn-openmoko-panel-battery ?= "3360"
SRCREV_pn-openmoko-panel-bt ?= "2896"
SRCREV_pn-openmoko-panel-clock ?= "2567"
SRCREV_pn-openmoko-panel-demo ?= "1622"
@@ -89,7 +89,7 @@ SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
SRCREV_pn-openmoko-panel-gps ?= "2900"
SRCREV_pn-openmoko-panel-gsm ?= "3185"
SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
-SRCREV_pn-openmoko-panel-usb ?= "2893"
+SRCREV_pn-openmoko-panel-usb ?= "3360"
SRCREV_pn-openmoko-session ?= "152"
SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192"
@@ -106,7 +106,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3342"
SRCREV_pn-openmoko-today2-folders ?= "2680"
-SRCREV_pn-openmoko-worldclock2 ?= "3301"
+SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
SRCREV_pn-oprofileui ?= "160"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 3b527293df..ab3da912ba 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -2,7 +2,7 @@
#@NAME: SIEMENS SIMpad SL4, SIEMENS SIMpad CL4, SIEMENS SIMpad SLC, Telekom T-Sinus PAD
#@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
TARGET_ARCH = "arm"
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb
index 5402e67632..c3fce375d3 100644
--- a/packages/apmd/apmd_3.2.2.bb
+++ b/packages/apmd/apmd_3.2.2.bb
@@ -5,7 +5,7 @@ DEPENDS = "libtool-cross"
LICENSE = "GPL"
PR = "r8"
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
file://debian.patch;patch=1 \
file://workaround.patch;patch=1 \
file://zaurus24.patch;patch=1 \
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
index 38eeb960f7..cc64f9ec4c 100644
--- a/packages/fontconfig/fontconfig_2.4.1.bb
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -5,7 +5,7 @@ DEPENDS = "expat freetype freetype-native zlib"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
-PR = "r1"
+PR = "r2"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -43,6 +43,7 @@ do_stage () {
oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+ ln -sf ${STAGING_INCDIR}/fontconfig/device_symbols.h ${STAGING_INCDIR}
}
BUILD_CFLAGS += " -I${STAGING_INCDIR_NATIVE}/freetype2"
diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5 b/packages/linux/linux-openmoko/defconfig-2.6.22.5
index 902cab094c..5c0396199f 100644
--- a/packages/linux/linux-openmoko/defconfig-2.6.22.5
+++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.22.5
-# Thu Nov 8 21:49:01 2007
+# Mon Nov 12 08:23:42 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -928,7 +928,13 @@ CONFIG_TOUCHSCREEN_S3C2410=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
@@ -1251,6 +1257,7 @@ CONFIG_SND_SOC=m
CONFIG_SND_S3C24XX_SOC=m
CONFIG_SND_S3C24XX_SOC_I2S=m
CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
+# CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 is not set
#
# SoC Audio support for SuperH
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index 121d79b0a8..00664ad448 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.22.5"
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT = "30008000"
diff --git a/packages/maemo-mapper/files/mapper-hildon1.diff b/packages/maemo-mapper/files/mapper-hildon1.diff
new file mode 100644
index 0000000000..55ea791955
--- /dev/null
+++ b/packages/maemo-mapper/files/mapper-hildon1.diff
@@ -0,0 +1,20 @@
+--- /tmp/maemo-mapper.c 2007-10-02 12:15:04.000000000 +0200
++++ maemo-mapper/src/maemo-mapper.c 2007-10-02 12:18:06.622045000 +0200
+@@ -52,7 +52,7 @@
+ #include <hildon-widgets/hildon-controlbar.h>
+ #include <hildon-widgets/hildon-note.h>
+ #include <hildon-widgets/hildon-color-button.h>
+-#include <hildon-widgets/hildon-file-chooser-dialog.h>
++#include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
+ #include <hildon-widgets/hildon-number-editor.h>
+ #include <hildon-widgets/hildon-banner.h>
+ #include <hildon-widgets/hildon-system-sound.h>
+@@ -6532,8 +6532,6 @@
+
+ gtk_widget_show_all(GTK_WIDGET(menu));
+
+- gtk_widget_tap_and_hold_setup(_map_widget, GTK_WIDGET(menu), NULL, 0);
+-
+ vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+ }
+
diff --git a/packages/maemo-mapper/maemo-mapper_svn.bb b/packages/maemo-mapper/maemo-mapper_svn.bb
new file mode 100644
index 0000000000..39e89fcc98
--- /dev/null
+++ b/packages/maemo-mapper/maemo-mapper_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "GPS navigation/map display software"
+LICENSE = "GPL"
+DEPENDS = "gdbm libconic sqlite3 gtk+ libhildonfm libosso osso-ic-oss libosso-help gnome-vfs dbus bluez-libs"
+RDEPENDS = "bluez-utils"
+RRECOMMENDS = "gpsd flite"
+PV = "2.0.3+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
+ file://mapper-hildon1.diff;patch=1;maxrev=108"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+ install -d ${D}${datadir}/applications/
+ mv ${D}/maemo-mapper.desktop ${D}${datadir}/applications/
+}
+
+#FILES_${PN} += "${datadir}/icons"
diff --git a/packages/maemo3/hildon-1_svn.bb b/packages/maemo3/hildon-1_svn.bb
index 5105472989..27b0443d79 100644
--- a/packages/maemo3/hildon-1_svn.bb
+++ b/packages/maemo3/hildon-1_svn.bb
@@ -6,7 +6,7 @@ DEPENDS = "gconf-dbus esound gtk+"
PV = "1.0.17+svnr${SRCREV}"
SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \
- file://buttonbox.patch;patch=1 "
+ file://buttonbox.patch;patch=1;maxrev=14173 "
S = "${WORKDIR}/hildon-1"
inherit autotools pkgconfig lib_package
diff --git a/packages/maemo3/libconic/.mtn2git_empty b/packages/maemo3/libconic/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo3/libconic/.mtn2git_empty
diff --git a/packages/maemo3/libconic/dbus-api-update.patch b/packages/maemo3/libconic/dbus-api-update.patch
new file mode 100644
index 0000000000..3542cecae8
--- /dev/null
+++ b/packages/maemo3/libconic/dbus-api-update.patch
@@ -0,0 +1,19 @@
+--- /tmp/conicconnection.c 2007-11-12 12:45:37.000000000 +0100
++++ libconic-0.13/conic/conicconnection.c 2007-11-12 12:46:04.663234000 +0100
+@@ -473,7 +473,7 @@
+ ICD_DBUS_PATH,
+ &icd_vtable,
+ NULL)) {
+- dbus_connection_disconnect(dbus_connection);
++ dbus_connection_close(dbus_connection);
+ dbus_connection_unref(dbus_connection);
+ dbus_connection = NULL;
+ }
+--- /tmp/Makefile.am 2007-11-12 12:47:22.000000000 +0100
++++ libconic-0.13/Makefile.am 2007-11-12 12:47:29.773234000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = conic tests
++SUBDIRS = conic
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = conic.pc
diff --git a/packages/maemo3/libconic_0.13.bb b/packages/maemo3/libconic_0.13.bb
new file mode 100644
index 0000000000..511abb70cc
--- /dev/null
+++ b/packages/maemo3/libconic_0.13.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Internet connection library"
+LICENSE = "LGPL"
+DEPENDS = "dbus-glib gconf"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
+ file://dbus-api-update.patch;patch=1"
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+
diff --git a/packages/maemo3/libhildonfm_1.9.41.bb b/packages/maemo3/libhildonfm_1.9.41.bb
index de1bb3d9e3..777b2a456b 100644
--- a/packages/maemo3/libhildonfm_1.9.41.bb
+++ b/packages/maemo3/libhildonfm_1.9.41.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Nokia hildon filemanager library"
DEPENDS = "hildon-thumbnail mce-dev libhildonmime osso-gwconnect hildon-libs osso-thumbnail"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_${PV}.tar.gz \
file://hildonfm-ifdef-maemogtk.diff;patch=1 \
@@ -24,6 +24,7 @@ PARALLEL_MAKE = ""
do_stage() {
autotools_stage_all
+ ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
}
diff --git a/packages/monotone/monotone-6-0.37/.mtn2git_empty b/packages/monotone/monotone-6-0.37/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/monotone/monotone-6-0.37/.mtn2git_empty
diff --git a/packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch b/packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch
new file mode 100644
index 0000000000..182993f027
--- /dev/null
+++ b/packages/monotone/monotone-6-0.37/txt2c-cross-post-0.22.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am 2007-11-12 14:43:17.000000000 +0100
++++ monotone-0.37/Makefile.am 2007-11-12 14:43:35.633234000 +0100
+@@ -692,7 +692,7 @@
+ CLEANFILES = $(BUILT_SOURCES) $(CLEAN_SOURCES) $(EPS_FIGURES)
+
+ txt2c: txt2c.cc
+- $(CXX) $(CXXFLAGS) -o $@ $<
++ $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $<
+ chmod 0755 $@$(EXEEXT)
+
+ # FIXME: should use stamp files.
diff --git a/packages/monotone/monotone-6_0.37.bb b/packages/monotone/monotone-6_0.37.bb
new file mode 100644
index 0000000000..571f5b17f5
--- /dev/null
+++ b/packages/monotone/monotone-6_0.37.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "Monotone is a distributed Source Control System"
+HOMEPAGE = "http://www.monotone.ca/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS = "boost"
+
+PROVIDES = "monotone"
+RPROVIDES = "monotone"
+
+S = "${WORKDIR}/monotone-${PV}"
+# no cross compile support - it tries to run the test program even with
+# --enable_ipv6=yes
+EXTRA_OECONF = "--disable-ipv6 \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --disable-nls \
+ --with-gnu-ld \
+ --with-bundled-lua --with-bundled-sqlite"
+
+inherit autotools
+
+# Release 0.22 reveals bugs in g++ for thumb (g++ generates
+# relocations which the linker cannot represent)
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+PR = "r0"
+
+SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
+ file://txt2c-cross-post-0.22.patch;patch=1 \
+# file://uclibc.database.hh.stdarg.patch;patch=1 \
+ file://configure.ac-no-sync-with-stdio-0.31.patch;patch=1 \
+ "
+do_compile_append() {
+ touch testsuite
+}
+
+# This makes the testsuite as a package and renames the monotone executable
+# to include the netsync suffix.
+do_install_append() {
+ install -d ${D}${tsd}
+ install -c -m 755 testsuite ${D}${tsd}/testsuite
+ cp -pPR tests ${D}${tsd}/tests
+ rm ${D}/home/monotone/monotone-6/tests/diff_a_binary_file/binary
+}
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
+tsd = "/home/monotone/${PN}"
+FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
+RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch perl perl-modules"
+
diff --git a/packages/poppler/poppler_0.6.2.bb b/packages/poppler/poppler_0.6.2.bb
new file mode 100644
index 0000000000..3c1ec00183
--- /dev/null
+++ b/packages/poppler/poppler_0.6.2.bb
@@ -0,0 +1,6 @@
+require poppler.inc
+
+PR = "r0"
+
+EXTRA_OECONF_append = " --disable-abiword-output "
+
diff --git a/packages/squid/squid-native_2.6.STABLE14.bb b/packages/squid/squid-native_2.6.STABLE14.bb
new file mode 100644
index 0000000000..c8c4258275
--- /dev/null
+++ b/packages/squid/squid-native_2.6.STABLE14.bb
@@ -0,0 +1,11 @@
+inherit native autotools
+
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
+S = "${WORKDIR}/squid-${PV}"
+
+inherit native autotools
+
+do_stage() {
+ install -d ${STAGING_BINDIR_NATIVE}
+ install -m 0755 src/cf_gen ${STAGING_BINDIR_NATIVE}/cf_gen
+}
diff --git a/packages/squid/squid_2.6.STABLE14.bb b/packages/squid/squid_2.6.STABLE14.bb
index 580ec52ac6..beef3ba2b0 100644
--- a/packages/squid/squid_2.6.STABLE14.bb
+++ b/packages/squid/squid_2.6.STABLE14.bb
@@ -1,11 +1,23 @@
DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
LICENSE = "GPLv2"
-DEPENDS = "aio"
+DEPENDS = "squid-native-${PV}"
-SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2"
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
inherit autotools
+EXTRA_OECONF = "--disable-epoll --disable-nls"
+do_configure_append() {
+ sed -i -e 's|./cf_gen |${STAGING_BINDIR_NATIVE}/cf_gen |g' src/Makefile
+}
+# this packages the languages better and saves some space, installs
+# English as errors default and the others in locale package
+
+FILES_${PN} += " ${datadir}/errors/English/* \
+ ${datadir}/icons/* \
+ ${datadir}/mib.txt"
+
+FILES_${PN}-locale += " ${datadir}/errors/* "
diff --git a/site/common-glibc b/site/common-glibc
index edbf4b41ee..1f9c967dff 100644
--- a/site/common-glibc
+++ b/site/common-glibc
@@ -33,3 +33,10 @@ mono_cv_uscore=${mono_cv_uscore=no}
# guile
ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes}
+# squid
+ac_cv_af_unix_large_dgram=${ac_cv_af_unix_large_dgram=yes}
+ac_cv_func_setresuid=${ac_cv_func_setresuid=yes}
+ac_cv_func_va_copy=${ac_cv_func_va_copy=yes}
+ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
+ac_cv_epoll_works=${ac_cv_epoll_works=yes}
+