Fixed bug #103893. Thanks to Chris Dragan for the patch.
authorChris White <chriswhite@gentoo.org>
Sat, 3 Sep 2005 08:31:26 +0000 (08:31 +0000)
committerChris White <chriswhite@gentoo.org>
Sat, 3 Sep 2005 08:31:26 +0000 (08:31 +0000)
Package-Manager: portage-2.0.51.22-r2

dev-util/jam/ChangeLog
dev-util/jam/Manifest
dev-util/jam/files/jam-2.5-dependency.patch [new file with mode: 0644]
dev-util/jam/jam-2.5-r2.ebuild

index 506b2c5ef3b8d884ed1fdcd0539b85639b373d80..31bb179588cac2c777c9631de618c14754297539 100644 (file)
@@ -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.
index f40e64df46314c7004dc9477af04a76b5ed73f68..8c52a68828cec8ea622ba25656211c09fce9eca2 100644 (file)
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 448bf205649bbd7437134cca3c788058 ChangeLog 2041
-MD5 04358f162f133c3adf3a879f928e298d jam-2.5-r2.ebuild 939
+MD5 6cd983f2856797ca40a0a0ecf7a1f20f ChangeLog 2207
+MD5 fc05f97cb4dbabde210cb0237a504cca 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
+MD5 d1bfd7c9f477fe91b1cc27f0324591a0 files/jam-2.5-cxx.patch 1089
+MD5 a1600ae1d2409408663200c6c0643e68 files/jam-2.5-dependency.patch 907
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDEF7AFdQwWVoAgN4RAgJkAJ4ktkPvGBedWdbC6VCLqlLzlOFGngCgnODQ
-8lbpPck/qUy69+wfr8atfsk=
-=6cZu
+iD8DBQFDGVhHFdQwWVoAgN4RAvbxAJ9MOXmgHmUFGFhsHMK+wZ+E6BIFqQCg+pmU
+hpAJBA9yRVi7UckDeC00nbA=
+=qqbB
 -----END PGP SIGNATURE-----
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 (file)
index 0000000..e171888
--- /dev/null
@@ -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",
index 5cd382e6df52706de30cbbcc0238923b22aaad50..997ac4f9a8866ec1b22d2b1cc3868964152d13c2 100644 (file)
@@ -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() {