Use BUILD_LIBS when creating build "gen" binary to fix cross-compiling cases where the target uses libcap.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 14 insertions, 9 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 61c013a4427b..e59778ab3b90 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.185 2011/08/29 21:08:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.186 2011/08/29 22:40:59 vapier Exp $
+
+  29 Aug 2011; Mike Frysinger <vapier@gentoo.org>
+  files/dhcp-4.2.2-bind-build-flags.patch:
+  Use BUILD_LIBS when creating build "gen" binary to fix cross-compiling cases
+  where the target uses libcap.
 
   29 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> dhcp-4.2.2-r1.ebuild:
   Make sure the bind sub-build doesn't find libcap or it can rely on it for the
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index c82f36e9eb3c..39094c37d161 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
 AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
@@ -22,7 +22,7 @@ AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 2c3dd3994f0a7f15f3fe51972dd
 AUX dhcp-4.2.0-errwarn-message.patch 1508 RMD160 604c680c22b620ae11e4c1ab83902a0c3dacaa62 SHA1 8d645f2510dac8c68d6114cb3f3c0077d832f8c0 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231
 AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 RMD160 e226e793ab4d1302dbaf288c3077f3f6c8758b97 SHA1 d4ea97c3383c7f7769ab36c8d36674a3297dc1f9 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c
 AUX dhcp-4.2.1-nogateway.patch 1648 RMD160 820956e072e4a84ffabdee6714377ae23827b7bf SHA1 5c6c8118ee6b4b8524451827756aab052766ca09 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4
-AUX dhcp-4.2.2-bind-build-flags.patch 470 RMD160 d9fda98de985ed25354b63e1559f35d1cf3d7abc SHA1 96b10820eb38eddf4a2cd73f190f5735db24478d SHA256 289ea12b0d46707fcbb48127c637a5897b472abf9ab990d784101c255cdd8838
+AUX dhcp-4.2.2-bind-build-flags.patch 476 RMD160 1ffbbd844541a6a491634da3a9d9feb034f44bcb SHA1 4dd1dd1b9e2b27a6b0437f3f1cc8005e03998ca6 SHA256 a16d9da5fc29c95c46cf7e2401744292b898f692d49dea4753991505e03c1ca8
 AUX dhcp-4.2.2-bind-disable.patch 390 RMD160 02204d85273a8f54765b0eb9aac3b6236e4ceaba SHA1 0736031fce4f00ee7734322955037db65f736dc9 SHA256 0871e10198af86414f85c72d21beec640cb0b7c7c4ccea2550d4886bade1417e
 AUX dhcp-4.2.2-bind-parallel-build.patch 304 RMD160 76ed813b19206ec780aa3a7ccc44aaf7037f704c SHA1 20cbf2cf57060a3c573bf9b8ef69b91ec81d487f SHA256 cff322da581742ef1a8019641ee9689c588c3f9fef883b55e28af52823f08838
 AUX dhcp-4.2.2-dhclient-resolvconf.patch 14535 RMD160 7527ea3e52a6913ae3ba2d8a6e07cc3d1c04f492 SHA1 02d83d591d361d6a6543245b39a51531f8926cc4 SHA256 a87f33e33fc3f3a103264909cc85c477036949f2c00c428d562c12b560f09877
@@ -43,12 +43,12 @@ EBUILD dhcp-3.1.3_p1.ebuild 7741 RMD160 62ef4cf524beadef2847675416ea5982f23a3f8e
 EBUILD dhcp-4.2.1_p1.ebuild 6610 RMD160 0d058e755de185a58fc62a3d047021671de9a54a SHA1 5cf96d94250ba44b3120ae6a961c04e4f01996b5 SHA256 70534d654d5a2d02ea009d87f77bf86724ee94b7587f5b6959eef90475e5062a
 EBUILD dhcp-4.2.2-r1.ebuild 7894 RMD160 13f3a4e2a9ea39fbd76dd6e6b2fd0794643a86c9 SHA1 0495e7fc318b19242a61e78b6179ff61700e7d99 SHA256 6787973217634489e3e45e67c212ff60ce80bd721a198cf3348b2961ddd17e8e
 EBUILD dhcp-4.2.2.ebuild 7474 RMD160 a80b1fb2eb31ba8dc20f9d6fb914e37a5cf12174 SHA1 089b6bb9e87f07c950d7ee4261e081ba59f29fa5 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc99ea4d16e5abd74ccf9755
-MISC ChangeLog 31966 RMD160 72d9f7ddf43d0343c56bddf0183cd33c608cd3f9 SHA1 97dd0b21488d0d25f2e7a3a910c5e8e9ccf9f375 SHA256 25cb8f378ccd3d67109ae7a4b47116a6873dc52a37beeda1f85b1dce6e981d43
+MISC ChangeLog 32168 RMD160 bbdea981251006a6c0014e77cebc2fd69c44cc80 SHA1 46361d320b870487e5957add3c00226ce9a43e3d SHA256 27757411a8a353e3aef883c060c6cec97f4d71efe308d927b3cf73520be154ee
 MISC metadata.xml 500 RMD160 b5ad909ab2b12acd20e78039e33fda0a27383c9e SHA1 2fc5cee8e105e75a251195254c96085a0f3fa9a3 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5b/8IACgkQAiZjviIA2XjJWgCfV7FjS0ohvroaUhF7zOyWR9PQ
-GQcAn3MBY7DfL4YD3sfzs8KPG8LPhKXt
-=1WFC
+iF4EAREIAAYFAk5cFXYACgkQaC/OocHi7JbTHgD/Xdo4ohLwtNmX9EDRUvRUp828
+SA+PMul9S1gk6f+6vowA/ResgwE87fnlOh4eZrTsfPXnEE8qbzum/uJor/Ayuz26
+=2Wt1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
index 5d74e1a83022..ae33638284b8 100644
--- a/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
+++ b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
@@ -8,7 +8,7 @@ doesn't use them for the "gen" tool
  
  gen: ${srcdir}/gen.c
 -	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	${BUILD_CC} ${BUILD_CFLAGS} ${CINCLUDES} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
++	${BUILD_CC} ${BUILD_CFLAGS} ${CINCLUDES} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
  
  #We don't need rbtdb64 for this library
  #rbtdb64.@O@: rbtdb.c