From 3978f965991d248e7be44608aa4aba2c10bd343a Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Sun, 12 Mar 2006 22:24:41 +0000 Subject: subversion-1.2.0: dump PR --- packages/subversion/subversion_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb index e38777ec4e..01dec71be1 100644 --- a/packages/subversion/subversion_1.2.0.bb +++ b/packages/subversion/subversion_1.2.0.bb @@ -5,7 +5,7 @@ MAINTAINER = "Mustafa Yuecel " LICENSE = "Apache/BSD" HOMEPAGE = "http://subversion.tigris.org" -PR = "r0" +PR = "r1" SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1" -- cgit v1.2.3 From 6453c094986f362d29b8a31163e2261e5782f264 Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Mon, 13 Mar 2006 00:07:34 +0000 Subject: (re-)Addition of gnutls and libgcrypt packages/bumps, taking maintainership. Please report breakage to maintainer kthx. --- packages/gnutls/gnutls_1.3.5.bb | 28 ++++++++++++++++++++++++++++ packages/libgcrypt/libgcrypt_1.2.2.bb | 29 +++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 packages/gnutls/gnutls_1.3.5.bb create mode 100644 packages/libgcrypt/libgcrypt_1.2.2.bb diff --git a/packages/gnutls/gnutls_1.3.5.bb b/packages/gnutls/gnutls_1.3.5.bb new file mode 100644 index 0000000000..3455ff9779 --- /dev/null +++ b/packages/gnutls/gnutls_1.3.5.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "GNU Transport Layer Security Library" +DEPENDS = "zlib libgcrypt lzo" +MAINTAINER = "Eric Shattow " + +LICENSE = "LGPL" + +SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/devel/gnutls-${PV}.tar.bz2" + +inherit autotools +inherit binconfig + +PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" +FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" +FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" +FILES_${PN} = "${libdir}/libgnutls.so.*" +FILES_${PN}-bin = "${bindir}/gnutls-serv ${bindir}/gnutls-cli \ + ${bindir}/srptool ${bindir}/certtool ${bindir}/gnutls-srpcrypt" +FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug" + +EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1" + +do_stage() { + oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR} + oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR} + oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR} + autotools_stage_includes +} + diff --git a/packages/libgcrypt/libgcrypt_1.2.2.bb b/packages/libgcrypt/libgcrypt_1.2.2.bb new file mode 100644 index 0000000000..cd49d0b8fa --- /dev/null +++ b/packages/libgcrypt/libgcrypt_1.2.2.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "A general purpose cryptographic library based on the code from GnuPG" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL LGPL FDL" +DEPENDS = "libgpg-error" +MAINTAINER = "Eric Shattow " + +# move libgcrypt-config into -dev package +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" + +inherit autotools binconfig + +EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" + +do_stage() { + oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} + oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} + install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/ + + install -d ${STAGING_INCDIR}/ + for X in gcrypt.h gcrypt-module.h + do + install -m 0644 src/${X} ${STAGING_INCDIR}/${X} + done + +} -- cgit v1.2.3 From 261eb19e87ece7897d3f6d803028c8ace9f1c4a2 Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Mon, 13 Mar 2006 00:43:40 +0000 Subject: (re-)Adding updates to wpa-supplicant, myself as secondary maintainer to handle fixes on bugtracker. This is completely untested, breakage expected. Please report ASAP. --- packages/wpa-supplicant/files/defaults-sane | 8 ++ packages/wpa-supplicant/files/defconfig-gnutls | 157 +++++++++++++++++++++ .../wpa-supplicant/files/wpa_supplicant.conf-sane | 7 + packages/wpa-supplicant/wpa-supplicant_0.5.1.bb | 54 +++++++ 4 files changed, 226 insertions(+) create mode 100644 packages/wpa-supplicant/files/defaults-sane create mode 100644 packages/wpa-supplicant/files/defconfig-gnutls create mode 100644 packages/wpa-supplicant/files/wpa_supplicant.conf-sane create mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.1.bb diff --git a/packages/wpa-supplicant/files/defaults-sane b/packages/wpa-supplicant/files/defaults-sane new file mode 100644 index 0000000000..67c4cbddf8 --- /dev/null +++ b/packages/wpa-supplicant/files/defaults-sane @@ -0,0 +1,8 @@ +# Useful flags: +# -i Interface (required, unless specified in config) +# -D Wireless Driver +# -d Debugging (-dd for more) +# -q Quiet (-qq for more) + +CONFIG="/etc/wpa_supplicant.conf" +OPTIONS="-i eth1 -D wext" diff --git a/packages/wpa-supplicant/files/defconfig-gnutls b/packages/wpa-supplicant/files/defconfig-gnutls new file mode 100644 index 0000000000..c165343399 --- /dev/null +++ b/packages/wpa-supplicant/files/defconfig-gnutls @@ -0,0 +1,157 @@ +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cass, these lines should use += in order not +# to override previous values of the variables. + +CFLAGS = $(TARGET_CFLAGS) -I../hostapd -I../utils -I../driver/modules -Wall -MMD + +# for wpa_supplicant, wpa_cli +LIBS = $(TARGET_LDFLAGS) + +# for wpa_passphrase: +LIBS_p = $(TARGET_LDFLAGS) + + +# Uncomment following two lines and fix the paths if you have installed openssl +# in non-default location +#CFLAGS += -I/usr/local/openssl/include +#LIBS += -L/usr/local/openssl/lib + +# Example configuration for various cross-compilation platforms + +#### sveasoft (e.g., for Linksys WRT54G) ###################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS += -I../src/include -I../../src/router/openssl/include +#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl +############################################################################### + +#### openwrt (e.g., for Linksys WRT54G) ####################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ +# -I../WRT54GS/release/src/include +#LIBS = -lssl +############################################################################### + + +# Driver interface for Host AP driver +CONFIG_DRIVER_HOSTAP=y + +# Driver interface for Agere driver +CONFIG_DRIVER_HERMES=y + +# Driver interface for madwifi driver +#CONFIG_DRIVER_MADWIFI=y +# Change include directories to match with the local setup +#CFLAGS += -I../madwifi/wpa + +# Driver interface for Prism54 driver +#CONFIG_DRIVER_PRISM54=y + +# Driver interface for ndiswrapper +#CONFIG_DRIVER_NDISWRAPPER=y + +# Driver interface for Atmel driver +#CONFIG_DRIVER_ATMEL=y + +# Driver interface for Broadcom driver +#CONFIG_DRIVER_BROADCOM=y +# Example path for wlioctl.h; change to match your configuration +#CFLAGS += -I/opt/WRT54GS/release/src/include + +# Driver interface for Intel ipw2100 driver +#CONFIG_DRIVER_IPW2100=y + +# Driver interface for generic Linux wireless extensions +CONFIG_DRIVER_WEXT=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib + +# Driver interface for Windows NDIS +#CONFIG_DRIVER_NDIS=y +#CFLAGS += -I/usr/include/w32api/ddk +#LIBS += -L/usr/local/lib +# For native build using mingw +#CONFIG_NATIVE_WINDOWS=y +# Additional directories for cross-compilation on Linux host for mingw target +#CFLAGS += -I/opt/mingw/mingw32/include/ddk +#LIBS += -L/opt/mingw/mingw32/lib +#CC=mingw32-gcc + +# Driver interface for development testing +#CONFIG_DRIVER_TEST=y + +# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is +# included) +CONFIG_IEEE8021X_EAPOL=y + +# EAP-MD5 (automatically included if EAP-TTLS is enabled) +CONFIG_EAP_MD5=y + +# EAP-MSCHAPv2 (automatically included if EAP-PEAP is enabled) +CONFIG_EAP_MSCHAPV2=y + +# EAP-TLS +CONFIG_EAP_TLS=y + +# EAL-PEAP +CONFIG_EAP_PEAP=y + +# EAP-TTLS +CONFIG_EAP_TTLS=y + +# EAP-GTC +CONFIG_EAP_GTC=y + +# EAP-OTP +CONFIG_EAP_OTP=y + +# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) +#CONFIG_EAP_SIM=y + +# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# LEAP +CONFIG_EAP_LEAP=y + +# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) +#CONFIG_EAP_AKA=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# PC/SC interface for smartcards (USIM, GSM SIM) +# Enable this if EAP-SIM or EAP-AKA is included +#CONFIG_PCSC=y + +# Development testing +#CONFIG_EAPOL_TEST=y + +# Replace native Linux implementation of packet sockets with libdnet/libpcap. +# This will be automatically set for non-Linux OS. +#CONFIG_DNET_PCAP=y + +# Include control interface for external programs, e.g, wpa_cli +CONFIG_CTRL_IFACE=y + +# Include interface for using external supplicant (Xsupplicant) for EAP +# authentication +#CONFIG_XSUPPLICANT_IFACE=y + +# Include support for GNU Readline and History Libraries in wpa_cli. +# When building a wpa_cli binary for distribution, please note that these +# libraries are licensed under GPL and as such, BSD license may not apply for +# the resulting binary. +#CONFIG_READLINE=y diff --git a/packages/wpa-supplicant/files/wpa_supplicant.conf-sane b/packages/wpa-supplicant/files/wpa_supplicant.conf-sane new file mode 100644 index 0000000000..c91ffe0c84 --- /dev/null +++ b/packages/wpa-supplicant/files/wpa_supplicant.conf-sane @@ -0,0 +1,7 @@ +ctrl_interface=/var/run/wpa_supplicant +ctrl_interface_group=0 +update_config=1 + +network={ + key_mgmt=NONE +} diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb new file mode 100644 index 0000000000..ead598598c --- /dev/null +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." +SECTION = "network" +LICENSE = "GPL" +MAINTAINER = "Holger Schurig" +MAINTAINER = "Eric Shattow " +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +DEPENDS = "gnutls" +PR = "r1" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ + file://defconfig-gnutls \ + file://init.sh \ + file://defaults-sane \ + file://wpa_supplicant.conf-sane" + +S = "${WORKDIR}/wpa_supplicant-${PV}" + +PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli" +FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" +FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" + +RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" + +INITSCRIPT_NAME = "wpa" +INITSCRIPT_PARAMS = "defaults 10" +inherit update-rc.d + +do_configure () { + install -m 0755 ${WORKDIR}/defconfig-gnutls .config +} + +do_compile () { + make +} + +do_install () { + install -d ${D}${sbindir} + install -m755 wpa_supplicant ${D}${sbindir} + install -m755 wpa_passphrase ${D}${sbindir} + install -m755 wpa_cli ${D}${sbindir} + + install -d ${D}${localstatedir}/run/wpa_supplicant + + install -d ${D}${docdir}/wpa_supplicant + install -m644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant + + install -d ${D}${sysconfdir}/init.d + install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa + + install -d ${D}${sysconfdir}/default + install -m600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa + install -m600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf +} -- cgit v1.2.3 From 581beffb05246c92f3683d705f840b605ed6c9fe Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 13 Mar 2006 10:29:37 +0000 Subject: conf/documentation.conf: Document the HOST_NONSYSV variable introduced by emte packages/fakeroot/fakeroot-native: There are systems without SYSV stuff. Introduce a HOST_NONSYSV variable if you have such a host system. In this case fakeroot-native is build with tcp IPC. This fixes bug #735 and patch is courtsey nigel Kostiuck (emte) --- conf/documentation.conf | 1 + packages/fakeroot/fakeroot-native_1.2.13.bb | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/documentation.conf b/conf/documentation.conf index 19aaf2dd48..93cf911d02 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -20,6 +20,7 @@ HOST_VENDOR[doc] = "The name of the vendor. Normally same as the TARGET_VENDOR @ HOST_SYS[doc] = "FIXME" HOST_PREFIX[doc] = "Normally same as the TARGET_PREFIX @see TARGET_PREFIX @group base" HOST_CC_ARCH[doc] = "Normally same as the TARGET_CC_ARCH @see TARGET_CC_ARCH @group base" +HOST_NONSYSV[doc] = "Setable flag in local.conf to override SysV specific compiles when needed. 1 or 0 are usable values. See fakeroot-native for example." TARGET_ARCH[doc] = "Build for which architecture. Examples are arm, i686, sh3, mips, powerpc" TARGET_OS[doc] = "Build for which Operating System. Currently possible values are \ diff --git a/packages/fakeroot/fakeroot-native_1.2.13.bb b/packages/fakeroot/fakeroot-native_1.2.13.bb index 4df6eeb5c5..cc3dfd2231 100644 --- a/packages/fakeroot/fakeroot-native_1.2.13.bb +++ b/packages/fakeroot/fakeroot-native_1.2.13.bb @@ -6,7 +6,13 @@ inherit native SRC_URI += "file://fix-prefix.patch;patch=1" S = "${WORKDIR}/fakeroot-${PV}" -EXTRA_OECONF = "--program-prefix=" +EXTRA_OECONF = " --program-prefix=" + +# Compatability for the rare systems not using or having SYSV +python () { + if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0': + bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d) +} do_stage_append () { oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/ -- cgit v1.2.3 From 7ba75366e4a221fb44c0fe0b0766f768b2124565 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 13 Mar 2006 13:00:25 +0000 Subject: keylaunch: add new release 2.0.8 with libgpelaunch support. --- packages/keylaunch/keylaunch_2.0.8.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/keylaunch/keylaunch_2.0.8.bb diff --git a/packages/keylaunch/keylaunch_2.0.8.bb b/packages/keylaunch/keylaunch_2.0.8.bb new file mode 100644 index 0000000000..b509e450ee --- /dev/null +++ b/packages/keylaunch/keylaunch_2.0.8.bb @@ -0,0 +1,20 @@ +inherit gpe + +DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch" +SECTION = "gpe" +LICENSE = "GPL" +DESCRIPTION = "A small utility for binding commands to a hot key.\ + Keylaunch is a minimal utility for associating commands with hot keys. This\ + GPE version is intended for use with the special keys found on most handheld\ + computers. You can connect each key to a program of your choice; if the\ + program is already running, keylaunch can bring its window to the front\ + rather than just running another copy." +PR = "r0" + +SRC_URI += " file://keylaunchrc" + +do_install_prepend () { + install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc +} + +export CVSBUILD="no" -- cgit v1.2.3 From 81c508660a049fd10614d22c42bbb99c32d0fd9a Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Mon, 13 Mar 2006 14:21:20 +0000 Subject: local.conf.sample: add hints on ENABLE_BINARY_LOCALE_GENERATION and qemu-native --- conf/local.conf.sample | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index cbe829c2a1..9ea8897bff 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -78,6 +78,16 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Stay away from unversioned distros unless you really know what you are doing # DISTRO = "familiar-unstable" +# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION +# to generate binary locale packages at build time using qemu-native and +# thereby guarantee i18n support on all devices. If your build breaks on +# qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that +# this breaks i18n on devices with less than 128MB RAM) or installing +# a working third-party qemu (e.g. provided by your distribution) and +# adding qemu-native to ASSUME_PROVIDED +# ENABLE_BINARY_LOCALE_GENERATION = "0" +# ASSUME_PROVIDED += "qemu-native" + # Uncomment this to select a particular kernel version if supported by # your MACHINE setting. Currently only supported on Zaurus Clamshells. # KERNEL_VERSION = "2.6" -- cgit v1.2.3 From 3e3ea613f611b6e3f803c9de21c8420471428601 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 13 Mar 2006 16:33:07 +0000 Subject: libxfont_X11R7.0-1.0.0: add freetype to DEPENDS --- packages/xlibs/libxfont_X11R7.0-1.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb index 9b154a0e9a..c4614e8d78 100644 --- a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb +++ b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" #MAINTAINER = "" LICENSE = "BSD-X" -DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc" +DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc freetype" PROVIDES = "xfont" SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2" -- cgit v1.2.3 From e640ad5285f3ce95c44fc4d0f07aa5535697c6b5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 13 Mar 2006 17:12:24 +0000 Subject: xserver-kdrive_{20060312,cvs}: add videoproto to DEPENDS, a tinderbox build failed with a missing Xv.h --- packages/xserver/xserver-kdrive_20060312.bb | 2 +- packages/xserver/xserver-kdrive_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xserver/xserver-kdrive_20060312.bb index 9c763dbfed..e73e7659bf 100644 --- a/packages/xserver/xserver-kdrive_20060312.bb +++ b/packages/xserver/xserver-kdrive_20060312.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb index f049c8cae0..8911a5696d 100644 --- a/packages/xserver/xserver-kdrive_cvs.bb +++ b/packages/xserver/xserver-kdrive_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" -- cgit v1.2.3 From d18480957995a380690d238dcf6d49344668baf7 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 13 Mar 2006 20:30:46 +0000 Subject: xserver-kdrive_{20060312,cvs}: add scrnsaverproto to DEPENDS --- packages/xserver/xserver-kdrive_20060312.bb | 2 +- packages/xserver/xserver-kdrive_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xserver/xserver-kdrive_20060312.bb index e73e7659bf..e5101a3579 100644 --- a/packages/xserver/xserver-kdrive_20060312.bb +++ b/packages/xserver/xserver-kdrive_20060312.bb @@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" DEFAULT_PREFERENCE = "1" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb index 8911a5696d..1c841cabf7 100644 --- a/packages/xserver/xserver-kdrive_cvs.bb +++ b/packages/xserver/xserver-kdrive_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto" +DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" -- cgit v1.2.3 From 1c96ab708b665418931bfbceecfc7b4ff1ade04e Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Mon, 13 Mar 2006 23:18:43 +0000 Subject: neon-0.26.0: enabled https support - add gnutls to DEPENDS - set DEFAULT_PREFERENCES = "-1" --- packages/neon/neon_0.24.7.bb | 4 ++-- packages/neon/neon_0.26.0.bb | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 packages/neon/neon_0.26.0.bb diff --git a/packages/neon/neon_0.24.7.bb b/packages/neon/neon_0.24.7.bb index 534b4d099d..2fba9ea0ed 100644 --- a/packages/neon/neon_0.24.7.bb +++ b/packages/neon/neon_0.24.7.bb @@ -5,12 +5,12 @@ DEPENDS = "zlib libxml2 expat time" PR = "r2" -SRC_URI = "http://www.webdav.org/neon/neon-0.24.7.tar.gz \ +SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \ file://no-func-checks.patch;patch=1" inherit autotools binconfig lib_package -EXTRA_OECONF = " --without-ssl --with-libxml2 --with-expat --enable-shared" +EXTRA_OECONF = "--without-ssl --with-libxml2 --with-expat --enable-shared" do_stage () { autotools_stage_includes diff --git a/packages/neon/neon_0.26.0.bb b/packages/neon/neon_0.26.0.bb new file mode 100644 index 0000000000..95449c2171 --- /dev/null +++ b/packages/neon/neon_0.26.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface." +SECTION = "base" +LICENSE = "LGPL" +DEPENDS = "zlib libxml2 expat time gnutls" + +PR = "r0" + +DEFAULT_PREFERENCES = "-1" + +SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" + +inherit autotools binconfig lib_package + +EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" + +do_stage () { + autotools_stage_includes + oe_libinstall -C src -so -a libneon ${STAGING_LIBDIR}/ +} -- cgit v1.2.3 From b8acb2c47882b187f34f80919cb776648c734157 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 13 Mar 2006 23:25:05 +0000 Subject: classes/tinderclient.bbclass: Use the MultipleProvider and NoProvider Event to create reports to the TinderBox. The message format can be improved now we at least know if a build failed due a missing provider --- classes/tinderclient.bbclass | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 1be7bf8c33..e98edb4777 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,9 +1,6 @@ def tinder_form_data(bound, dict, log): - """ - Create the boundary for the HTTP Post - """ output = [] - + #br # for each key in the dictionary for name in dict: output.append( "--" + bound ) @@ -257,7 +254,7 @@ def tinder_do_tinder_report(event): name = getName(event) log = "" status = 1 - + #print asd # Check what we need to do Build* shows we start or are done if name == "BuildStarted": tinder_build_start(event.data) @@ -295,8 +292,18 @@ def tinder_do_tinder_report(event): log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('P', event.data, True) status = 200 elif name == "BuildCompleted": - log += "Build Completed\n" + log += "Build Completed\n" status = 100 + elif name == "MultipleProviders": + log += "<--- TINDERBOX Multiple Providers\n" + log += "multiple providers are available (%s);\n" % ", ".join(event.getCandidates()) + log += "consider defining PREFERRED_PROVIDER_%s\n" % event.getItem() + log += "is runtime: %d" % event.isRuntime() + log += "---> TINDERBOX Multiple Providers\n" + elif name == "NoProvider": + log += "Error: No Provider for: %s\n" % event.getItem() + log += "Error:Was Runtime: %d\n" % event.isRuntime() + status = 200 # now post the log if len(log) == 0: @@ -312,7 +319,6 @@ addhandler tinderclient_eventhandler python tinderclient_eventhandler() { from bb import note, error, data from bb.event import NotHandled - do_tinder_report = data.getVar('TINDER_REPORT', e.data, True) if do_tinder_report and do_tinder_report == "1": tinder_do_tinder_report(e) -- cgit v1.2.3 From 3bc624d4c8f27a4b324d15cd952c64c2fca466b5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 13 Mar 2006 23:37:52 +0000 Subject: conf/bitbake.conf: cpio calls makeinfo which is part of texinfo on my Ubuntu installation. This is why I add texinfo-native as ASSUMED_PROVIDED package to bitbake.conf. --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 6afd6ca2cd..a2ba5e6382 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}" # python-native should be here but python relies on building # its own in staging -ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime" +ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native" ################################################################## # Package default variables. -- cgit v1.2.3 From f598a0dc6bb7fe19821df20c09f652ed6e96f789 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 13 Mar 2006 23:40:43 +0000 Subject: packages/cpio/cpio_2.5.bb: Add texinfo-native to the DEPENDS of this package as makeinfo is used in do_install --- packages/cpio/cpio_2.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cpio/cpio_2.5.bb b/packages/cpio/cpio_2.5.bb index e7ee85e001..a625dd7fd5 100644 --- a/packages/cpio/cpio_2.5.bb +++ b/packages/cpio/cpio_2.5.bb @@ -5,6 +5,8 @@ LICENSE = "GPL" MAINTAINER = "Chris Larson " PR = "r3" +DEPENDS += " texinfo-native " + SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://install.patch;patch=1" S = "${WORKDIR}/cpio-${PV}" -- cgit v1.2.3 From 7f82236e556466d048c3871945a7e586911c47b5 Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Tue, 14 Mar 2006 01:37:05 +0000 Subject: neon-0.26.0: fixed typo, thanks to Justin Patrin --- packages/neon/neon_0.26.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/neon/neon_0.26.0.bb b/packages/neon/neon_0.26.0.bb index 95449c2171..4a16a3cfad 100644 --- a/packages/neon/neon_0.26.0.bb +++ b/packages/neon/neon_0.26.0.bb @@ -5,7 +5,7 @@ DEPENDS = "zlib libxml2 expat time gnutls" PR = "r0" -DEFAULT_PREFERENCES = "-1" +DEFAULT_PREFERENCE = "-1" SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" -- cgit v1.2.3 From f09191891573d5a4992cf9238463805fc1090ee5 Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Tue, 14 Mar 2006 07:16:35 +0000 Subject: Pushing gcc 4.1.0 after a short review. Not sure if it builds, leaving preference at "-1". See OE bug #378. Thanks to Bernhard Rosenkraenzer for the submission. See OE bug #773. --- packages/gcc/gcc-4.1.0/.mtn2git_empty | 0 packages/gcc/gcc-4.1.0/arm-nolibfloat.patch | 24 +++++++++++++++++++++++ packages/gcc/gcc-4.1.0/arm-softfloat.patch | 16 +++++++++++++++ packages/gcc/gcc-4.1.0/ldflags.patch | 22 +++++++++++++++++++++ packages/gcc/gcc-cross-initial_4.1.0.bb | 30 +++++++++++++++++++++++++++++ packages/gcc/gcc-cross_4.1.0.bb | 16 +++++++++++++++ packages/gcc/gcc_4.1.0.bb | 17 ++++++++++++++++ 7 files changed, 125 insertions(+) create mode 100644 packages/gcc/gcc-4.1.0/.mtn2git_empty create mode 100644 packages/gcc/gcc-4.1.0/arm-nolibfloat.patch create mode 100644 packages/gcc/gcc-4.1.0/arm-softfloat.patch create mode 100644 packages/gcc/gcc-4.1.0/ldflags.patch create mode 100644 packages/gcc/gcc-cross-initial_4.1.0.bb create mode 100644 packages/gcc/gcc-cross_4.1.0.bb create mode 100644 packages/gcc/gcc_4.1.0.bb diff --git a/packages/gcc/gcc-4.1.0/.mtn2git_empty b/packages/gcc/gcc-4.1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.1.0/arm-nolibfloat.patch b/packages/gcc/gcc-4.1.0/arm-nolibfloat.patch new file mode 100644 index 0000000000..c4897c0330 --- /dev/null +++ b/packages/gcc/gcc-4.1.0/arm-nolibfloat.patch @@ -0,0 +1,24 @@ +# Dimitry Andric , 2004-05-01 +# +# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed +# anymore. (The required functions are now in libgcc.) +# +# Fixes errors like +# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat +# collect2: ld returned 1 exit status +# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1 +# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat + +Index: gcc-4.0.2/gcc/config/arm/linux-elf.h +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h 2005-03-04 16:14:01.000000000 +0000 ++++ gcc-4.0.2/gcc/config/arm/linux-elf.h 2005-11-11 18:02:54.000000000 +0000 +@@ -56,7 +56,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add + the GNU/Linux magical crtbegin.o file (see crtstuff.c) which diff --git a/packages/gcc/gcc-4.1.0/arm-softfloat.patch b/packages/gcc/gcc-4.1.0/arm-softfloat.patch new file mode 100644 index 0000000000..c86c83ed15 --- /dev/null +++ b/packages/gcc/gcc-4.1.0/arm-softfloat.patch @@ -0,0 +1,16 @@ +Index: gcc-4.0.2/gcc/config/arm/t-linux +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/t-linux 2004-05-15 12:41:35.000000000 +0000 ++++ gcc-4.0.2/gcc/config/arm/t-linux 2005-11-11 16:07:53.000000000 +0000 +@@ -4,7 +4,10 @@ + LIBGCC2_DEBUG_CFLAGS = -g0 + + LIB1ASMSRC = arm/lib1funcs.asm +-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx ++LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ ++ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ ++ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ ++ _fixsfsi _fixunssfsi _floatdidf _floatdisf + + # MULTILIB_OPTIONS = mhard-float/msoft-float + # MULTILIB_DIRNAMES = hard-float soft-float diff --git a/packages/gcc/gcc-4.1.0/ldflags.patch b/packages/gcc/gcc-4.1.0/ldflags.patch new file mode 100644 index 0000000000..9576f60778 --- /dev/null +++ b/packages/gcc/gcc-4.1.0/ldflags.patch @@ -0,0 +1,22 @@ +--- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100 ++++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100 +@@ -334,7 +334,7 @@ + CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) + LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates +-LDFLAGS_FOR_TARGET = ++LDFLAGS_FOR_TARGET = @LDFLAGS@ + PICFLAG_FOR_TARGET = + + # ------------------------------------ +--- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100 ++++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100 +@@ -337,7 +337,7 @@ + CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) + LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates +-LDFLAGS_FOR_TARGET = ++LDFLAGS_FOR_TARGET = @LDFLAGS@ + PICFLAG_FOR_TARGET = + + # ------------------------------------ diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb new file mode 100644 index 0000000000..63308c2cfe --- /dev/null +++ b/packages/gcc/gcc-cross-initial_4.1.0.bb @@ -0,0 +1,30 @@ +include gcc-cross_${PV}.bb + +DEPENDS = "virtual/${TARGET_PREFIX}binutils" +DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" +PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" +PACKAGES = "" + +# This is intended to be a -very- basic config +EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ + --with-newlib \ + --disable-shared \ + --disable-threads \ + --disable-multilib \ + --disable-__cxa_atexit \ + --disable-libmudflap \ + --disable-libssp \ + --enable-languages=c \ + --enable-target-optspace \ + --program-prefix=${TARGET_PREFIX} \ + ${@get_gcc_fpu_setting(bb, d)}" + +do_stage_prepend () { + mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV} + ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a +} + +# Override the method from gcc-cross so we don't try to install libgcc +do_install () { + oe_runmake 'DESTDIR=${D}' install +} diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb new file mode 100644 index 0000000000..6e299e8299 --- /dev/null +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -0,0 +1,16 @@ +include gcc_${PV}.bb +# path mangling, needed by the cross packaging +include gcc-paths-cross.inc +inherit cross +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +# NOTE: split PR. If the main .oe changes something that affects its *build* +# remember to increment this one too. +PR = "r1" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" +PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +# cross build +include gcc3-build-cross.inc +# cross packaging +include gcc-package-cross.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb new file mode 100644 index 0000000000..8bd3640fd8 --- /dev/null +++ b/packages/gcc/gcc_4.1.0.bb @@ -0,0 +1,17 @@ +PR = "r0" +DESCRIPTION = "The GNU cc and gcc C compilers." +HOMEPAGE = "http://www.gnu.org/software/gcc/" +SECTION = "devel" +LICENSE = "GPL" +DEFAULT_PREFERENCE = "-1" + +inherit autotools gettext + +include gcc-package.inc + +SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ + file://arm-nolibfloat.patch;patch=1 \ + file://arm-softfloat.patch;patch=1 \ + file://ldflags.patch;patch=1" + +include gcc4-build.inc -- cgit v1.2.3 From bc0b94d8fcfa91070076b7dd6675e879f13a8f87 Mon Sep 17 00:00:00 2001 From: Joseph Cole Date: Tue, 14 Mar 2006 07:29:08 +0000 Subject: Pushing glibc 2.4 per OE bug ticket #741. Thanks to Bernhard Rosenkraenzer for the patch. Not including CVS modifications, reference bug report if they are needed, or add them yourself. This is not tested, setting preference to "-1". --- packages/glibc/glibc-2.4/.mtn2git_empty | 0 packages/glibc/glibc-2.4/arm-longlong.patch | 58 ++ packages/glibc/glibc-2.4/arm-memcpy.patch | 758 +++++++++++++++++++++ packages/glibc/glibc-2.4/dl-cache-libcmp.patch | 10 + .../glibc/glibc-2.4/dyn-ldconfig-20041128.patch | 22 + packages/glibc/glibc-2.4/dyn-ldconfig.patch | 62 ++ packages/glibc/glibc-2.4/etc/.mtn2git_empty | 0 packages/glibc/glibc-2.4/etc/ld.so.conf | 3 + packages/glibc/glibc-2.4/generic-bits_select.h | 35 + packages/glibc/glibc-2.4/generic-bits_time.h | 75 ++ packages/glibc/glibc-2.4/generic-bits_types.h | 200 ++++++ packages/glibc/glibc-2.4/generic-bits_typesizes.h | 66 ++ packages/glibc/glibc-2.4/glibc-2.4-compile.patch | 29 + packages/glibc/glibc-2.4/ldsocache-varrun.patch | 18 + packages/glibc/glibc-2.4/nptl-crosscompile.patch | 26 + packages/glibc/glibc-initial_2.4.bb | 46 ++ packages/glibc/glibc-intermediate_2.4.bb | 14 + packages/glibc/glibc_2.4.bb | 204 ++++++ 18 files changed, 1626 insertions(+) create mode 100644 packages/glibc/glibc-2.4/.mtn2git_empty create mode 100644 packages/glibc/glibc-2.4/arm-longlong.patch create mode 100644 packages/glibc/glibc-2.4/arm-memcpy.patch create mode 100644 packages/glibc/glibc-2.4/dl-cache-libcmp.patch create mode 100644 packages/glibc/glibc-2.4/dyn-ldconfig-20041128.patch create mode 100644 packages/glibc/glibc-2.4/dyn-ldconfig.patch create mode 100644 packages/glibc/glibc-2.4/etc/.mtn2git_empty create mode 100644 packages/glibc/glibc-2.4/etc/ld.so.conf create mode 100644 packages/glibc/glibc-2.4/generic-bits_select.h create mode 100644 packages/glibc/glibc-2.4/generic-bits_time.h create mode 100644 packages/glibc/glibc-2.4/generic-bits_types.h create mode 100644 packages/glibc/glibc-2.4/generic-bits_typesizes.h create mode 100644 packages/glibc/glibc-2.4/glibc-2.4-compile.patch create mode 100644 packages/glibc/glibc-2.4/ldsocache-varrun.patch create mode 100644 packages/glibc/glibc-2.4/nptl-crosscompile.patch create mode 100644 packages/glibc/glibc-initial_2.4.bb create mode 100644 packages/glibc/glibc-intermediate_2.4.bb create mode 100644 packages/glibc/glibc_2.4.bb diff --git a/packages/glibc/glibc-2.4/.mtn2git_empty b/packages/glibc/glibc-2.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/glibc/glibc-2.4/arm-longlong.patch b/packages/glibc/glibc-2.4/arm-longlong.patch new file mode 100644 index 0000000000..320a55524c --- /dev/null +++ b/packages/glibc/glibc-2.4/arm-longlong.patch @@ -0,0 +1,58 @@ +--- glibc-2.4/stdlib/longlong.h.ark 2006-03-11 22:49:27.000000000 +0100 ++++ glibc-2.4/stdlib/longlong.h 2006-03-11 22:55:12.000000000 +0100 +@@ -206,6 +206,14 @@ + "rI" ((USItype) (bh)), \ + "r" ((USItype) (al)), \ + "rI" ((USItype) (bl)) __CLOBBER_CC) ++/* v3m and all higher arches have long multiply support. */ ++#if !defined(__ARM_ARCH_2__) && !defined(__ARM_ARCH_3__) ++#define umul_ppmm(xh, xl, a, b) \ ++ __asm__ ("umull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b)) ++#define UMUL_TIME 5 ++#define smul_ppmm(xh, xl, a, b) \ ++ __asm__ ("smull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b)) ++#else + #define umul_ppmm(xh, xl, a, b) \ + {register USItype __t0, __t1, __t2; \ + __asm__ ("%@ Inlined umul_ppmm\n" \ +@@ -227,7 +235,13 @@ + : "r" ((USItype) (a)), \ + "r" ((USItype) (b)) __CLOBBER_CC );} + #define UMUL_TIME 20 ++#endif + #define UDIV_TIME 100 ++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) ++#define count_leading_zeros(COUNT,X) ((COUNT) = __builtin_clz (X)) ++#define COUNT_LEADING_ZEROS_0 32 ++#endif ++ + #endif /* __arm__ */ + + #if defined (__hppa) && W_TYPE_SIZE == 32 +--- glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c.ark 2006-03-11 22:56:43.000000000 +0100 ++++ glibc-2.4/ports/sysdeps/arm/mp_clz_tab.c 2006-03-11 22:58:19.000000000 +0100 +@@ -0,0 +1,24 @@ ++/* __clz_tab -- support for longlong.h ++ Copyright (C) 2004 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) ++/* Nothing required. */ ++#else ++#include ++#endif diff --git a/packages/glibc/glibc-2.4/arm-memcpy.patch b/packages/glibc/glibc-2.4/arm-memcpy.patch new file mode 100644 index 0000000000..bc2b3dab84 --- /dev/null +++ b/packages/glibc/glibc-2.4/arm-memcpy.patch @@ -0,0 +1,758 @@ +--- /dev/null 2004-02-02 20:32:13.000000000 +0000 ++++ sysdeps/arm/memmove.S 2004-03-20 18:37:23.000000000 +0000 +@@ -0,0 +1,251 @@ ++/* ++ * Optimized memmove implementation for ARM processors ++ * ++ * Author: Nicolas Pitre ++ * Created: Dec 23, 2003 ++ * Copyright: (C) MontaVista Software, Inc. ++ * ++ * This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ */ ++ ++#include ++ ++ ++/* ++ * Endian independent macros for shifting bytes within registers. ++ */ ++#ifndef __ARMEB__ ++#define pull lsr ++#define push lsl ++#else ++#define pull lsl ++#define push lsr ++#endif ++ ++/* ++ * Enable data preload for architectures that support it (ARMv5 and above) ++ */ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif ++ ++ ++/* char * memmove (char *dst, const char *src) */ ++ENTRY(memmove) ++ subs ip, r0, r1 ++ cmphi r2, ip ++ bls memcpy(PLT) ++ ++ stmfd sp!, {r0, r4, lr} ++ add r1, r1, r2 ++ add r0, r0, r2 ++ subs r2, r2, #4 ++ blt 25f ++ ands ip, r0, #3 ++ PLD( pld [r1, #-4] ) ++ bne 26f ++ ands ip, r1, #3 ++ bne 27f ++ ++19: subs r2, r2, #4 ++ blt 24f ++ subs r2, r2, #8 ++ blt 23f ++ subs r2, r2, #16 ++ blt 22f ++ ++ PLD( pld [r1, #-32] ) ++ PLD( subs r2, r2, #96 ) ++ stmfd sp!, {r5 - r8} ++ PLD( blt 21f ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, r1, #31 ) ++ PLD( pld [r1, #-64] ) ++ PLD( beq 20f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #-96] ) ++ PLD( blt 20f ) ++ PLD( cmp ip, #16 ) ++ PLD( sub r2, r2, ip ) ++ PLD( ldmgedb r1!, {r3 - r6} ) ++ PLD( stmgedb r0!, {r3 - r6} ) ++ PLD( beq 20f ) ++ PLD( and ip, ip, #15 ) ++ PLD( cmp ip, #8 ) ++ PLD( ldr r3, [r1, #-4]! ) ++ PLD( ldrge r4, [r1, #-4]! ) ++ PLD( ldrgt r5, [r1, #-4]! ) ++ PLD( str r3, [r0, #-4]! ) ++ PLD( strge r4, [r0, #-4]! ) ++ PLD( strgt r5, [r0, #-4]! ) ++ ++20: PLD( pld [r1, #-96] ) ++ PLD( pld [r1, #-128] ) ++21: ldmdb r1!, {r3, r4, ip, lr} ++ subs r2, r2, #32 ++ stmdb r0!, {r3, r4, ip, lr} ++ ldmdb r1!, {r3, r4, ip, lr} ++ stmgedb r0!, {r3, r4, ip, lr} ++ ldmgedb r1!, {r3, r4, ip, lr} ++ stmgedb r0!, {r3, r4, ip, lr} ++ ldmgedb r1!, {r3, r4, ip, lr} ++ subges r2, r2, #32 ++ stmdb r0!, {r3, r4, ip, lr} ++ bge 20b ++ PLD( cmn r2, #96 ) ++ PLD( bge 21b ) ++ PLD( add r2, r2, #96 ) ++ tst r2, #31 ++ ldmfd sp!, {r5 - r8} ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ tst r2, #16 ++22: ldmnedb r1!, {r3, r4, ip, lr} ++ stmnedb r0!, {r3, r4, ip, lr} ++ ++ tst r2, #8 ++23: ldmnedb r1!, {r3, r4} ++ stmnedb r0!, {r3, r4} ++ ++ tst r2, #4 ++24: ldrne r3, [r1, #-4]! ++ strne r3, [r0, #-4]! ++ ++25: ands r2, r2, #3 ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ cmp r2, #2 ++ ldrb r3, [r1, #-1] ++ ldrgeb r4, [r1, #-2] ++ ldrgtb ip, [r1, #-3] ++ strb r3, [r0, #-1] ++ strgeb r4, [r0, #-2] ++ strgtb ip, [r0, #-3] ++ ldmfd sp!, {r0, r4, pc} ++ ++26: cmp ip, #2 ++ ldrb r3, [r1, #-1]! ++ ldrgeb r4, [r1, #-1]! ++ ldrgtb lr, [r1, #-1]! ++ strb r3, [r0, #-1]! ++ strgeb r4, [r0, #-1]! ++ strgtb lr, [r0, #-1]! ++ subs r2, r2, ip ++ blt 25b ++ ands ip, r1, #3 ++ beq 19b ++ ++27: bic r1, r1, #3 ++ cmp ip, #2 ++ ldr r3, [r1] ++ beq 35f ++ blt 36f ++ ++ ++ .macro backward_copy_shift push pull ++ ++ cmp r2, #12 ++ PLD( pld [r1, #-4] ) ++ blt 33f ++ subs r2, r2, #28 ++ stmfd sp!, {r5 - r9} ++ blt 31f ++ ++ PLD( subs r2, r2, #96 ) ++ PLD( pld [r1, #-32] ) ++ PLD( blt 30f ) ++ PLD( pld [r1, #-64] ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, r1, #31 ) ++ PLD( pld [r1, #-96] ) ++ PLD( beq 29f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #-128] ) ++ PLD( blt 29f ) ++ PLD( sub r2, r2, ip ) ++28: PLD( mov r4, r3, push #\push ) ++ PLD( ldr r3, [r1, #-4]! ) ++ PLD( subs ip, ip, #4 ) ++ PLD( orr r4, r4, r3, pull #\pull ) ++ PLD( str r4, [r0, #-4]! ) ++ PLD( bgt 28b ) ++ ++29: PLD( pld [r1, #-128] ) ++30: mov lr, r3, push #\push ++ ldmdb r1!, {r3 - r9, ip} ++ subs r2, r2, #32 ++ orr lr, lr, ip, pull #\pull ++ mov ip, ip, push #\push ++ orr ip, ip, r9, pull #\pull ++ mov r9, r9, push #\push ++ orr r9, r9, r8, pull #\pull ++ mov r8, r8, push #\push ++ orr r8, r8, r7, pull #\pull ++ mov r7, r7, push #\push ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb r0!, {r4 - r9, ip, lr} ++ bge 29b ++ PLD( cmn r2, #96 ) ++ PLD( bge 30b ) ++ PLD( add r2, r2, #96 ) ++ cmn r2, #16 ++ blt 32f ++31: mov r7, r3, push #\push ++ ldmdb r1!, {r3 - r6} ++ sub r2, r2, #16 ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb r0!, {r4 - r7} ++32: adds r2, r2, #28 ++ ldmfd sp!, {r5 - r9} ++ blt 34f ++33: mov r4, r3, push #\push ++ ldr r3, [r1, #-4]! ++ subs r2, r2, #4 ++ orr r4, r4, r3, pull #\pull ++ str r4, [r0, #-4]! ++ bge 33b ++34: ++ .endm ++ ++ ++ backward_copy_shift push=8 pull=24 ++ add r1, r1, #3 ++ b 25b ++ ++35: backward_copy_shift push=16 pull=16 ++ add r1, r1, #2 ++ b 25b ++ ++36: backward_copy_shift push=24 pull=8 ++ add r1, r1, #1 ++ b 25b ++ ++ .size memmove, . - memmove ++END(memmove) ++libc_hidden_builtin_def (memmove) +--- /dev/null 2004-02-02 20:32:13.000000000 +0000 ++++ sysdeps/arm/bcopy.S 2004-03-20 18:37:48.000000000 +0000 +@@ -0,0 +1,255 @@ ++/* ++ * Optimized memmove implementation for ARM processors ++ * ++ * Author: Nicolas Pitre ++ * Created: Dec 23, 2003 ++ * Copyright: (C) MontaVista Software, Inc. ++ * ++ * This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ */ ++ ++#include ++ ++ ++/* ++ * Endian independent macros for shifting bytes within registers. ++ */ ++#ifndef __ARMEB__ ++#define pull lsr ++#define push lsl ++#else ++#define pull lsl ++#define push lsr ++#endif ++ ++/* ++ * Enable data preload for architectures that support it (ARMv5 and above) ++ */ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif ++ ++dst .req r1 ++src .req r0 ++ ++/* void *bcopy (const char *src, char *dst, size_t size) */ ++ENTRY(bcopy) ++ subs ip, dst, src ++ cmphi r2, ip ++ movls r3, r0 ++ movls r0, r1 ++ movls r1, r3 ++ bls memcpy(PLT) ++ ++ stmfd sp!, {r4, lr} ++ add src, src, r2 ++ add dst, dst, r2 ++ subs r2, r2, #4 ++ blt 25f ++ ands ip, dst, #3 ++ PLD( pld [src, #-4] ) ++ bne 26f ++ ands ip, src, #3 ++ bne 27f ++ ++19: subs r2, r2, #4 ++ blt 24f ++ subs r2, r2, #8 ++ blt 23f ++ subs r2, r2, #16 ++ blt 22f ++ ++ PLD( pld [src, #-32] ) ++ PLD( subs r2, r2, #96 ) ++ stmfd sp!, {r5 - r8} ++ PLD( blt 21f ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, src, #31 ) ++ PLD( pld [src, #-64] ) ++ PLD( beq 20f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [src, #-96] ) ++ PLD( blt 20f ) ++ PLD( cmp ip, #16 ) ++ PLD( sub r2, r2, ip ) ++ PLD( ldmgedb src!, {r3 - r6} ) ++ PLD( stmgedb dst!, {r3 - r6} ) ++ PLD( beq 20f ) ++ PLD( and ip, ip, #15 ) ++ PLD( cmp ip, #8 ) ++ PLD( ldr r3, [src, #-4]! ) ++ PLD( ldrge r4, [src, #-4]! ) ++ PLD( ldrgt r5, [src, #-4]! ) ++ PLD( str r3, [dst, #-4]! ) ++ PLD( strge r4, [dst, #-4]! ) ++ PLD( strgt r5, [dst, #-4]! ) ++ ++20: PLD( pld [src, #-96] ) ++ PLD( pld [src, #-128] ) ++21: ldmdb src!, {r3, r4, ip, lr} ++ subs r2, r2, #32 ++ stmdb dst!, {r3, r4, ip, lr} ++ ldmdb src!, {r3, r4, ip, lr} ++ stmgedb dst!, {r3, r4, ip, lr} ++ ldmgedb src!, {r3, r4, ip, lr} ++ stmgedb dst!, {r3, r4, ip, lr} ++ ldmgedb src!, {r3, r4, ip, lr} ++ subges r2, r2, #32 ++ stmdb dst!, {r3, r4, ip, lr} ++ bge 20b ++ PLD( cmn r2, #96 ) ++ PLD( bge 21b ) ++ PLD( add r2, r2, #96 ) ++ tst r2, #31 ++ ldmfd sp!, {r5 - r8} ++ ldmeqfd sp!, {r4, pc} ++ ++ tst r2, #16 ++22: ldmnedb src!, {r3, r4, ip, lr} ++ stmnedb dst!, {r3, r4, ip, lr} ++ ++ tst r2, #8 ++23: ldmnedb src!, {r3, r4} ++ stmnedb dst!, {r3, r4} ++ ++ tst r2, #4 ++24: ldrne r3, [src, #-4]! ++ strne r3, [dst, #-4]! ++ ++25: ands r2, r2, #3 ++ ldmeqfd sp!, {dst, r4, pc} ++ ++ cmp r2, #2 ++ ldrb r3, [src, #-1] ++ ldrgeb r4, [src, #-2] ++ ldrgtb ip, [src, #-3] ++ strb r3, [dst, #-1] ++ strgeb r4, [dst, #-2] ++ strgtb ip, [dst, #-3] ++ ldmfd sp!, {dst, r4, pc} ++ ++26: cmp ip, #2 ++ ldrb r3, [src, #-1]! ++ ldrgeb r4, [src, #-1]! ++ ldrgtb lr, [src, #-1]! ++ strb r3, [dst, #-1]! ++ strgeb r4, [dst, #-1]! ++ strgtb lr, [dst, #-1]! ++ subs r2, r2, ip ++ blt 25b ++ ands ip, src, #3 ++ beq 19b ++ ++27: bic src, src, #3 ++ cmp ip, #2 ++ ldr r3, [src] ++ beq 35f ++ blt 36f ++ ++ ++ .macro backward_copy_shift push pull ++ ++ cmp r2, #12 ++ PLD( pld [src, #-4] ) ++ blt 33f ++ subs r2, r2, #28 ++ stmfd sp!, {r5 - r9} ++ blt 31f ++ ++ PLD( subs r2, r2, #96 ) ++ PLD( pld [src, #-32] ) ++ PLD( blt 30f ) ++ PLD( pld [src, #-64] ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, src, #31 ) ++ PLD( pld [src, #-96] ) ++ PLD( beq 29f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [src, #-128] ) ++ PLD( blt 29f ) ++ PLD( sub r2, r2, ip ) ++28: PLD( mov r4, r3, push #\push ) ++ PLD( ldr r3, [src, #-4]! ) ++ PLD( subs ip, ip, #4 ) ++ PLD( orr r4, r4, r3, pull #\pull ) ++ PLD( str r4, [dst, #-4]! ) ++ PLD( bgt 28b ) ++ ++29: PLD( pld [src, #-128] ) ++30: mov lr, r3, push #\push ++ ldmdb src!, {r3 - r9, ip} ++ subs r2, r2, #32 ++ orr lr, lr, ip, pull #\pull ++ mov ip, ip, push #\push ++ orr ip, ip, r9, pull #\pull ++ mov r9, r9, push #\push ++ orr r9, r9, r8, pull #\pull ++ mov r8, r8, push #\push ++ orr r8, r8, r7, pull #\pull ++ mov r7, r7, push #\push ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb dst!, {r4 - r9, ip, lr} ++ bge 29b ++ PLD( cmn r2, #96 ) ++ PLD( bge 30b ) ++ PLD( add r2, r2, #96 ) ++ cmn r2, #16 ++ blt 32f ++31: mov r7, r3, push #\push ++ ldmdb src!, {r3 - r6} ++ sub r2, r2, #16 ++ orr r7, r7, r6, pull #\pull ++ mov r6, r6, push #\push ++ orr r6, r6, r5, pull #\pull ++ mov r5, r5, push #\push ++ orr r5, r5, r4, pull #\pull ++ mov r4, r4, push #\push ++ orr r4, r4, r3, pull #\pull ++ stmdb dst!, {r4 - r7} ++32: adds r2, r2, #28 ++ ldmfd sp!, {r5 - r9} ++ blt 34f ++33: mov r4, r3, push #\push ++ ldr r3, [src, #-4]! ++ subs r2, r2, #4 ++ orr r4, r4, r3, pull #\pull ++ str r4, [dst, #-4]! ++ bge 33b ++34: ++ .endm ++ ++ ++ backward_copy_shift push=8 pull=24 ++ add src, src, #3 ++ b 25b ++ ++35: backward_copy_shift push=16 pull=16 ++ add src, src, #2 ++ b 25b ++ ++36: backward_copy_shift push=24 pull=8 ++ add src, src, #1 ++ b 25b ++ ++ .size bcopy, . - bcopy ++END(bcopy) + +--- /dev/null 2004-02-02 20:32:13.000000000 +0000 ++++ sysdeps/arm/memcpy.S 2004-05-02 14:33:22.000000000 +0100 +@@ -0,0 +1,242 @@ ++/* ++ * Optimized memcpy implementation for ARM processors ++ * ++ * Author: Nicolas Pitre ++ * Created: Dec 23, 2003 ++ * Copyright: (C) MontaVista Software, Inc. ++ * ++ * This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ */ ++ ++#include ++ ++ ++/* ++ * Endian independent macros for shifting bytes within registers. ++ */ ++#ifndef __ARMEB__ ++#define pull lsr ++#define push lsl ++#else ++#define pull lsl ++#define push lsr ++#endif ++ ++/* ++ * Enable data preload for architectures that support it (ARMv5 and above) ++ */ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif ++ ++ ++/* char * memcpy (char *dst, const char *src) */ ++ ++ENTRY(memcpy) ++ subs r2, r2, #4 ++ stmfd sp!, {r0, r4, lr} ++ blt 7f ++ ands ip, r0, #3 ++ PLD( pld [r1, #0] ) ++ bne 8f ++ ands ip, r1, #3 ++ bne 9f ++ ++1: subs r2, r2, #4 ++ blt 6f ++ subs r2, r2, #8 ++ blt 5f ++ subs r2, r2, #16 ++ blt 4f ++ ++ PLD( subs r2, r2, #65 ) ++ stmfd sp!, {r5 - r8} ++ PLD( blt 3f ) ++ PLD( pld [r1, #32] ) ++ ++ PLD( @ cache alignment ) ++ PLD( ands ip, r1, #31 ) ++ PLD( pld [r1, #64] ) ++ PLD( beq 2f ) ++ PLD( rsb ip, ip, #32 ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #96] ) ++ PLD( blt 2f ) ++ PLD( cmp ip, #16 ) ++ PLD( sub r2, r2, ip ) ++ PLD( ldmgeia r1!, {r3 - r6} ) ++ PLD( stmgeia r0!, {r3 - r6} ) ++ PLD( beq 2f ) ++ PLD( and ip, ip, #15 ) ++ PLD( cmp ip, #8 ) ++ PLD( ldr r3, [r1], #4 ) ++ PLD( ldrge r4, [r1], #4 ) ++ PLD( ldrgt r5, [r1], #4 ) ++ PLD( str r3, [r0], #4 ) ++ PLD( strge r4, [r0], #4 ) ++ PLD( strgt r5, [r0], #4 ) ++ ++2: PLD( pld [r1, #96] ) ++3: ldmia r1!, {r3 - r8, ip, lr} ++ subs r2, r2, #32 ++ stmia r0!, {r3 - r8, ip, lr} ++ bge 2b ++ PLD( cmn r2, #65 ) ++ PLD( bge 3b ) ++ PLD( add r2, r2, #65 ) ++ tst r2, #31 ++ ldmfd sp!, {r5 - r8} ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ tst r2, #16 ++4: ldmneia r1!, {r3, r4, ip, lr} ++ stmneia r0!, {r3, r4, ip, lr} ++ ++ tst r2, #8 ++5: ldmneia r1!, {r3, r4} ++ stmneia r0!, {r3, r4} ++ ++ tst r2, #4 ++6: ldrne r3, [r1], #4 ++ strne r3, [r0], #4 ++ ++7: ands r2, r2, #3 ++ ldmeqfd sp!, {r0, r4, pc} ++ ++ cmp r2, #2 ++ ldrb r3, [r1], #1 ++ ldrgeb r4, [r1], #1 ++ ldrgtb ip, [r1] ++ strb r3, [r0], #1 ++ strgeb r4, [r0], #1 ++ strgtb ip, [r0] ++ ldmfd sp!, {r0, r4, pc} ++ ++8: rsb ip, ip, #4 ++ cmp ip, #2 ++ ldrb r3, [r1], #1 ++ ldrgeb r4, [r1], #1 ++ ldrgtb lr, [r1], #1 ++ strb r3, [r0], #1 ++ strgeb r4, [r0], #1 ++ strgtb lr, [r0], #1 ++ subs r2, r2, ip ++ blt 7b ++ ands ip, r1, #3 ++ beq 1b ++ ++9: bic r1, r1, #3 ++ cmp ip, #2 ++ ldr lr, [r1], #4 ++ beq 17f ++ bgt 18f ++ ++ ++ .macro forward_copy_shift pull push ++ ++ cmp r2, #12 ++ PLD( pld [r1, #0] ) ++ blt 15f ++ subs r2, r2, #28 ++ stmfd sp!, {r5 - r9} ++ blt 13f ++ ++ PLD( subs r2, r2, #97 ) ++ PLD( blt 12f ) ++ PLD( pld [r1, #32] ) ++ ++ PLD( @ cache alignment ) ++ PLD( rsb ip, r1, #36 ) ++ PLD( pld [r1, #64] ) ++ PLD( ands ip, ip, #31 ) ++ PLD( pld [r1, #96] ) ++ PLD( beq 11f ) ++ PLD( cmp r2, ip ) ++ PLD( pld [r1, #128] ) ++ PLD( blt 11f ) ++ PLD( sub r2, r2, ip ) ++10: PLD( mov r3, lr, pull #\pull ) ++ PLD( ldr lr, [r1], #4 ) ++ PLD( subs ip, ip, #4 ) ++ PLD( orr r3, r3, lr, push #\push ) ++ PLD( str r3, [r0], #4 ) ++ PLD( bgt 10b ) ++ ++11: PLD( pld [r1, #128] ) ++12: mov r3, lr, pull #\pull ++ ldmia r1!, {r4 - r9, ip, lr} ++ subs r2, r2, #32 ++ orr r3, r3, r4, push #\push ++ mov r4, r4, pull #\pull ++ orr r4, r4, r5, push #\push ++ mov r5, r5, pull #\pull ++ orr r5, r5, r6, push #\push ++ mov r6, r6, pull #\pull ++ orr r6, r6, r7, push #\push ++ mov r7, r7, pull #\pull ++ orr r7, r7, r8, push #\push ++ mov r8, r8, pull #\pull ++ orr r8, r8, r9, push #\push ++ mov r9, r9, pull #\pull ++ orr r9, r9, ip, push #\push ++ mov ip, ip, pull #\pull ++ orr ip, ip, lr, push #\push ++ stmia r0!, {r3 - r9, ip} ++ bge 11b ++ PLD( cmn r2, #97 ) ++ PLD( bge 12b ) ++ PLD( add r2, r2, #97 ) ++ cmn r2, #16 ++ blt 14f ++13: mov r3, lr, pull #\pull ++ ldmia r1!, {r4 - r6, lr} ++ sub r2, r2, #16 ++ orr r3, r3, r4, push #\push ++ mov r4, r4, pull #\pull ++ orr r4, r4, r5, push #\push ++ mov r5, r5, pull #\pull ++ orr r5, r5, r6, push #\push ++ mov r6, r6, pull #\pull ++ orr r6, r6, lr, push #\push ++ stmia r0!, {r3 - r6} ++14: adds r2, r2, #28 ++ ldmfd sp!, {r5 - r9} ++ blt 16f ++15: mov r3, lr, pull #\pull ++ ldr lr, [r1], #4 ++ subs r2, r2, #4 ++ orr r3, r3, lr, push #\push ++ str r3, [r0], #4 ++ bge 15b ++16: ++ .endm ++ ++ ++ forward_copy_shift pull=8 push=24 ++ sub r1, r1, #3 ++ b 7b ++ ++17: forward_copy_shift pull=16 push=16 ++ sub r1, r1, #2 ++ b 7b ++ ++18: forward_copy_shift pull=24 push=8 ++ sub r1, r1, #1 ++ b 7b ++ ++ .size memcpy, . - memcpy ++END(memcpy) ++libc_hidden_builtin_def (memcpy) ++ diff --git a/packages/glibc/glibc-2.4/dl-cache-libcmp.patch b/packages/glibc/glibc-2.4/dl-cache-libcmp.patch new file mode 100644 index 0000000000..2fedfa6db0 --- /dev/null +++ b/packages/glibc/glibc-2.4/dl-cache-libcmp.patch @@ -0,0 +1,10 @@ +--- glibc-2.4/elf/Versions.ark 2006-03-11 23:30:09.000000000 +0100 ++++ glibc-2.4/elf/Versions 2006-03-11 23:31:44.000000000 +0100 +@@ -63,5 +63,7 @@ + _dl_debug_state; + # Pointer protection. + __pointer_chk_guard; ++ # for ldconfig ++ _dl_cache_libcmp; + } + } diff --git a/packages/glibc/glibc-2.4/dyn-ldconfig-20041128.patch b/packages/glibc/glibc-2.4/dyn-ldconfig-20041128.patch new file mode 100644 index 0000000000..451b6d4afc --- /dev/null +++ b/packages/glibc/glibc-2.4/dyn-ldconfig-20041128.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libc/elf/Makefile~dyn-ldconfig-20041128 ++++ libc/elf/Makefile +@@ -118,12 +118,13 @@ + + ifeq (yes,$(use-ldconfig)) + ifeq (yes,$(build-shared)) +-others-static += ldconfig ++#others-static += ldconfig + others += ldconfig + install-rootsbin += ldconfig + + ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon + extra-objs += $(ldconfig-modules:=.o) ++CPPFLAGS-readlib.c = -DNOT_IN_libc=1 + + # To find xmalloc.c and xstrdup.c + vpath %.c ../locale/programs diff --git a/packages/glibc/glibc-2.4/dyn-ldconfig.patch b/packages/glibc/glibc-2.4/dyn-ldconfig.patch new file mode 100644 index 0000000000..1041965d05 --- /dev/null +++ b/packages/glibc/glibc-2.4/dyn-ldconfig.patch @@ -0,0 +1,62 @@ +--- elf/Makefile 13 Mar 2003 21:50:57 -0000 1.258 ++++ elf/Makefile 27 Mar 2003 20:36:07 -0000 +@@ -109,12 +109,13 @@ + + ifeq (yes,$(use-ldconfig)) + ifeq (yes,$(build-shared)) +-others-static += ldconfig ++#others-static += ldconfig + others += ldconfig + install-rootsbin += ldconfig + + ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon + extra-objs += $(ldconfig-modules:=.o) ++CPPFLAGS-readlib.c = -DNOT_IN_libc=1 + + # To find xmalloc.c and xstrdup.c + vpath %.c ../locale/programs +--- elf/ldconfig.c 13 Jan 2003 08:53:14 -0000 1.31 ++++ elf/ldconfig.c 27 Mar 2003 20:36:09 -0000 +@@ -149,6 +149,9 @@ + static int + is_hwcap_platform (const char *name) + { ++#if 1 ++ return 0; ++#else + int hwcap_idx = _dl_string_hwcap (name); + + if (hwcap_idx != -1 && ((1 << hwcap_idx) & hwcap_mask)) +@@ -164,6 +167,7 @@ + #endif + + return 0; ++#endif + } + + /* Get hwcap (including platform) encoding of path. */ +@@ -175,6 +179,7 @@ + uint64_t hwcap = 0; + uint64_t h; + ++#if 0 + size_t len; + + len = strlen (str); +@@ -210,6 +215,7 @@ + *ptr = '\0'; + } + ++#endif + free (str); + return hwcap; + } +--- elf/Versions.old 2004-06-26 13:18:35.000000000 +0100 ++++ elf/Versions 2004-06-26 14:41:09.000000000 +0100 +@@ -54,5 +54,6 @@ + _dl_get_tls_static_info; _dl_allocate_tls_init; + _dl_tls_setup; _dl_rtld_di_serinfo; + _dl_make_stack_executable; ++ _dl_cache_libcmp; + } + } diff --git a/packages/glibc/glibc-2.4/etc/.mtn2git_empty b/packages/glibc/glibc-2.4/etc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/glibc/glibc-2.4/etc/ld.so.conf b/packages/glibc/glibc-2.4/etc/ld.so.conf new file mode 100644 index 0000000000..3f9b41aabb --- /dev/null +++ b/packages/glibc/glibc-2.4/etc/ld.so.conf @@ -0,0 +1,3 @@ +/usr/local/lib +/opt/QtPalmtop/lib + diff --git a/packages/glibc/glibc-2.4/generic-bits_select.h b/packages/glibc/glibc-2.4/generic-bits_select.h new file mode 100644 index 0000000000..47e7dedc30 --- /dev/null +++ b/packages/glibc/glibc-2.4/generic-bits_select.h @@ -0,0 +1,35 @@ +/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it wi