summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/angstrom-2007.1.conf12
-rw-r--r--conf/distro/include/angstromoabi.inc4
-rw-r--r--packages/classpath/classpath-gtk_0.93.bb11
-rw-r--r--packages/classpath/classpath-gtk_cvs.bb26
-rw-r--r--packages/classpath/classpath-minimal-native_0.93.bb2
-rw-r--r--packages/classpath/classpath-minimal_0.90.bb11
-rw-r--r--packages/classpath/classpath.inc2
-rw-r--r--packages/efl/evas-x11_0.9.9.038.bb12
-rw-r--r--packages/efl/evas.inc4
-rw-r--r--packages/freetype/freetype-2.3.4/.mtn2git_empty (renamed from packages/freetype/freetype-2.3.3/.mtn2git_empty)0
-rw-r--r--packages/freetype/freetype-2.3.4/fix-x86_64-build.patch (renamed from packages/freetype/freetype-2.3.3/fix-x86_64-build.patch)0
-rw-r--r--packages/freetype/freetype_2.3.4.bb (renamed from packages/freetype/freetype_2.3.3.bb)0
-rw-r--r--packages/jikes/jikes-native_1.21.bb3
-rw-r--r--packages/linux/corgi-kernel-2.4-embedix.bb2
-rw-r--r--packages/linux/husky-kernel-2.4-embedix.bb1
-rw-r--r--packages/linux/poodle-kernel-2.4-embedix.bb1
-rw-r--r--packages/linux/poodle-kernels-2.4-embedix.bb1
-rw-r--r--packages/linux/poodle255-kernel-2.4-embedix.bb2
-rw-r--r--packages/linux/shepherd-kernel-2.4-embedix.bb1
-rw-r--r--packages/mozilla/minimo_cvs.bb2
-rw-r--r--packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty0
-rw-r--r--packages/uclibc/uclibc-0.9.29/arm/uClibc.machine69
-rw-r--r--packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine143
-rw-r--r--packages/xchat/xchat_2.6.1.bb3
24 files changed, 109 insertions, 203 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6ef9646814..aa7aa0d345 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -10,9 +10,12 @@
DISTRO_VERSION = "test-${DATE}"
DISTRO_REVISION = "46"
-require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
+
#Images built can have to modes:
# 'debug': empty rootpassword, strace and gdb included
# 'release' no root password, no strace and gdb by default
@@ -88,11 +91,6 @@ FEED_ARCH_simpad = "arm-oabi"
#Tweak packaging for strongarm machines since they can't use EABI
-PACKAGE_ARCH_collie = "arm-oabi"
-PACKAGE_ARCH_h3600 = "arm-oabi"
-PACKAGE_ARCH_h3800 = "arm-oabi"
-PACKAGE_ARCH_simpad = "arm-oabi"
-
PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
@@ -138,7 +136,7 @@ PREFERRED_VERSION_file = "4.18"
PREFERRED_VERSION_file_native = "4.18"
PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.3"
+PREFERRED_VERSION_freetype = "2.3.4"
PREFERRED_VERSION_freetype-native = "2.2.1"
PREFERRED_VERSION_cairo = "1.4.8"
PREFERRED_VERSION_glib-2.0 = "2.12.12"
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
new file mode 100644
index 0000000000..bb7bc45fbd
--- /dev/null
+++ b/conf/distro/include/angstromoabi.inc
@@ -0,0 +1,4 @@
+require conf/distro/include/angstrom.inc
+
+PACKAGE_ARCH = "arm-oabi"
+
diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb
index 137ee8ffb2..a3b39d92f8 100644
--- a/packages/classpath/classpath-gtk_0.93.bb
+++ b/packages/classpath/classpath-gtk_0.93.bb
@@ -4,15 +4,6 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-
RDEPENDS_${PN} = "classpath-common (>= ${PV})"
RCONFLICTS_${PN} = "classpath-minimal"
-SRC_URI += "file://gconf_version.patch;patch=1"
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
-
-PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
-
-FILES_classpath-doc = "${datadir}/info"
-FILES_classpath-dev = "${includedir}"
-FILES_${PN} = "${libdir} ${bindir}"
-FILES_classpath-common = "${datadir}/classpath/glibj.zip"
-FILES_classpath-examples = "${datadir}/classpath/examples"
-FILES_classpath-tools = "${datadir}/classpath/tools.zip"
diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index 53f494ab15..18d79decae 100644
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -1,14 +1,12 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
-PR = "r1"
+require classpath.inc
+
+PR = "r2"
SRCDATE_${PN} ?= "20070501"
PV = "0.93+cvs${SRCDATE}"
-DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native"
+### note from Laibsch: bug 2523 has information on how to build this package
+DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native libxtst"
RDEPENDS_${PN} = "classpath-common (>= ${PV})"
RCONFLICTS_${PN} = "classpath-minimal"
@@ -17,19 +15,8 @@ SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpa
S = "${WORKDIR}/classpath"
-inherit autotools
-
EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa"
-PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
-
-FILES_classpath-doc = "${datadir}/info ${datadir}/man"
-FILES_classpath-dev = "${includedir}"
-FILES_${PN} = "${libdir} ${bindir}"
-FILES_classpath-common = "${datadir}/classpath/glibj.zip"
-FILES_classpath-examples = "${datadir}/classpath/examples"
-FILES_classpath-tools = "${datadir}/classpath/tools.zip"
-
do_stage() {
install -d ${STAGING_INCDIR}/classpath
install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
@@ -41,6 +28,3 @@ do_install() {
autotools_do_install
mv ${D}${libdir}/security ${D}${libdir}/${PN}
}
-
-PROVIDES = "classpath"
-RPROVIDES = "classpath"
diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index f8e88a0217..83cb60142c 100644
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -3,6 +3,8 @@ require classpath.inc
DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
PR = "r1"
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
+
S = "${WORKDIR}/classpath-${PV}"
inherit native
diff --git a/packages/classpath/classpath-minimal_0.90.bb b/packages/classpath/classpath-minimal_0.90.bb
index 1339b2dbc8..8d9554c999 100644
--- a/packages/classpath/classpath-minimal_0.90.bb
+++ b/packages/classpath/classpath-minimal_0.90.bb
@@ -4,13 +4,6 @@ DEPENDS = "jikes-native zip-native"
RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})"
RCONFLICTS_${PBN}-minimal = "${PBN}-gtk"
-EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
-
-PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}"
+SRC_URI += "file://disable-automake-checks.patch;patch=1"
-FILES_${PBN}-doc = "${datadir}/info"
-FILES_${PBN}-dev = "${includedir}"
-FILES_${PN} = "${libdir}"
-FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip"
-FILES_${PBN}-examples = "${datadir}/${PBN}/examples"
-FILES_${PBN}-tools = "${datadir}/${PBN}/tools"
+EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 1d684c0557..d9498c99d5 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -7,7 +7,6 @@ PROVIDES = "classpath"
RPROVIDES = "classpath"
SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
- file://disable-automake-checks.patch;patch=1 \
file://gconf_version.patch;patch=1 \
file://fix-endian-arm-floats.patch;patch=1"
@@ -28,3 +27,4 @@ FILES_classpath-common += "${datadir}/classpath/glibj.zip"
FILES_classpath-examples += "${datadir}/classpath/examples"
FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools"
FILES_classpath-dev += "${libdir}/*.so"
+FILES_classpath-dbg += "${libdir}/classpath/.debug"
diff --git a/packages/efl/evas-x11_0.9.9.038.bb b/packages/efl/evas-x11_0.9.9.038.bb
index 765a8b73d4..4c5ef29515 100644
--- a/packages/efl/evas-x11_0.9.9.038.bb
+++ b/packages/efl/evas-x11_0.9.9.038.bb
@@ -1,6 +1,6 @@
require evas.inc
DEPENDS += "edb virtual/libx11 libxext freetype"
-PR = "r8"
+PR = "r10"
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
@@ -9,6 +9,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--enable-buffer \
--disable-software-qtopia \
--enable-software-x11 \
+ --enable-software-16-x11 \
--disable-gl-x11 \
--enable-image-loader-eet \
--enable-image-loader-edb \
@@ -20,7 +21,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--enable-scale-sample \
--enable-scale-smooth \
--enable-convert-yuv \
- --disable-image-loader-svg \
+ --disable-image-loader-svg \
--disable-convert-8-rgb-332 \
--disable-convert-8-rgb-666 \
--disable-convert-8-rgb-232 \
@@ -33,19 +34,20 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--disable-convert-16-rgb-444 \
--disable-convert-16-rgb-ipq \
--enable-convert-16-rgb-rot-0 \
- --disable-convert-16-rgb-rot-90 \
+ --enable-convert-16-rgb-rot-90 \
--enable-convert-16-rgb-rot-270 \
--disable-convert-24-rgb-888 \
--disable-convert-24-bgr-888 \
--disable-convert-32-rgb-8888 \
--disable-convert-32-rgbx-8888 \
- --disable-convert-32-bgr-8888 \
- --disable-convert-32-bgrx-8888 \
+ --enable-convert-32-bgr-8888 \
+ --enable-convert-32-bgrx-8888 \
--disable-convert-32-rgb-rot-0 \
--disable-convert-32-rgb-rot-90 \
--disable-convert-32-rgb-rot-270"
headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \
+ ../modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h \
../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \
../modules/engines/buffer/Evas_Engine_Buffer.h \
../modules/engines/fb/Evas_Engine_FB.h \
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index f708200071..a175099c31 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -7,7 +7,7 @@ LICENSE = "MIT"
DEPENDS = "freetype libpng jpeg eet"
PROVIDES += "virtual/evas"
-inherit efl
+inherit efl lib_package
export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
@@ -47,4 +47,4 @@ headers = "<override me>"
libraries = "libevas"
FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so"
FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/" \ No newline at end of file
+FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
diff --git a/packages/freetype/freetype-2.3.3/.mtn2git_empty b/packages/freetype/freetype-2.3.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/freetype/freetype-2.3.3/.mtn2git_empty
+++ b/packages/freetype/freetype-2.3.4/.mtn2git_empty
diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch
index ae504dcb0b..ae504dcb0b 100644
--- a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch
+++ b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch
diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.4.bb
index c1febe8a90..c1febe8a90 100644
--- a/packages/freetype/freetype_2.3.3.bb
+++ b/packages/freetype/freetype_2.3.4.bb
diff --git a/packages/jikes/jikes-native_1.21.bb b/packages/jikes/jikes-native_1.21.bb
index 7bea3e3cba..2996046639 100644
--- a/packages/jikes/jikes-native_1.21.bb
+++ b/packages/jikes/jikes-native_1.21.bb
@@ -1,6 +1,7 @@
-SECTION = "devel"
inherit native
require jikes_${PV}.bb
+
+PROVIDES = "virtual/javac-native"
S = "${WORKDIR}/jikes-${PV}"
do_stage() {
diff --git a/packages/linux/corgi-kernel-2.4-embedix.bb b/packages/linux/corgi-kernel-2.4-embedix.bb
index 5870ed54b9..986ee7ac40 100644
--- a/packages/linux/corgi-kernel-2.4-embedix.bb
+++ b/packages/linux/corgi-kernel-2.4-embedix.bb
@@ -1,3 +1,3 @@
MACHINE = "corgi"
-
+COMPATIBLE_HOST = "arm.*-linux"
require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/linux/husky-kernel-2.4-embedix.bb b/packages/linux/husky-kernel-2.4-embedix.bb
index 19645079f1..81f859594c 100644
--- a/packages/linux/husky-kernel-2.4-embedix.bb
+++ b/packages/linux/husky-kernel-2.4-embedix.bb
@@ -1,3 +1,4 @@
+COMPATIBLE_HOST = "arm.*-linux"
MACHINE = "husky"
require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/linux/poodle-kernel-2.4-embedix.bb b/packages/linux/poodle-kernel-2.4-embedix.bb
index 37845c4c96..2f26cbc863 100644
--- a/packages/linux/poodle-kernel-2.4-embedix.bb
+++ b/packages/linux/poodle-kernel-2.4-embedix.bb
@@ -1,4 +1,5 @@
MACHINE = "poodle"
+COMPATIBLE_HOST = "arm.*-linux"
require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/linux/poodle-kernels-2.4-embedix.bb b/packages/linux/poodle-kernels-2.4-embedix.bb
index 7a714b7a12..21d334fec3 100644
--- a/packages/linux/poodle-kernels-2.4-embedix.bb
+++ b/packages/linux/poodle-kernels-2.4-embedix.bb
@@ -1,2 +1,3 @@
COMPATIBLE_MACHINE = "poodle"
+COMPATIBLE_HOST = "arm.*-linux"
DEPENDS = "poodle-kernel-2.4-embedix poodle255-kernel-2.4-embedix"
diff --git a/packages/linux/poodle255-kernel-2.4-embedix.bb b/packages/linux/poodle255-kernel-2.4-embedix.bb
index 2b58472185..f3044f4e67 100644
--- a/packages/linux/poodle255-kernel-2.4-embedix.bb
+++ b/packages/linux/poodle255-kernel-2.4-embedix.bb
@@ -1,4 +1,4 @@
MACHINE = "poodle255"
-
+COMPATIBLE_HOST = "arm.*-linux"
require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/linux/shepherd-kernel-2.4-embedix.bb b/packages/linux/shepherd-kernel-2.4-embedix.bb
index 874c72e432..ac573fd14e 100644
--- a/packages/linux/shepherd-kernel-2.4-embedix.bb
+++ b/packages/linux/shepherd-kernel-2.4-embedix.bb
@@ -1,5 +1,6 @@
MACHINE = "shepherd"
COMPATIBLE_MACHINE = "shepherd"
+COMPATIBLE_HOST = "arm.*-linux"
require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index 9c29926100..c0e8edc747 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MPL GPL LGPL"
HOMEPAGE = "http://www.mozilla.org/projects/minimo/"
PRIORITY = "optional"
-DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native"
+DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native"
CVSSVR="cvs-mirror.mozilla.org"
BRTAG = "MOZILLA_1_8_BRANCH"
diff --git a/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine
index eec16b1b33..2d9f63e531 100644
--- a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine
+++ b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine
@@ -68,146 +68,3 @@ DO_C99_MATH=y
KERNEL_HEADERS="/usr/include"
HAVE_DOT_CONFIG=y
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-# DOPIC is not set
-# HAVE_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-UCLIBC_CTOR_DTOR=y
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-# UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_HAS_SHADOW=y
-# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
-UCLIBC_HAS___PROGNAME=y
-UNIX98PTY_ONLY=y
-ASSUME_DEVPTS=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Networking Support
-#
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-# UCLIBC_HAS_REENTRANT_RPC is not set
-# UCLIBC_USE_NETLINK is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-# UCLIBC_HAS_GNU_GLOB is not set
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="//usr"
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/packages/xchat/xchat_2.6.1.bb b/packages/xchat/xchat_2.6.1.bb
index ec058067c5..fc362a9c41 100644
--- a/packages/xchat/xchat_2.6.1.bb
+++ b/packages/xchat/xchat_2.6.1.bb
@@ -3,10 +3,11 @@ LICENSE = "GPL"
HOMEPAGE = "http://www.xchat.org"
SECTION = "x11/network"
DEPENDS = "libgcrypt zlib gtk+"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2"
inherit autotools
EXTRA_OECONF = " --disable-perl --disable-python "
+FILES_${PN}-dbg += " /usr/lib/xchat/plugins/.debug"