diff options
| author |   Chris White <chriswhite@gentoo.org> | 2005-09-03 08:31:26 +0000 |
|---|---|---|
| committer | Chris White <chriswhite@gentoo.org> | 2005-09-03 08:31:26 +0000 |
| commit | 57154ad84df3886cfb627659f2ae55018c61ac2c (patch) | |
| tree | f81a189711c229fa22ab77e634087986eb80e195 | |
| parent | Removed obsolete 2.19.1 version in favor of 2.20 version from bug #104150. M... (diff) | |
| download | gentoo-2-57154ad84df3886cfb627659f2ae55018c61ac2c.tar.gz gentoo-2-57154ad84df3886cfb627659f2ae55018c61ac2c.tar.bz2 gentoo-2-57154ad84df3886cfb627659f2ae55018c61ac2c.zip | |
Fixed bug #103893. Thanks to Chris Dragan for the patch.
(Portage version: 2.0.51.22-r2)
| -rw-r--r-- | dev-util/jam/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/jam/Manifest | 15 | ||||
| -rw-r--r-- | dev-util/jam/files/jam-2.5-dependency.patch | 35 | ||||
| -rw-r--r-- | dev-util/jam/jam-2.5-r2.ebuild | 3 |
4 files changed, 45 insertions, 14 deletions
diff --git a/dev-util/jam/ChangeLog b/dev-util/jam/ChangeLog index 506b2c5ef3b8..31bb179588ca 100644 --- a/dev-util/jam/ChangeLog +++ b/dev-util/jam/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/jam # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.15 2005/08/27 13:08:21 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.16 2005/09/03 08:31:26 chriswhite Exp $ + + 03 Sep 2005; Chris White <chriswhite@gentoo.org> + +files/jam-2.5-dependency.patch, jam-2.5-r2.ebuild: + Fixed bug #103893. Thanks to Chris Dragan for the patch. 27 Aug 2005; Chris White <chriswhite@gentoo.org> ChangeLog: Re-re fixing ChangeLog. diff --git a/dev-util/jam/Manifest b/dev-util/jam/Manifest index f40e64df4631..c02b746961df 100644 --- a/dev-util/jam/Manifest +++ b/dev-util/jam/Manifest @@ -1,18 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 448bf205649bbd7437134cca3c788058 ChangeLog 2041 -MD5 04358f162f133c3adf3a879f928e298d jam-2.5-r2.ebuild 939 +MD5 0b966131c970619188fe6ca43ed24179 jam-2.5-r2.ebuild 983 MD5 a5686e3c1ed6f476191f125c7589d421 jam-2.5.ebuild 788 MD5 d16e0e772acf4a3bf1cf907dc4cafafd metadata.xml 324 MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5 56 MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5-r2 56 -MD5 d1bfd7c9f477fe91b1cc27f0324591a0 files/jam-2.5-cxx.patch 1089 MD5 355cd982c580f42f3401def29ad621fe files/jam-2.5-amd64.patch 334 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDEF7AFdQwWVoAgN4RAgJkAJ4ktkPvGBedWdbC6VCLqlLzlOFGngCgnODQ -8lbpPck/qUy69+wfr8atfsk= -=6cZu ------END PGP SIGNATURE----- +MD5 d1bfd7c9f477fe91b1cc27f0324591a0 files/jam-2.5-cxx.patch 1089 +MD5 a1600ae1d2409408663200c6c0643e68 files/jam-2.5-dependency.patch 907 diff --git a/dev-util/jam/files/jam-2.5-dependency.patch b/dev-util/jam/files/jam-2.5-dependency.patch new file mode 100644 index 000000000000..e171888de9f9 --- /dev/null +++ b/dev-util/jam/files/jam-2.5-dependency.patch @@ -0,0 +1,35 @@ +Fixes dependencies of headers included by headers in another directory. + +--- jam-2.5/Jambase ++++ jam-2.5/Jambase +@@ -710,7 +710,7 @@ + local s = $(>:G=$(HDRGRIST:E)) ; + + Includes $(<) : $(s) ; +- SEARCH on $(s) = $(HDRSEARCH) ; ++ SEARCH on $(s) = $(<:D) $(HDRSEARCH) ; + NoCare $(s) ; + + # Propagate on $(<) to $(>) +--- jam-2.5/headers.c ++++ jam-2.5/headers.c +@@ -67,7 +67,7 @@ + + lol_init( &lol ); + +- lol_add( &lol, list_new( L0, t->name, 1 ) ); ++ lol_add( &lol, list_new( L0, t->boundname, 1 ) ); + lol_add( &lol, headers1( t->boundname, hdrscan ) ); + + if( lol_get( &lol, 1 ) ) +--- jam-2.5/jambase.c ++++ jam-2.5/jambase.c +@@ -452,7 +452,7 @@ + "{\n", + "local s = $(>:G=$(HDRGRIST:E)) ;\n", + "Includes $(<) : $(s) ;\n", +-"SEARCH on $(s) = $(HDRSEARCH) ;\n", ++"SEARCH on $(s) = $(<:D) $(HDRSEARCH) ;\n", + "NoCare $(s) ;\n", + "HDRSEARCH on $(s) = $(HDRSEARCH) ;\n", + "HDRSCAN on $(s) = $(HDRSCAN) ;\n", diff --git a/dev-util/jam/jam-2.5-r2.ebuild b/dev-util/jam/jam-2.5-r2.ebuild index 5cd382e6df52..997ac4f9a886 100644 --- a/dev-util/jam/jam-2.5-r2.ebuild +++ b/dev-util/jam/jam-2.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5-r2.ebuild,v 1.1 2005/07/02 00:25:41 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5-r2.ebuild,v 1.2 2005/09/03 08:31:26 chriswhite Exp $ inherit eutils @@ -21,6 +21,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-cxx.patch epatch "${FILESDIR}"/${P}-amd64.patch + epatch "${FILESDIR}"/${P}-dependency.patch } src_compile() { |