From patchwork Fri Nov 30 14:29:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 202964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 160812C007E for ; Sat, 1 Dec 2012 01:30:11 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 9384B3FCCD for ; Fri, 30 Nov 2012 15:29:54 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id C62AF3FBC4 for ; Fri, 30 Nov 2012 15:29:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=6386; q=dns/txt; s=ironport2; t=1354285791; x=1385821791; h=from:to:subject:date:message-id:in-reply-to:references: mime-version; bh=y83seZnXrd8jAYslS+TP2lzanbN5ZJbfuBipa94poVw=; b=Z/ZfBF9TPSN1n4gtvGEmJyIwkuuwOCWGGdcjR/oD6yDgsP9I2TDINBWj opIH0g7SulPhQboekdIKUDBMqD2i/CWHZ3V5AHdbbAwk7ysfy6rO75rJ5 a/YwWIUlXC0/lYY+nD8fxjwzIDthX4B+AE/WWn0OFNisK63q4Qj/22gjc c=; X-IronPort-AV: E=Sophos;i="4.84,191,1355094000"; d="scan'208";a="1874541" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 30 Nov 2012 15:29:50 +0100 Received: from fire (172.16.10.61) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.318.4; Fri, 30 Nov 2012 15:29:50 +0100 Received: by fire (Postfix, from userid 30019) id 6413061201; Fri, 30 Nov 2012 15:29:50 +0100 (CET) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 1/1] crosstool-ng: dmalloc support added Date: Fri, 30 Nov 2012 15:29:41 +0100 Message-ID: <1b98da1f9844500d255cb22818afd95edd3dd219.1354284467.git.kibo@prevas.dk> X-Mailer: git-send-email 1.7.10 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/crosstool-ng/gcc-configure.inc | 15 ++++++++++++++- recipes/crosstool-ng/gcc-fetch.inc | 4 ++++ recipes/crosstool-ng/gcc-package.inc | 25 +++++++++++++++++++++++++ recipes/crosstool-ng/gcc-versions.inc | 4 ++++ recipes/crosstool-ng/gcc_1.13.2.oe | 1 + recipes/crosstool-ng/gcc_1.13.2.oe.sig | 1 + 6 files changed, 49 insertions(+), 1 deletion(-) diff --git a/recipes/crosstool-ng/gcc-configure.inc b/recipes/crosstool-ng/gcc-configure.inc index 31e3f8a..693a986 100644 --- a/recipes/crosstool-ng/gcc-configure.inc +++ b/recipes/crosstool-ng/gcc-configure.inc @@ -31,6 +31,7 @@ _CT_LIBELF_V = "CT_LIBELF_V" _CT_LTRACE_V = "CT_LTRACE_V" _CT_STRACE_V = "CT_STRACE_V" _CT_MINGW_PDCURSES_V = "CT_MINGW_PDCURSES_V" +_CT_DMALLOC_V = "CT_DMALLOC_V" _CT_LIBC_VERSION = "CT_LIBC_VERSION" _CT_LIBC_VERSION:TARGET_OS_mingw32 = "CT_MINGWRT_VERSION" @@ -68,6 +69,16 @@ AUTO_CT_BOOLEAN_VARS += "CT_DEBUG_strace" CT_DEBUG_strace:cross = "y" CT_DEBUG_strace:TARGET_OS_mingw32 = "" +RECIPE_FLAGS += "dmalloc" +DEFAULT_USE_dmalloc = "" +INC_DMALLOC = "" +INC_DMALLOC:USE_dmalloc = "${USE_dmalloc}" +INC_DMALLOC:sdk-cross = "" +INC_DMALLOC:canadian-cross = "" + +AUTO_CT_BOOLEAN_VARS:USE_dmalloc += "CT_DEBUG_dmalloc" +CT_DEBUG_dmalloc:cross = "${INC_DMALLOC}" + AUTO_CT_BOOLEAN_VARS += "CT_ARCH_ARM_MODE_THUMB" CT_ARCH_ARM_MODE_THUMB = "${TARGET_THUMB}" @@ -213,7 +224,7 @@ def do_configure_defconfig(d): for component in ("cc", "binutils", "libc", "gdb", "gmp", "mpfr", "mpc", "ppl", "cloog", "libelf", "ltrace", "strace", - "mingw_pdcurses"): + "mingw_pdcurses", "dmalloc"): rewrites.append(version_rewrite(component)) ct_libc = d.get("CT_LIBC") @@ -311,4 +322,6 @@ def do_configure_qa(d): ok = ok and check_version("CT_STRACE_VERSION") if d.get("CT_USE_PDCURSES"): ok = ok and check_version("CT_MINGW_PDCURSES_VERSION") + if d.get("CT_DEBUG_dmalloc"): + ok = ok and check_version("CT_DMALLOC_VERSION") return ok diff --git a/recipes/crosstool-ng/gcc-fetch.inc b/recipes/crosstool-ng/gcc-fetch.inc index 12d6f94..2199a2d 100644 --- a/recipes/crosstool-ng/gcc-fetch.inc +++ b/recipes/crosstool-ng/gcc-fetch.inc @@ -50,6 +50,8 @@ SRC_URI_MPC = "http://www.multiprecision.org/mpc/download/mpc-${CT_MPC_VERSION}. SRC_URI_STRACE = "${SOURCEFORGE_MIRROR}/project/strace/strace/${CT_STRACE_VERSION}/strace-${CT_STRACE_VERSION}.tar.bz2;unpack=0" +SRC_URI_DMALLOC = "http://dmalloc.com/releases/dmalloc-${CT_DMALLOC_VERSION}.tgz;unpack=0" + SRC_URI_LTRACE = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${CT_LTRACE_VERSION}.orig.tar.gz;unpack=0" SRC_URI_PDCURSES = "${SOURCEFORGE_MIRROR}/pdcurses/PDCurses-${CT_MINGW_PDCURSES_VERSION}.tar.gz;unpack=0" @@ -107,6 +109,8 @@ def gcc_set_src_uri(d): add_src("SRC_URI_STRACE") if target_is_mingw: add_src("SRC_URI_PDCURSES", "CT_USE_PDCURSES") + if d.get("CT_DEBUG_dmalloc"): + add_src("SRC_URI_DMALLOC") # FIXME: add support for adding cloog and ppl diff --git a/recipes/crosstool-ng/gcc-package.inc b/recipes/crosstool-ng/gcc-package.inc index e3e40d8..1d6a771 100644 --- a/recipes/crosstool-ng/gcc-package.inc +++ b/recipes/crosstool-ng/gcc-package.inc @@ -151,6 +151,30 @@ ${base_prefix}/${TARGET_ARCH}/debug-root${target_sysconfdir}/ltrace.conf \ " PROVIDES_${PN}-sysroot-trace += "util/ltrace util/strace" +TARGET_PACKAGES += "${PN}-sysroot-dmalloc-dbg" +FILES_${PN}-sysroot-dmalloc-dbg = "\ +${base_prefix}/${TARGET_ARCH}/debug-root${target_bindir}/.debug/dmalloc \ +${base_prefix}/${TARGET_ARCH}/debug-root${target_libdir}/.debug/dmalloc \ +" + +TARGET_PACKAGES += "${PN}-sysroot-dmalloc" +FILES_${PN}-sysroot-dmalloc = "\ +${base_prefix}/${TARGET_ARCH}/debug-root${target_bindir}/dmalloc \ +" +PROVIDES_${PN}-sysroot-dmalloc += "util/dmalloc" + +TARGET_PACKAGES += "${PN}-sysroot-libdmalloc" +FILES_${PN}-sysroot-libdmalloc = "\ +${base_prefix}/${TARGET_ARCH}/sysroot${target_libdir}/libdmalloc*.a \ +" + +TARGET_PACKAGES += "${PN}-sysroot-lib-so-dmalloc" +FILES_${PN}-sysroot-lib-so-dmalloc = "\ +${base_prefix}/${TARGET_ARCH}/sysroot${target_libdir}/libdmalloc*.so \ +" + + + TARGET_PACKAGES += "${PN}-sysroot-trace-doc" FILES_${PN}-sysroot-trace-doc = "\ ${base_prefix}/${TARGET_ARCH}/debug-root${target_infodir}/*trace \ @@ -426,3 +450,4 @@ LICENSE_${PN}-sysroot-libfd = "GPL-3.0+" LICENSE_${PN}-sysroot-gdbserver = "GPL-2.0 & GPL-3.0 & LGPL-2.0 & LGPL-3.0" LICENSE_${PN}-sysroot-trace = "BSD-2-Clause" +LICENSE_${PN}-sysroot-dmalloc = "CC-BY-NC-SA-3.0" diff --git a/recipes/crosstool-ng/gcc-versions.inc b/recipes/crosstool-ng/gcc-versions.inc index c23a3ba..7116c82 100644 --- a/recipes/crosstool-ng/gcc-versions.inc +++ b/recipes/crosstool-ng/gcc-versions.inc @@ -73,3 +73,7 @@ RECIPE_FLAGS += "toolchain_strace_version" CT_MINGW_PDCURSES_VERSION = "${USE_toolchain_pdcurses_version}" RECIPE_FLAGS += "toolchain_pdcurses_version" + +CT_DMALLOC_VERSION = "${USE_toolchain_dmalloc_version}" +RECIPE_FLAGS += "toolchain_dmalloc_version" + diff --git a/recipes/crosstool-ng/gcc_1.13.2.oe b/recipes/crosstool-ng/gcc_1.13.2.oe index ca1d6b6..b8ae9fa 100644 --- a/recipes/crosstool-ng/gcc_1.13.2.oe +++ b/recipes/crosstool-ng/gcc_1.13.2.oe @@ -34,6 +34,7 @@ DEFAULT_USE_toolchain_cloog_version = "0.15.11" DEFAULT_USE_toolchain_libelf_version = "0.8.13" DEFAULT_USE_toolchain_ltrace_version = "0.5.3" DEFAULT_USE_toolchain_strace_version = "4.5.20" +DEFAULT_USE_toolchain_dmalloc_version = "5.5.2" require gcc.inc diff --git a/recipes/crosstool-ng/gcc_1.13.2.oe.sig b/recipes/crosstool-ng/gcc_1.13.2.oe.sig index cca7d3f..0264469 100644 --- a/recipes/crosstool-ng/gcc_1.13.2.oe.sig +++ b/recipes/crosstool-ng/gcc_1.13.2.oe.sig @@ -1,5 +1,6 @@ e36684442a6171cc3a5165c8c49c70f67db7288c PDCurses-3.4.tar.gz 3f0e3746a15f806a95dd079be2a7f43c17b18818 binutils-2.20.1a.tar.bz2 +20719de78decbd724bc3ab9d6dce2ea5e5922335 dmalloc-5.5.2.tgz 45d1e7242a08cbb7a343ed2bf640a5afd0ebe098 gcc-4.4.4.tar.bz2 2b1427a932a620c909d74f1e4821ed90c90fd350 gcc-4.4.5.tar.bz2 73c45dfda5eef6b124be53e56828b5925198cc1b gcc-4.5.3.tar.bz2