* [PATCH 0/4] Misc recipe fixes
@ 2011-11-29 19:30 nitin.a.kamble
2011-11-29 19:30 ` [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly nitin.a.kamble
` (4 more replies)
0 siblings, 5 replies; 21+ messages in thread
From: nitin.a.kamble @ 2011-11-29 19:30 UTC (permalink / raw)
To: openembedded-core; +Cc: Phil Blundell
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Earlier libtool commit is reworked to keep the SUMMARY line and clean up
the white space changes
gmp commit is also reworked to simplify the changes as per Phils feedback.
Nitin
The following changes since commit cf02474bda67f4f1043b2e95e1b371b2354585a7:
qt-mobility: Add missing patch (2011-11-29 14:36:18 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc
Nitin A Kamble (4):
gmp: also generate the libgmpcxx library & package it properly
binutils: fix for .debug files QA warnings
libtool: Upgrade from 2.4 -> 2.4.2
libx11-trip_1.4.4: fix the source tarall checksums
.../binutils/binutils-cross-canadian_2.22.bb | 2 +-
.../binutils/binutils-crosssdk_2.22.bb | 2 +-
meta/recipes-devtools/binutils/binutils.inc | 2 +
meta/recipes-devtools/binutils/binutils_2.22.bb | 2 +-
.../libtool/{libtool.inc => libtool-2.4.2.inc} | 19 ++-
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 +-
.../avoid_absolute_paths_for_general_utils.patch | 8 +-
.../libtool/libtool/fix-final-rpath.patch | 10 +-
.../libtool/libtool/fix-rpath.patch | 12 +-
.../libtool/libtool/prefix-manpage-fix.patch | 10 +-
meta/recipes-devtools/libtool/libtool/prefix.patch | 42 ++--
.../libtool/libtool/rename-with-sysroot.patch | 194 ++++++++++----------
.../libtool/libtool/resolve-sysroot.patch | 42 -----
.../libtool/libtool/trailingslash.patch | 10 +-
.../libtool/libtool/use-sysroot-in-libpath.patch | 8 +-
.../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
.../recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | 5 +-
meta/recipes-support/gmp/gmp.inc | 5 +
meta/recipes-support/gmp/gmp_5.0.2.bb | 2 +-
22 files changed, 181 insertions(+), 215 deletions(-)
rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (68%)
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%)
--
1.7.6.4
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 19:30 [PATCH 0/4] Misc recipe fixes nitin.a.kamble @ 2011-11-29 19:30 ` nitin.a.kamble 2011-11-29 19:37 ` Otavio Salvador 2011-11-29 20:20 ` Phil Blundell 2011-11-29 19:30 ` [PATCH 2/4] binutils: fix for .debug files QA warnings nitin.a.kamble ` (3 subsequent siblings) 4 siblings, 2 replies; 21+ messages in thread From: nitin.a.kamble @ 2011-11-29 19:30 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> configure runs few checks to make sure c++ compiler and runtime are working as expected with the --enable-cxx=detect option. And it enables building of libgmpxx library. Same as earlier the libgmp.so.10.x file is packaged in the libgmp10 package, and a new package named libgmpxx4 is added for libgmpxx.so.4.x file. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Phil Blundell <philb@gnu.org> --- meta/recipes-support/gmp/gmp.inc | 5 +++++ meta/recipes-support/gmp/gmp_5.0.2.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc index 66349e6..5ba118d 100644 --- a/meta/recipes-support/gmp/gmp.inc +++ b/meta/recipes-support/gmp/gmp.inc @@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm" acpaths = "" BBCLASSEXTEND = "native nativesdk" + +EXTRA_OECONF += " --enable-cxx=detect" + +PACKAGES =+ "libgmpxx" +FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bb b/meta/recipes-support/gmp/gmp_5.0.2.bb index 16bdcbc..873fc3e 100644 --- a/meta/recipes-support/gmp/gmp_5.0.2.bb +++ b/meta/recipes-support/gmp/gmp_5.0.2.bb @@ -2,7 +2,7 @@ require gmp.inc LICENSE="LGPLv3&GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" -PR = "r1" +PR = "r2" SRC_URI_append += "file://sh4-asmfix.patch \ file://use-includedir.patch " -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 19:30 ` [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly nitin.a.kamble @ 2011-11-29 19:37 ` Otavio Salvador 2011-11-29 20:20 ` Phil Blundell 1 sibling, 0 replies; 21+ messages in thread From: Otavio Salvador @ 2011-11-29 19:37 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 2238 bytes --] Acked-by: Otavio Salvador <otavio@ossystems.com.br> On Tue, Nov 29, 2011 at 17:30, <nitin.a.kamble@intel.com> wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > configure runs few checks to make sure c++ compiler and runtime are working > as expected with the --enable-cxx=detect option. And it enables building > of libgmpxx library. > > Same as earlier the libgmp.so.10.x file is packaged in the libgmp10 > package, > and a new package named libgmpxx4 is added for libgmpxx.so.4.x file. > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > Signed-off-by: Phil Blundell <philb@gnu.org> > --- > meta/recipes-support/gmp/gmp.inc | 5 +++++ > meta/recipes-support/gmp/gmp_5.0.2.bb | 2 +- > 2 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-support/gmp/gmp.inc > b/meta/recipes-support/gmp/gmp.inc > index 66349e6..5ba118d 100644 > --- a/meta/recipes-support/gmp/gmp.inc > +++ b/meta/recipes-support/gmp/gmp.inc > @@ -14,3 +14,8 @@ ARM_INSTRUCTION_SET = "arm" > acpaths = "" > > BBCLASSEXTEND = "native nativesdk" > + > +EXTRA_OECONF += " --enable-cxx=detect" > + > +PACKAGES =+ "libgmpxx" > +FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" > diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bbb/meta/recipes-support/gmp/ > gmp_5.0.2.bb > index 16bdcbc..873fc3e 100644 > --- a/meta/recipes-support/gmp/gmp_5.0.2.bb > +++ b/meta/recipes-support/gmp/gmp_5.0.2.bb > @@ -2,7 +2,7 @@ require gmp.inc > LICENSE="LGPLv3&GPLv3" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ > > file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790" > -PR = "r1" > +PR = "r2" > > SRC_URI_append += "file://sh4-asmfix.patch \ > file://use-includedir.patch " > -- > 1.7.6.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br [-- Attachment #2: Type: text/html, Size: 3674 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 19:30 ` [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly nitin.a.kamble 2011-11-29 19:37 ` Otavio Salvador @ 2011-11-29 20:20 ` Phil Blundell 2011-11-29 21:08 ` Kamble, Nitin A 1 sibling, 1 reply; 21+ messages in thread From: Phil Blundell @ 2011-11-29 20:20 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-11-29 at 11:30 -0800, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > configure runs few checks to make sure c++ compiler and runtime are working > as expected with the --enable-cxx=detect option. And it enables building > of libgmpxx library. > > Same as earlier the libgmp.so.10.x file is packaged in the libgmp10 package, > and a new package named libgmpxx4 is added for libgmpxx.so.4.x file. > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > Signed-off-by: Phil Blundell <philb@gnu.org> Um, why does this patch have my name in Signed-off-by? p. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 20:20 ` Phil Blundell @ 2011-11-29 21:08 ` Kamble, Nitin A 2011-11-29 21:12 ` Koen Kooi 2011-11-29 22:05 ` Phil Blundell 0 siblings, 2 replies; 21+ messages in thread From: Kamble, Nitin A @ 2011-11-29 21:08 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > Phil Blundell > Sent: Tuesday, November 29, 2011 12:20 PM > To: Patches and discussions about the oe-core layer > Subject: Re: [OE-core] [PATCH 1/4] gmp: also generate the libgmpcxx > library & package it properly > > On Tue, 2011-11-29 at 11:30 -0800, nitin.a.kamble@intel.com wrote: > > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > > > configure runs few checks to make sure c++ compiler and runtime are > working > > as expected with the --enable-cxx=detect option. And it enables > building > > of libgmpxx library. > > > > Same as earlier the libgmp.so.10.x file is packaged in the libgmp10 > package, > > and a new package named libgmpxx4 is added for libgmpxx.so.4.x file. > > > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > > Signed-off-by: Phil Blundell <philb@gnu.org> > > Um, why does this patch have my name in Signed-off-by? > > p. Because I took the code from your email. Nitin > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 21:08 ` Kamble, Nitin A @ 2011-11-29 21:12 ` Koen Kooi 2011-11-29 21:43 ` Kamble, Nitin A 2011-11-29 22:05 ` Phil Blundell 1 sibling, 1 reply; 21+ messages in thread From: Koen Kooi @ 2011-11-29 21:12 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1366 bytes --] Op 29 nov. 2011, om 22:08 heeft Kamble, Nitin A het volgende geschreven: > > >> -----Original Message----- >> From: openembedded-core-bounces@lists.openembedded.org >> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of >> Phil Blundell >> Sent: Tuesday, November 29, 2011 12:20 PM >> To: Patches and discussions about the oe-core layer >> Subject: Re: [OE-core] [PATCH 1/4] gmp: also generate the libgmpcxx >> library & package it properly >> >> On Tue, 2011-11-29 at 11:30 -0800, nitin.a.kamble@intel.com wrote: >>> From: Nitin A Kamble <nitin.a.kamble@intel.com> >>> >>> configure runs few checks to make sure c++ compiler and runtime are >> working >>> as expected with the --enable-cxx=detect option. And it enables >> building >>> of libgmpxx library. >>> >>> Same as earlier the libgmp.so.10.x file is packaged in the libgmp10 >> package, >>> and a new package named libgmpxx4 is added for libgmpxx.so.4.x file. >>> >>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> >>> Signed-off-by: Phil Blundell <philb@gnu.org> >> >> Um, why does this patch have my name in Signed-off-by? >> >> p. > > Because I took the code from your email. That still doesn't explain why you added a signed-off-by without asking. A SOB has a defined meaning, willy nilly adding people amounts to fraud. [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 169 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 21:12 ` Koen Kooi @ 2011-11-29 21:43 ` Kamble, Nitin A 0 siblings, 0 replies; 21+ messages in thread From: Kamble, Nitin A @ 2011-11-29 21:43 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > Koen Kooi > Sent: Tuesday, November 29, 2011 1:12 PM > To: Patches and discussions about the oe-core layer > Subject: Re: [OE-core] [PATCH 1/4] gmp: also generate the libgmpcxx > library & package it properly > > > Op 29 nov. 2011, om 22:08 heeft Kamble, Nitin A het volgende > geschreven: > > > > > > >> -----Original Message----- > >> From: openembedded-core-bounces@lists.openembedded.org > >> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf > >> Of Phil Blundell > >> Sent: Tuesday, November 29, 2011 12:20 PM > >> To: Patches and discussions about the oe-core layer > >> Subject: Re: [OE-core] [PATCH 1/4] gmp: also generate the libgmpcxx > >> library & package it properly > >> > >> On Tue, 2011-11-29 at 11:30 -0800, nitin.a.kamble@intel.com wrote: > >>> From: Nitin A Kamble <nitin.a.kamble@intel.com> > >>> > >>> configure runs few checks to make sure c++ compiler and runtime are > >> working > >>> as expected with the --enable-cxx=detect option. And it enables > >> building > >>> of libgmpxx library. > >>> > >>> Same as earlier the libgmp.so.10.x file is packaged in the libgmp10 > >> package, > >>> and a new package named libgmpxx4 is added for libgmpxx.so.4.x > file. > >>> > >>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > >>> Signed-off-by: Phil Blundell <philb@gnu.org> > >> > >> Um, why does this patch have my name in Signed-off-by? > >> > >> p. > > > > Because I took the code from your email. > > That still doesn't explain why you added a signed-off-by without > asking. A SOB has a defined meaning, willy nilly adding people amounts > to fraud. > Phil, if you are not ok, then I can take out your signed-off from the commit. Let me know. Nitin ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 21:08 ` Kamble, Nitin A 2011-11-29 21:12 ` Koen Kooi @ 2011-11-29 22:05 ` Phil Blundell 2011-11-29 22:51 ` Kamble, Nitin A 1 sibling, 1 reply; 21+ messages in thread From: Phil Blundell @ 2011-11-29 22:05 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-11-29 at 13:08 -0800, Kamble, Nitin A wrote: > > Um, why does this patch have my name in Signed-off-by? > > Because I took the code from your email. Ah, I see. Well, I appreciate you giving me the credit for that, and in this particular instance I don't have a problem with it, but as a general rule it isn't the done thing to add "Signed-off-by" lines naming other people. A note in the commit message saying that you'd taken the code from my email would have been fine. p. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 22:05 ` Phil Blundell @ 2011-11-29 22:51 ` Kamble, Nitin A 2011-12-01 16:57 ` Phil Blundell 0 siblings, 1 reply; 21+ messages in thread From: Kamble, Nitin A @ 2011-11-29 22:51 UTC (permalink / raw) To: Patches and discussions about the oe-core layer > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > Phil Blundell > Sent: Tuesday, November 29, 2011 2:06 PM > To: Patches and discussions about the oe-core layer > Subject: Re: [OE-core] [PATCH 1/4] gmp: also generate the libgmpcxx > library & package it properly > > On Tue, 2011-11-29 at 13:08 -0800, Kamble, Nitin A wrote: > > > Um, why does this patch have my name in Signed-off-by? > > > > Because I took the code from your email. > > Ah, I see. Well, I appreciate you giving me the credit for that, and > in > this particular instance I don't have a problem with it, but as a > general rule it isn't the done thing to add "Signed-off-by" lines > naming > other people. A note in the commit message saying that you'd taken the > code from my email would have been fine. > > p. Thank you for the explanation. BTW where can I find official rules about signed-off-by line Nitin > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-11-29 22:51 ` Kamble, Nitin A @ 2011-12-01 16:57 ` Phil Blundell 2011-12-01 17:17 ` Richard Purdie 0 siblings, 1 reply; 21+ messages in thread From: Phil Blundell @ 2011-12-01 16:57 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-11-29 at 14:51 -0800, Kamble, Nitin A wrote: > Thank you for the explanation. BTW where can I find official rules about signed-off-by line The "Signed-off-by" idiom originated with the kernel people and Documentation/SubmittingPatches in the linux source tree contains a fairly good description of what it means to them. I'm not sure that there are any official rules about its use in OE apart from what's in the Commit Patch Message Guidelines (see the wiki). p. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-12-01 16:57 ` Phil Blundell @ 2011-12-01 17:17 ` Richard Purdie 2011-12-01 17:26 ` Koen Kooi 0 siblings, 1 reply; 21+ messages in thread From: Richard Purdie @ 2011-12-01 17:17 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2011-12-01 at 16:57 +0000, Phil Blundell wrote: > On Tue, 2011-11-29 at 14:51 -0800, Kamble, Nitin A wrote: > > Thank you for the explanation. BTW where can I find official rules about signed-off-by line > > The "Signed-off-by" idiom originated with the kernel people and > Documentation/SubmittingPatches in the linux source tree contains a > fairly good description of what it means to them. > > I'm not sure that there are any official rules about its use in OE apart > from what's in the Commit Patch Message Guidelines (see the wiki). The yocto docs do mention what the specific meaning of the line is. Nobody should be adding that line unless they understand what it means. Its based off the kernel's model. http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#how-to-submit-a-change Cheers, Richard ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-12-01 17:17 ` Richard Purdie @ 2011-12-01 17:26 ` Koen Kooi 2011-12-01 18:37 ` Joshua Lock 2011-12-01 23:42 ` Philip Balister 0 siblings, 2 replies; 21+ messages in thread From: Koen Kooi @ 2011-12-01 17:26 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 837 bytes --] Op 1 dec. 2011, om 18:17 heeft Richard Purdie het volgende geschreven: > On Thu, 2011-12-01 at 16:57 +0000, Phil Blundell wrote: >> On Tue, 2011-11-29 at 14:51 -0800, Kamble, Nitin A wrote: >>> Thank you for the explanation. BTW where can I find official rules about signed-off-by line >> >> The "Signed-off-by" idiom originated with the kernel people and >> Documentation/SubmittingPatches in the linux source tree contains a >> fairly good description of what it means to them. >> >> I'm not sure that there are any official rules about its use in OE apart >> from what's in the Commit Patch Message Guidelines (see the wiki). > > The yocto docs do mention what the specific meaning of the line is. <pedantic mode>But this is oe-core.</pedantic mode>. Shall we all agree it's the same for OE-core as well? [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 169 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-12-01 17:26 ` Koen Kooi @ 2011-12-01 18:37 ` Joshua Lock 2011-12-01 19:29 ` Koen Kooi 2011-12-01 23:42 ` Philip Balister 1 sibling, 1 reply; 21+ messages in thread From: Joshua Lock @ 2011-12-01 18:37 UTC (permalink / raw) To: openembedded-core On 01/12/11 09:26, Koen Kooi wrote: > > Op 1 dec. 2011, om 18:17 heeft Richard Purdie het volgende geschreven: > >> On Thu, 2011-12-01 at 16:57 +0000, Phil Blundell wrote: >>> On Tue, 2011-11-29 at 14:51 -0800, Kamble, Nitin A wrote: >>>> Thank you for the explanation. BTW where can I find official rules about signed-off-by line >>> >>> The "Signed-off-by" idiom originated with the kernel people and >>> Documentation/SubmittingPatches in the linux source tree contains a >>> fairly good description of what it means to them. >>> >>> I'm not sure that there are any official rules about its use in OE apart >>> from what's in the Commit Patch Message Guidelines (see the wiki). >> >> The yocto docs do mention what the specific meaning of the line is. > > <pedantic mode>But this is oe-core.</pedantic mode>. Shall we all agree it's the same for OE-core as well? Isn't that the standard mode? ;-) I expect folks have the same understanding as stated in the kernel and Yocto docs when using SOB - I see no reason for OE Core to introduce ambiguity. Joshua -- Joshua Lock Yocto Project "Johannes factotum" Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-12-01 18:37 ` Joshua Lock @ 2011-12-01 19:29 ` Koen Kooi 0 siblings, 0 replies; 21+ messages in thread From: Koen Kooi @ 2011-12-01 19:29 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1570 bytes --] Op 1 dec. 2011, om 19:37 heeft Joshua Lock het volgende geschreven: > > > On 01/12/11 09:26, Koen Kooi wrote: >> >> Op 1 dec. 2011, om 18:17 heeft Richard Purdie het volgende geschreven: >> >>> On Thu, 2011-12-01 at 16:57 +0000, Phil Blundell wrote: >>>> On Tue, 2011-11-29 at 14:51 -0800, Kamble, Nitin A wrote: >>>>> Thank you for the explanation. BTW where can I find official rules about signed-off-by line >>>> >>>> The "Signed-off-by" idiom originated with the kernel people and >>>> Documentation/SubmittingPatches in the linux source tree contains a >>>> fairly good description of what it means to them. >>>> >>>> I'm not sure that there are any official rules about its use in OE apart >>>> from what's in the Commit Patch Message Guidelines (see the wiki). >>> >>> The yocto docs do mention what the specific meaning of the line is. >> >> <pedantic mode>But this is oe-core.</pedantic mode>. Shall we all agree it's the same for OE-core as well? > > Isn't that the standard mode? ;-) It actually is, glad someone noticed :) > I expect folks have the same understanding as stated in the kernel and > Yocto docs when using SOB - I see no reason for OE Core to introduce > ambiguity. > > Joshua > -- > Joshua Lock > Yocto Project "Johannes factotum" > Intel Open Source Technology Centre > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 169 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly 2011-12-01 17:26 ` Koen Kooi 2011-12-01 18:37 ` Joshua Lock @ 2011-12-01 23:42 ` Philip Balister 1 sibling, 0 replies; 21+ messages in thread From: Philip Balister @ 2011-12-01 23:42 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 12/01/2011 12:26 PM, Koen Kooi wrote: > > Op 1 dec. 2011, om 18:17 heeft Richard Purdie het volgende geschreven: > >> On Thu, 2011-12-01 at 16:57 +0000, Phil Blundell wrote: >>> On Tue, 2011-11-29 at 14:51 -0800, Kamble, Nitin A wrote: >>>> Thank you for the explanation. BTW where can I find official rules about signed-off-by line >>> >>> The "Signed-off-by" idiom originated with the kernel people and >>> Documentation/SubmittingPatches in the linux source tree contains a >>> fairly good description of what it means to them. >>> >>> I'm not sure that there are any official rules about its use in OE apart >>> from what's in the Commit Patch Message Guidelines (see the wiki). >> >> The yocto docs do mention what the specific meaning of the line is. > > <pedantic mode>But this is oe-core.</pedantic mode>. Shall we all agree it's the same for OE-core as well? Yes. No sense having the same phrases mean different things in different layers. Philip > > > > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 2/4] binutils: fix for .debug files QA warnings 2011-11-29 19:30 [PATCH 0/4] Misc recipe fixes nitin.a.kamble 2011-11-29 19:30 ` [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly nitin.a.kamble @ 2011-11-29 19:30 ` nitin.a.kamble 2011-11-29 19:30 ` [PATCH 3/4] libtool: Upgrade from 2.4 -> 2.4.2 nitin.a.kamble ` (2 subsequent siblings) 4 siblings, 0 replies; 21+ messages in thread From: nitin.a.kamble @ 2011-11-29 19:30 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> THis commit fixes these QA warnings for binutils recipe WARNING: For recipe binutils, the following files/directories were installed but not shipped in any package: WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/strip WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/objcopy WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/objdump WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ld WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/nm WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/as WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ranlib WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ld.bfd WARNING: /usr/arm-oe-linux-gnueabi/bin/.debug/ar Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> --- .../binutils/binutils-cross-canadian_2.22.bb | 2 +- .../binutils/binutils-crosssdk_2.22.bb | 2 +- meta/recipes-devtools/binutils/binutils.inc | 2 ++ meta/recipes-devtools/binutils/binutils_2.22.bb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb index 7dad2a6..e91e7dc 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-canadian.inc -PR = "r0" +PR = "r1" diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb index 0d6efff..21289cd 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb @@ -4,7 +4,7 @@ inherit crosssdk PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" -PR = "r0" +PR = "r1" do_configure_prepend () { sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 51e4257..5cb2cc9 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -45,6 +45,8 @@ FILES_${PN}-symlinks = " \ ${bindir}/size \ ${bindir}/strip" +FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/bin/.debug" + B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ diff --git a/meta/recipes-devtools/binutils/binutils_2.22.bb b/meta/recipes-devtools/binutils/binutils_2.22.bb index f0ed5e8..f1e7e12 100644 --- a/meta/recipes-devtools/binutils/binutils_2.22.bb +++ b/meta/recipes-devtools/binutils/binutils_2.22.bb @@ -1,6 +1,6 @@ require binutils.inc -PR = "r0" +PR = "r1" LIC_FILES_CHKSUM="\ file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 3/4] libtool: Upgrade from 2.4 -> 2.4.2 2011-11-29 19:30 [PATCH 0/4] Misc recipe fixes nitin.a.kamble 2011-11-29 19:30 ` [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly nitin.a.kamble 2011-11-29 19:30 ` [PATCH 2/4] binutils: fix for .debug files QA warnings nitin.a.kamble @ 2011-11-29 19:30 ` nitin.a.kamble 2011-11-29 19:30 ` [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums nitin.a.kamble 2011-12-01 20:41 ` [PATCH 0/4] Misc recipe fixes Richard Purdie 4 siblings, 0 replies; 21+ messages in thread From: nitin.a.kamble @ 2011-11-29 19:30 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> Rebased patches to the newer source code and deleted resolve-sysroot.patch since its already applied upstream merged libtool-2.4.2.inc & libtool.inc files replaced PR with ${INC_PR}.0 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../libtool/{libtool.inc => libtool-2.4.2.inc} | 19 ++- 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 +- .../avoid_absolute_paths_for_general_utils.patch | 8 +- .../libtool/libtool/fix-final-rpath.patch | 10 +- .../libtool/libtool/fix-rpath.patch | 12 +- .../libtool/libtool/prefix-manpage-fix.patch | 10 +- meta/recipes-devtools/libtool/libtool/prefix.patch | 42 ++-- .../libtool/libtool/rename-with-sysroot.patch | 194 ++++++++++---------- .../libtool/libtool/resolve-sysroot.patch | 42 ----- .../libtool/libtool/trailingslash.patch | 10 +- .../libtool/libtool/use-sysroot-in-libpath.patch | 8 +- .../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +- 15 files changed, 168 insertions(+), 208 deletions(-) rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (68%) 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 68% rename from meta/recipes-devtools/libtool/libtool.inc rename to meta/recipes-devtools/libtool/libtool-2.4.2.inc index ef9095b..0375ccf 100644 --- a/meta/recipes-devtools/libtool/libtool.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc @@ -8,15 +8,20 @@ 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 @@ -26,3 +31,13 @@ do_compile_prepend () { 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 5df6908..5003c9b 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 = "r5" +PR = "${INC_PR}.0" PACKAGES = "" SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch" diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb similarity index 96% rename from meta/recipes-devtools/libtool/libtool-native_2.4.bb rename to meta/recipes-devtools/libtool/libtool-native_2.4.2.bb index 3d0998e..f12e6a1 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb @@ -2,7 +2,7 @@ require libtool-${PV}.inc DEPENDS = "" -PR = "r4" +PR = "${INC_PR}.0" SRC_URI += "file://prefix.patch" inherit native diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb similarity index 97% rename from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb rename to meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb index bf1928d..03854f2 100644 --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb @@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r5" +PR = "${INC_PR}.0" SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch" diff --git a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch index 6cc88d8..3c751ed 100644 --- a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch +++ b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch @@ -12,11 +12,11 @@ Nitin A Kamble <nitin.a.kamble@intel.com> 2011/02/18 -Index: libtool-2.4/libltdl/config/general.m4sh +Index: libtool-2.4.2/libltdl/config/general.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/general.m4sh 2010-08-31 23:02:45.000000000 -0700 -+++ libtool-2.4/libltdl/config/general.m4sh 2011-02-18 09:59:09.482038240 -0800 -@@ -45,15 +45,15 @@ +--- libtool-2.4.2.orig/libltdl/config/general.m4sh ++++ libtool-2.4.2/libltdl/config/general.m4sh +@@ -45,15 +45,15 @@ progpath="$0" M4SH_VERBATIM([[ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch index 4c36e4e..5c275ff 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch @@ -7,11 +7,11 @@ This works around the issue until it gets sorted out upstream. Fix suggested by Richard Purdie <richard.purdie@intel.com> Signed-off-by: Scott Garman <scott.a.garman@intel.com> -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-01-13 14:10:14.580025108 +0000 -+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-01-13 15:10:18.540025113 +0000 -@@ -7246,9 +7246,11 @@ +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -7268,9 +7268,11 @@ EOF test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -25,7 +25,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else -@@ -7981,6 +7983,10 @@ +@@ -7999,6 +8001,10 @@ EOF hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch index 3cdeaec..d35bac0 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch @@ -6,11 +6,11 @@ RP 23/9/2011 Upstream-status: Pending -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-09-23 08:38:06.365043626 +0100 -+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100 -@@ -7264,8 +7264,14 @@ +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -7286,8 +7286,14 @@ EOF esac fi else @@ -27,7 +27,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8001,8 +8007,14 @@ +@@ -8019,8 +8025,14 @@ EOF esac fi else @@ -44,7 +44,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8052,8 +8064,14 @@ +@@ -8070,8 +8082,14 @@ EOF esac fi else diff --git a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch index f9de383..879778c 100644 --- a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch +++ b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch @@ -6,12 +6,12 @@ nstead use the build version of libtool to generate the man pages. Date: 2010/07/09 Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -Index: libtool-2.2.10/Makefile.am +Index: libtool-2.4.2/Makefile.am =================================================================== ---- libtool-2.2.10.orig/Makefile.am -+++ libtool-2.2.10/Makefile.am -@@ -337,7 +337,7 @@ update_mans = \ - PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ +--- libtool-2.4.2.orig/Makefile.am ++++ libtool-2.4.2/Makefile.am +@@ -333,7 +333,7 @@ update_mans = \ + PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \ $(HELP2MAN) --output=$@ $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh - $(update_mans) --help-option=--help-all libtool diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch index e6eca1f..5e46e68 100644 --- a/meta/recipes-devtools/libtool/libtool/prefix.patch +++ b/meta/recipes-devtools/libtool/libtool/prefix.patch @@ -18,10 +18,10 @@ the simplest fix is just to remove $SHELL. Updated: Date: 2011/11/09 RP -Index: libtool-2.4/libltdl/m4/libtool.m4 +Index: libtool-2.4.2/libltdl/m4/libtool.m4 =================================================================== ---- libtool-2.4.orig/libltdl/m4/libtool.m4 -+++ libtool-2.4/libltdl/m4/libtool.m4 +--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 ++++ libtool-2.4.2/libltdl/m4/libtool.m4 @@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) LIBTOOL_DEPS="$ltmain" @@ -32,7 +32,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 AC_SUBST(LIBTOOL)dnl _LT_SETUP -@@ -204,7 +205,7 @@ aix3*) +@@ -206,7 +207,7 @@ aix3*) esac # Global variables: @@ -41,10 +41,10 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, -Index: libtool-2.4/Makefile.am +Index: libtool-2.4.2/Makefile.am =================================================================== ---- libtool-2.4.orig/Makefile.am -+++ libtool-2.4/Makefile.am +--- libtool-2.4.2.orig/Makefile.am ++++ libtool-2.4.2/Makefile.am @@ -31,7 +31,7 @@ AM_LDFLAGS = DIST_SUBDIRS = . EXTRA_DIST = @@ -54,8 +54,17 @@ Index: libtool-2.4/Makefile.am CLEANFILES = MOSTLYCLEANFILES = -@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre - ## ---------------- ## +@@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li + ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ + ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ + ChangeLog.2008 ChangeLog.2009 ChangeLog.2010 +-CLEANFILES += libtool libtoolize libtoolize.tmp \ ++CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ + $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp + + ## These are the replacements that need to be made at bootstrap time, +@@ -231,7 +231,7 @@ configure_edit = sed \ + -e 's,@SED\@,$(SED),g' # The libtool distributor and the standalone libtool script. -bin_SCRIPTS = libtoolize libtool @@ -63,7 +72,7 @@ Index: libtool-2.4/Makefile.am libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status rm -f libtoolize.tmp libtoolize -@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib +@@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to # We used to do this with a 'stamp-vcl' file, but non-gmake builds # would rerun configure on every invocation, so now we manually # check the version numbers from the build rule when necessary. @@ -74,7 +83,7 @@ Index: libtool-2.4/Makefile.am if test -f "$$target"; then \ set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ test "$$actualver" = "$$correctver" && rebuild=false; \ -@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $ +@@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $ case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ done; \ if $$rebuild; then \ @@ -85,16 +94,7 @@ Index: libtool-2.4/Makefile.am fi .PHONY: configure-subdirs -@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li - ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \ - ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \ - ChangeLog.2008 ChangeLog.2009 --CLEANFILES += libtool libtoolize libtoolize.tmp \ -+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \ - $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp - - ## We build ltversion.m4 here, instead of from config.status, -@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ +@@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch index 9c8696b..438c639 100644 --- a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch +++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch @@ -10,21 +10,21 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html -Khem Raj <raj.khem@gmail.com> -Index: libtool-2.4/configure +Index: libtool-2.4.2/configure =================================================================== ---- libtool-2.4.orig/configure -+++ libtool-2.4/configure -@@ -786,7 +786,7 @@ enable_static +--- libtool-2.4.2.orig/configure ++++ libtool-2.4.2/configure +@@ -795,7 +795,7 @@ enable_static with_pic enable_fast_install with_gnu_ld -with_sysroot +with_libtool_sysroot enable_libtool_lock - with_gnu_ld ' + ac_precious_vars='build_alias @@ -1451,7 +1451,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -32,7 +32,7 @@ Index: libtool-2.4/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6798,29 +6798,29 @@ fi +@@ -6804,29 +6804,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -70,11 +70,11 @@ Index: libtool-2.4/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/libltdl/configure +Index: libtool-2.4.2/libltdl/configure =================================================================== ---- libtool-2.4.orig/libltdl/configure -+++ libtool-2.4/libltdl/configure -@@ -739,7 +739,7 @@ with_pic +--- libtool-2.4.2.orig/libltdl/configure ++++ libtool-2.4.2/libltdl/configure +@@ -747,7 +747,7 @@ with_pic enable_fast_install enable_dependency_tracking with_gnu_ld @@ -83,8 +83,8 @@ Index: libtool-2.4/libltdl/configure enable_libtool_lock enable_ltdl_install ' -@@ -1388,7 +1388,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1395,7 +1395,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -92,7 +92,7 @@ Index: libtool-2.4/libltdl/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6004,29 +6004,29 @@ fi +@@ -6017,29 +6017,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -130,11 +130,11 @@ Index: libtool-2.4/libltdl/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/libltdl/m4/libtool.m4 +Index: libtool-2.4.2/libltdl/m4/libtool.m4 =================================================================== ---- libtool-2.4.orig/libltdl/m4/libtool.m4 -+++ libtool-2.4/libltdl/m4/libtool.m4 -@@ -1180,27 +1180,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr +--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 ++++ libtool-2.4.2/libltdl/m4/libtool.m4 +@@ -1224,27 +1224,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) @@ -168,11 +168,11 @@ Index: libtool-2.4/libltdl/m4/libtool.m4 AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac -Index: libtool-2.4/tests/cdemo/configure +Index: libtool-2.4.2/tests/cdemo/configure =================================================================== ---- libtool-2.4.orig/tests/cdemo/configure -+++ libtool-2.4/tests/cdemo/configure -@@ -726,7 +726,7 @@ enable_static +--- libtool-2.4.2.orig/tests/cdemo/configure ++++ libtool-2.4.2/tests/cdemo/configure +@@ -734,7 +734,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -181,8 +181,8 @@ Index: libtool-2.4/tests/cdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1373,7 +1373,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1380,7 +1380,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -190,7 +190,7 @@ Index: libtool-2.4/tests/cdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5884,29 +5884,29 @@ fi +@@ -5897,29 +5897,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -228,11 +228,11 @@ Index: libtool-2.4/tests/cdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/demo/configure +Index: libtool-2.4.2/tests/demo/configure =================================================================== ---- libtool-2.4.orig/tests/demo/configure -+++ libtool-2.4/tests/demo/configure -@@ -730,7 +730,7 @@ enable_static +--- libtool-2.4.2.orig/tests/demo/configure ++++ libtool-2.4.2/tests/demo/configure +@@ -738,7 +738,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -241,8 +241,8 @@ Index: libtool-2.4/tests/demo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1377,7 +1377,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1384,7 +1384,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -250,7 +250,7 @@ Index: libtool-2.4/tests/demo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5882,29 +5882,29 @@ fi +@@ -5895,29 +5895,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -288,11 +288,11 @@ Index: libtool-2.4/tests/demo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/depdemo/configure +Index: libtool-2.4.2/tests/depdemo/configure =================================================================== ---- libtool-2.4.orig/tests/depdemo/configure -+++ libtool-2.4/tests/depdemo/configure -@@ -728,7 +728,7 @@ enable_static +--- libtool-2.4.2.orig/tests/depdemo/configure ++++ libtool-2.4.2/tests/depdemo/configure +@@ -736,7 +736,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -301,8 +301,8 @@ Index: libtool-2.4/tests/depdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1375,7 +1375,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1382,7 +1382,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -310,7 +310,7 @@ Index: libtool-2.4/tests/depdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5879,29 +5879,29 @@ fi +@@ -5892,29 +5892,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -348,11 +348,11 @@ Index: libtool-2.4/tests/depdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/f77demo/configure +Index: libtool-2.4.2/tests/f77demo/configure =================================================================== ---- libtool-2.4.orig/tests/f77demo/configure -+++ libtool-2.4/tests/f77demo/configure -@@ -730,7 +730,7 @@ enable_static +--- libtool-2.4.2.orig/tests/f77demo/configure ++++ libtool-2.4.2/tests/f77demo/configure +@@ -738,7 +738,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -361,8 +361,8 @@ Index: libtool-2.4/tests/f77demo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1382,7 +1382,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1387,7 +1387,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -370,7 +370,7 @@ Index: libtool-2.4/tests/f77demo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6864,29 +6864,29 @@ fi +@@ -6877,29 +6877,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -408,11 +408,11 @@ Index: libtool-2.4/tests/f77demo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/fcdemo/configure +Index: libtool-2.4.2/tests/fcdemo/configure =================================================================== ---- libtool-2.4.orig/tests/fcdemo/configure -+++ libtool-2.4/tests/fcdemo/configure -@@ -731,7 +731,7 @@ enable_static +--- libtool-2.4.2.orig/tests/fcdemo/configure ++++ libtool-2.4.2/tests/fcdemo/configure +@@ -739,7 +739,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -421,8 +421,8 @@ Index: libtool-2.4/tests/fcdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1383,7 +1383,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1388,7 +1388,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -430,7 +430,7 @@ Index: libtool-2.4/tests/fcdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6963,29 +6963,29 @@ fi +@@ -6976,29 +6976,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -468,11 +468,11 @@ Index: libtool-2.4/tests/fcdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/mdemo/configure +Index: libtool-2.4.2/tests/mdemo/configure =================================================================== ---- libtool-2.4.orig/tests/mdemo/configure -+++ libtool-2.4/tests/mdemo/configure -@@ -734,7 +734,7 @@ enable_static +--- libtool-2.4.2.orig/tests/mdemo/configure ++++ libtool-2.4.2/tests/mdemo/configure +@@ -742,7 +742,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -481,8 +481,8 @@ Index: libtool-2.4/tests/mdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1381,7 +1381,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1388,7 +1388,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -490,7 +490,7 @@ Index: libtool-2.4/tests/mdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5911,29 +5911,29 @@ fi +@@ -5924,29 +5924,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -528,11 +528,11 @@ Index: libtool-2.4/tests/mdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/mdemo2/configure +Index: libtool-2.4.2/tests/mdemo2/configure =================================================================== ---- libtool-2.4.orig/tests/mdemo2/configure -+++ libtool-2.4/tests/mdemo2/configure -@@ -726,7 +726,7 @@ enable_static +--- libtool-2.4.2.orig/tests/mdemo2/configure ++++ libtool-2.4.2/tests/mdemo2/configure +@@ -734,7 +734,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -541,8 +541,8 @@ Index: libtool-2.4/tests/mdemo2/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1373,7 +1373,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1380,7 +1380,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -550,7 +550,7 @@ Index: libtool-2.4/tests/mdemo2/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5884,29 +5884,29 @@ fi +@@ -5897,29 +5897,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -588,11 +588,11 @@ Index: libtool-2.4/tests/mdemo2/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/pdemo/configure +Index: libtool-2.4.2/tests/pdemo/configure =================================================================== ---- libtool-2.4.orig/tests/pdemo/configure -+++ libtool-2.4/tests/pdemo/configure -@@ -729,7 +729,7 @@ enable_static +--- libtool-2.4.2.orig/tests/pdemo/configure ++++ libtool-2.4.2/tests/pdemo/configure +@@ -737,7 +737,7 @@ enable_static with_pic enable_fast_install with_gnu_ld @@ -601,8 +601,8 @@ Index: libtool-2.4/tests/pdemo/configure enable_libtool_lock ' ac_precious_vars='build_alias -@@ -1376,7 +1376,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use +@@ -1383,7 +1383,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -610,7 +610,7 @@ Index: libtool-2.4/tests/pdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -5887,29 +5887,29 @@ fi +@@ -5900,29 +5900,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -648,10 +648,10 @@ Index: libtool-2.4/tests/pdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/sysroot.at +Index: libtool-2.4.2/tests/sysroot.at =================================================================== ---- libtool-2.4.orig/tests/sysroot.at -+++ libtool-2.4/tests/sysroot.at +--- libtool-2.4.2.orig/tests/sysroot.at ++++ libtool-2.4.2/tests/sysroot.at @@ -64,7 +64,7 @@ while read file; do done]) @@ -679,21 +679,21 @@ Index: libtool-2.4/tests/sysroot.at AC_SUBST([sysroot]) AC_OUTPUT(Makefile) ]]) -Index: libtool-2.4/tests/tagdemo/configure +Index: libtool-2.4.2/tests/tagdemo/configure =================================================================== ---- libtool-2.4.orig/tests/tagdemo/configure -+++ libtool-2.4/tests/tagdemo/configure -@@ -736,7 +736,7 @@ enable_static +--- libtool-2.4.2.orig/tests/tagdemo/configure ++++ libtool-2.4.2/tests/tagdemo/configure +@@ -744,7 +744,7 @@ enable_static with_pic enable_fast_install with_gnu_ld -with_sysroot +with_libtool_sysroot enable_libtool_lock - with_gnu_ld ' -@@ -1392,7 +1392,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use + ac_precious_vars='build_alias +@@ -1395,7 +1395,7 @@ Optional Packages: + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR @@ -701,7 +701,7 @@ Index: libtool-2.4/tests/tagdemo/configure (or the compiler's sysroot if not specified). Some influential environment variables: -@@ -6907,29 +6907,29 @@ fi +@@ -6916,29 +6916,29 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -739,11 +739,11 @@ Index: libtool-2.4/tests/tagdemo/configure as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac -Index: libtool-2.4/tests/testsuite +Index: libtool-2.4.2/tests/testsuite =================================================================== ---- libtool-2.4.orig/tests/testsuite -+++ libtool-2.4/tests/testsuite -@@ -25277,7 +25277,7 @@ $at_traceon; } +--- libtool-2.4.2.orig/tests/testsuite ++++ libtool-2.4.2/tests/testsuite +@@ -26676,7 +26676,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -752,7 +752,7 @@ Index: libtool-2.4/tests/testsuite #??? if test "$shlibpath_var" = PATH; then -@@ -25475,7 +25475,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -26874,7 +26874,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -761,7 +761,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -25652,7 +25652,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -27051,7 +27051,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -770,7 +770,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -25993,7 +25993,7 @@ $at_traceon; } +@@ -27392,7 +27392,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -779,7 +779,7 @@ Index: libtool-2.4/tests/testsuite #??? if test "$shlibpath_var" = PATH; then -@@ -26191,7 +26191,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -27590,7 +27590,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -788,7 +788,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -26368,7 +26368,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -27767,7 +27767,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -797,7 +797,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -26709,7 +26709,7 @@ $at_traceon; } +@@ -28108,7 +28108,7 @@ $at_traceon; } LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" @@ -806,7 +806,7 @@ Index: libtool-2.4/tests/testsuite #??? if test "$shlibpath_var" = PATH; then -@@ -26907,7 +26907,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -28306,7 +28306,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -815,7 +815,7 @@ Index: libtool-2.4/tests/testsuite AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF -@@ -27084,7 +27084,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -28483,7 +28483,7 @@ AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT diff --git a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch deleted file mode 100644 index 0341987..0000000 --- a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Pending - -Sometimes .las have =/a/b/c.la in dependency_libs. This should be -resolved to sysroot. - --Khem Raj <raj.khem@gmail.com> - -Index: libtool-2.4/libltdl/config/ltmain.m4sh -=================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4/libltdl/config/ltmain.m4sh -@@ -8479,7 +8479,8 @@ EOF - *.la) - func_basename "$deplib" - name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ func_resolve_sysroot "$deplib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -@@ -8505,7 +8506,9 @@ EOF - *.la) - func_basename "$lib" - name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" -@@ -8524,7 +8527,8 @@ EOF - # the library: - func_basename "$lib" - name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ func_resolve_sysroot "$lib" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" diff --git a/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/meta/recipes-devtools/libtool/libtool/trailingslash.patch index d71a770..bb7a761 100644 --- a/meta/recipes-devtools/libtool/libtool/trailingslash.patch +++ b/meta/recipes-devtools/libtool/libtool/trailingslash.patch @@ -11,12 +11,12 @@ Merged a patch received from Gary Thomas <gary@mlbassoc.com> Date: 2010/07/12 Nitin A Kamble <nitin.a.kamble@intel.com> -Index: libtool-2.2.10/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.2.10/libltdl/config/ltmain.m4sh -@@ -1634,8 +1634,15 @@ func_mode_install () - dir="$dir$objdir" +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -2167,8 +2167,15 @@ func_mode_install () + func_append dir "$objdir" if test -n "$relink_command"; then + # Strip any trailing slash from the destination. diff --git a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch index 5e2eec9..0cd66ad 100644 --- a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch +++ b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch @@ -7,11 +7,11 @@ i.e. when lt_sysroot is not set, it will still behave the same and add -Khem Raj <raj.khem@gmail.com> -Index: libtool-2.4/libltdl/config/ltmain.m4sh +Index: libtool-2.4.2/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.4.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.4/libltdl/config/ltmain.m4sh -@@ -6122,7 +6122,7 @@ func_mode_link () +--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh ++++ libtool-2.4.2/libltdl/config/ltmain.m4sh +@@ -6138,7 +6138,7 @@ func_mode_link () fi else # We cannot seem to hardcode it, guess we'll fake it. diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.2.bb similarity index 94% rename from meta/recipes-devtools/libtool/libtool_2.4.bb rename to meta/recipes-devtools/libtool/libtool_2.4.2.bb index 3002215..a2eb4ea 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.2.bb @@ -1,6 +1,6 @@ require libtool-${PV}.inc -PR = "r4" +PR = "${INC_PR}.0" # # We want the results of libtool-cross preserved - don't stage anything ourselves. -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums 2011-11-29 19:30 [PATCH 0/4] Misc recipe fixes nitin.a.kamble ` (2 preceding siblings ...) 2011-11-29 19:30 ` [PATCH 3/4] libtool: Upgrade from 2.4 -> 2.4.2 nitin.a.kamble @ 2011-11-29 19:30 ` nitin.a.kamble 2011-11-29 19:38 ` Otavio Salvador 2011-12-01 20:41 ` [PATCH 0/4] Misc recipe fixes Richard Purdie 4 siblings, 1 reply; 21+ messages in thread From: nitin.a.kamble @ 2011-11-29 19:30 UTC (permalink / raw) To: openembedded-core From: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> --- .../recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb index 7aed308..c94a3a8 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb @@ -13,8 +13,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \ file://keysymdef_include.patch \ file://makekeys_crosscompile.patch" - -SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" -SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/ --disable-xcms " -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums 2011-11-29 19:30 ` [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums nitin.a.kamble @ 2011-11-29 19:38 ` Otavio Salvador 2011-11-29 19:40 ` Kamble, Nitin A 0 siblings, 1 reply; 21+ messages in thread From: Otavio Salvador @ 2011-11-29 19:38 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 1638 bytes --] Typo on commit log. It is libx11-trim not trip ;) On Tue, Nov 29, 2011 at 17:30, <nitin.a.kamble@intel.com> wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> > --- > .../recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bbb/meta/recipes-graphics/xorg-lib/ > libx11-trim_1.4.4.bb > index 7aed308..c94a3a8 100644 > --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb > +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb > @@ -13,8 +13,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \ > file://keysymdef_include.patch \ > file://makekeys_crosscompile.patch" > > - > -SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" > -SRC_URI[sha256sum] = > "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" > +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" > +SRC_URI[sha256sum] = > "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" > > EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/ --disable-xcms " > -- > 1.7.6.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br [-- Attachment #2: Type: text/html, Size: 2825 bytes --] ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums 2011-11-29 19:38 ` Otavio Salvador @ 2011-11-29 19:40 ` Kamble, Nitin A 0 siblings, 0 replies; 21+ messages in thread From: Kamble, Nitin A @ 2011-11-29 19:40 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 2302 bytes --] Thank you for catching the typo. I have fixed it in the contrib branch. Nitin From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Otavio Salvador Sent: Tuesday, November 29, 2011 11:38 AM To: Patches and discussions about the oe-core layer Subject: Re: [OE-core] [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums Typo on commit log. It is libx11-trim not trip ;) On Tue, Nov 29, 2011 at 17:30, <nitin.a.kamble@intel.com<mailto:nitin.a.kamble@intel.com>> wrote: From: Nitin A Kamble <nitin.a.kamble@intel.com<mailto:nitin.a.kamble@intel.com>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com<mailto:nitin.a.kamble@intel.com>> --- .../recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb<http://libx11-trim_1.4.4.bb> | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb<http://libx11-trim_1.4.4.bb> b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb<http://libx11-trim_1.4.4.bb> index 7aed308..c94a3a8 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb<http://libx11-trim_1.4.4.bb> +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb<http://libx11-trim_1.4.4.bb> @@ -13,8 +13,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \ file://keysymdef_include.patch \ file://makekeys_crosscompile.patch" - -SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" -SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" +SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" +SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/ --disable-xcms " -- 1.7.6.4 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br<mailto:otavio@ossystems.com.br> http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br [-- Attachment #2: Type: text/html, Size: 6067 bytes --] ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 0/4] Misc recipe fixes 2011-11-29 19:30 [PATCH 0/4] Misc recipe fixes nitin.a.kamble ` (3 preceding siblings ...) 2011-11-29 19:30 ` [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums nitin.a.kamble @ 2011-12-01 20:41 ` Richard Purdie 4 siblings, 0 replies; 21+ messages in thread From: Richard Purdie @ 2011-12-01 20:41 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2011-11-29 at 11:30 -0800, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble <nitin.a.kamble@intel.com> > > Earlier libtool commit is reworked to keep the SUMMARY line and clean up > the white space changes > > gmp commit is also reworked to simplify the changes as per Phils feedback. > > Nitin > > The following changes since commit cf02474bda67f4f1043b2e95e1b371b2354585a7: > > qt-mobility: Add missing patch (2011-11-29 14:36:18 +0000) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib nitin/misc > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc > > Nitin A Kamble (4): > gmp: also generate the libgmpcxx library & package it properly > binutils: fix for .debug files QA warnings > libtool: Upgrade from 2.4 -> 2.4.2 > libx11-trip_1.4.4: fix the source tarall checksums Merged to master (apart from the libx11 change which I'd already merged a different patch for), thanks. Richard ^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2011-12-01 23:49 UTC | newest] Thread overview: 21+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-29 19:30 [PATCH 0/4] Misc recipe fixes nitin.a.kamble 2011-11-29 19:30 ` [PATCH 1/4] gmp: also generate the libgmpcxx library & package it properly nitin.a.kamble 2011-11-29 19:37 ` Otavio Salvador 2011-11-29 20:20 ` Phil Blundell 2011-11-29 21:08 ` Kamble, Nitin A 2011-11-29 21:12 ` Koen Kooi 2011-11-29 21:43 ` Kamble, Nitin A 2011-11-29 22:05 ` Phil Blundell 2011-11-29 22:51 ` Kamble, Nitin A 2011-12-01 16:57 ` Phil Blundell 2011-12-01 17:17 ` Richard Purdie 2011-12-01 17:26 ` Koen Kooi 2011-12-01 18:37 ` Joshua Lock 2011-12-01 19:29 ` Koen Kooi 2011-12-01 23:42 ` Philip Balister 2011-11-29 19:30 ` [PATCH 2/4] binutils: fix for .debug files QA warnings nitin.a.kamble 2011-11-29 19:30 ` [PATCH 3/4] libtool: Upgrade from 2.4 -> 2.4.2 nitin.a.kamble 2011-11-29 19:30 ` [PATCH 4/4] libx11-trip_1.4.4: fix the source tarall checksums nitin.a.kamble 2011-11-29 19:38 ` Otavio Salvador 2011-11-29 19:40 ` Kamble, Nitin A 2011-12-01 20:41 ` [PATCH 0/4] Misc recipe fixes Richard Purdie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox