From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [CONSOLIDATED PULL 20/27] libtool: Upgrade from 2.4 -> 2.4.2
Date: Mon, 24 Oct 2011 14:34:50 +0100 [thread overview]
Message-ID: <1319463290.25011.10.camel@ted> (raw)
In-Reply-To: <d546fdc94cb627040c657facc23f00406967c838.1319394187.git.sgw@linux.intel.com>
On Sun, 2011-10-23 at 11:26 -0700, Saul Wold wrote:
> From: Khem Raj <raj.khem@gmail.com>
>
> Adjust prefix.patch and delete resolve-sysroot.patch
> since its already applied upstream
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 +++++++++---
> meta/recipes-devtools/libtool/libtool-2.4.inc | 13 ------
> ...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +-
> ...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +-
> ...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +-
> meta/recipes-devtools/libtool/libtool/prefix.patch | 46 ++++++++++----------
> .../libtool/libtool/resolve-sysroot.patch | 42 ------------------
> .../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
> 8 files changed, 47 insertions(+), 88 deletions(-)
> rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
> delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
> rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
> rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
> rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
> delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
> rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
>
> diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
> similarity index 57%
> rename from meta/recipes-devtools/libtool/libtool.inc
> rename to meta/recipes-devtools/libtool/libtool-2.4.2.inc
> index ef9095b..1f652ef 100644
> --- a/meta/recipes-devtools/libtool/libtool.inc
> +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
> @@ -1,4 +1,3 @@
> -SUMMARY = "Generic library support script"
Why drop the SUMMARY field?
> DESCRIPTION = "This is GNU libtool, a generic library support script. \
> Libtool hides the complexity of generating special library types \
> (such as shared libraries) behind a consistent interface."
> @@ -8,21 +7,36 @@ LICENSE = "GPLv2 & LGPLv2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
>
> +INC_PR = "r0"
> +
> SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
> file://trailingslash.patch \
> file://prefix-manpage-fix.patch \
> file://rename-with-sysroot.patch \
> - file://resolve-sysroot.patch \
> file://use-sysroot-in-libpath.patch \
> file://fix-final-rpath.patch \
> file://avoid_absolute_paths_for_general_utils.patch \
> - file://fix-rpath.patch "
> + file://fix-rpath.patch \
> + "
> +
> +SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
> +SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
>
> do_compile_prepend () {
> - # Sometimes this file doesn't get rebuilt, force the issue
> - rm -f ${S}/libltdl/config/ltmain.sh
> - make libltdl/config/ltmain.sh
> + # Sometimes this file doesn't get rebuilt, force the issue
> + rm -f ${S}/libltdl/config/ltmain.sh
> + make libltdl/config/ltmain.sh
> }
Unintended indentation changes?
> inherit autotools
> EXTRA_AUTORECONF = "--exclude=libtoolize"
> +
> +DEPENDS = "libtool-native"
> +
> +PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
> +FILES_${PN} += "${datadir}/aclocal*"
> +FILES_libltdl = "${libdir}/libltdl.so.*"
> +FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
> +FILES_libltdl-dbg = "${libdir}/.debug/"
> +
> +EXTRA_OECONF = "--with-sysroot"
> diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc
> deleted file mode 100644
> index e3d17b7..0000000
> --- a/meta/recipes-devtools/libtool/libtool-2.4.inc
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -require libtool.inc
> -DEPENDS = "libtool-native"
> -
> -PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
> -FILES_${PN} += "${datadir}/aclocal*"
> -FILES_libltdl = "${libdir}/libltdl.so.*"
> -FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
> -FILES_libltdl-dbg = "${libdir}/.debug/"
> -
> -SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
> -SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
> -
> -EXTRA_OECONF = "--with-sysroot"
> \ No newline at end of file
> diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
> similarity index 98%
> rename from meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> rename to meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
> index 6d512b1..b7fe851 100644
> --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
> @@ -1,6 +1,6 @@
> require libtool-${PV}.inc
>
> -PR = "r4"
> +PR = "${INC_PR}.0"
> PACKAGES = ""
> SRC_URI += "file://prefix.patch"
No mention of conversion to INC_PR in the commit message. I'm not sure
this is worth doing at this point considering the need to find a better
way to automate PR bumping.
Cheers,
Richard
next prev parent reply other threads:[~2011-10-24 13:40 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-23 18:26 [CONSOLIDATED PULL 00/27] Various Updates and fixes Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 01/27] tcl: upgrade from 8.5.9 to 8.5.10 Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 02/27] tcmode-default.inc: Add TRANSLATED_TARGET_ARCH suffix to binutils-cross-canadian Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 03/27] binutils-cross-canadian: Point sysroot to correct location Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 04/27] gcc-configure-sdk: " Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 05/27] perl: upgrade from 5.12.3 to 5.14.2 Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 06/27] bootimg.bbclass: add support to disable HDD image building Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 07/27] useradd.bbclass: check if a group already exists manually Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 08/27] base-passwd: move initial criation of group and passwd to preinst Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 09/27] dbus: use useradd class to allow use in read-only filesystems Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 10/27] squashfs-tools: add recipe Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 11/27] pulseaudio-0.9.23: inherit perlnative to work around build on host without XML/Parser.pm Saul Wold
2011-10-24 13:15 ` Richard Purdie
2011-10-24 13:19 ` Koen Kooi
2011-10-24 14:15 ` Richard Purdie
2011-10-24 14:24 ` Martin Jansa
2011-10-24 13:24 ` Martin Jansa
2011-10-24 14:19 ` Richard Purdie
2011-10-23 18:26 ` [CONSOLIDATED PULL 12/27] apr: add native support Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 13/27] neon: " Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 14/27] apr-util: " Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 15/27] subversion: add 1.7.0 with native support and negative D_P for now Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 16/27] subversion-1.6.15: add native support too Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 17/27] xserver-xorg: Add mesa-dri to depends instead of virtual/libgl Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 18/27] gcc-4.6: Backport fix for PR32219 Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 19/27] coreutils: Upgrade recipe 8.12 -> 8.14 Saul Wold
2011-10-23 18:26 ` [CONSOLIDATED PULL 20/27] libtool: Upgrade from 2.4 -> 2.4.2 Saul Wold
2011-10-24 13:34 ` Richard Purdie [this message]
2011-10-24 13:37 ` Koen Kooi
2011-10-24 14:10 ` Richard Purdie
2011-10-24 14:18 ` Koen Kooi
2011-10-24 14:24 ` Richard Purdie
2011-10-23 18:26 ` [CONSOLIDATED PULL 21/27] default-providers: switch virtual/libgl from mesa-xlib to mesa-dri Saul Wold
2011-10-23 18:27 ` [CONSOLIDATED PULL 22/27] kernel.bbclass: respect MACHINE_KERNEL_PR Saul Wold
2011-10-23 18:27 ` [CONSOLIDATED PULL 23/27] wget: Add recipe from OE Saul Wold
2011-10-24 13:25 ` Richard Purdie
2011-10-23 18:27 ` [CONSOLIDATED PULL 24/27] texi2html: Added " Saul Wold
2011-10-23 20:06 ` Khem Raj
2011-10-23 20:13 ` Saul Wold
2011-10-23 22:35 ` Khem Raj
2011-10-23 18:27 ` [CONSOLIDATED PULL 25/27] oprofile: Update to 0.9.7 and convert cvs->git Saul Wold
2011-10-23 18:27 ` [CONSOLIDATED PULL 26/27] abiword: convert to svn Saul Wold
2011-10-24 13:14 ` Richard Purdie
2011-10-24 13:18 ` Koen Kooi
2011-10-24 13:31 ` Saul Wold
2011-10-23 18:27 ` [CONSOLIDATED PULL 27/27] perl: remove debug set -x; pwd Saul Wold
2011-10-24 13:59 ` [CONSOLIDATED PULL 00/27] Various Updates and fixes Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1319463290.25011.10.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox