diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-25 11:37:10 +0100 |
| commit | 38423c67c8a23f6a1bc42038193182e2da3116eb (patch) | |
| tree | 04e2cf4bd43601b77daa79fe654e409187093c5e /net-misc/bridge-utils | |
| parent | 623ee73d661e5ed8475cb264511f683407d87365 (diff) | |
gentoo resync : 25.04.2020
Diffstat (limited to 'net-misc/bridge-utils')
4 files changed, 50 insertions, 2 deletions
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest index 0af123eb3951..6a3a20bb2e95 100644 --- a/net-misc/bridge-utils/Manifest +++ b/net-misc/bridge-utils/Manifest @@ -1,6 +1,7 @@ AUX bridge-utils-1.5-linux-3.8.patch 435 BLAKE2B 0e9adb67c1cf21f58d85933ee2d00a21c6192500ab2dfc71f61a3da4a6367afec2d217efcca52dc515ee75b099432ff5ec2b04ae91f4cef3d0c36fba193bc0c9 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 +AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb982957d2e3a1efa0244b4d9f72decbac8990579b19137df82e758589846e4175f3cc9ddc9e2990663b3ae146cf67b9f5a808255115d1a91d53a3d50 SHA512 b4aecaa7e7fae311effc2f9ccd4ee5ca2a1be007cb94e1eb873693805fcdbc880bfb0df53d592eef46d61d433c7b5a36dbe9e7c16b836b6a3f1452e4034f50d6 DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 -EBUILD bridge-utils-1.5.ebuild 1278 BLAKE2B 91a901f5cd9357ab8537df51af01148f9ea020f84a5101b5573f778abcb76360bf3ef16fc56e71d83a358f1466090cc463b6762b7f154fcbef52c75b96513b65 SHA512 7aa509626c6e4681dad465b1fe3173c0cd9c87ba160ea418dff281f6bd8038b4c76ba2b6fa52e5a19b2e0bc282a2862c549542d02af0a2b1fc112a037df5998e -EBUILD bridge-utils-1.6.ebuild 1353 BLAKE2B 1de8bfd74d84f0191b4b508cc004e3ac8a6db354c59db9b8886f27d69fe361636349ae2930e13dff71338ce8121246de1b5d4431c5f5ff7fb5b1fb001147144f SHA512 94fab337794fc88b33d9cf4a13aaa43f4aaf082235432b2ae2bec8f2d73351b6f81dce4c47feaeb81149e4760006f53804708c29ca47098bfe804021499d9d7f +EBUILD bridge-utils-1.5.ebuild 1319 BLAKE2B fb76d4f17be11bfa531e2f43c2cefa72f5077befdbf2d4ed75f5f7722379fc082810c25d3f360be56ce4e4a69e79a4761343798137d8a34514b466d652ee7f9e SHA512 5d360cfd301b69732fa8a2f713673c776e24a3bf5963044b53ae87e86ca768aebd6c56462083bd33488d5593097bab7a655f5eea70d22a526df0b74e707395f2 +EBUILD bridge-utils-1.6.ebuild 1443 BLAKE2B 411e0487cacd73875ccbdba90d962f298240f04cefeec9a36eb90db23da8b3c51fd8aac8bda73b922d79c18b32d4524d41810dba1fd04cc7f3dc0b0353b48f9c SHA512 05dd684f3309c94cd099c19493a933e75ac7bec7abaad78e7dc91d5d246c0f6d98fb3324a529b7468804e61b4a00d79bc6954dbe10478b52d53e226193ff53bf MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild index db1eb2d66e3c..d48b3a0242bc 100644 --- a/net-misc/bridge-utils/bridge-utils-1.5.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.5.ebuild @@ -41,6 +41,10 @@ src_configure() { --with-linux-headers="$(get_headers)" } +src_compile() { + emake AR=$(tc-getAR) +} + src_install() { emake install DESTDIR="${D}" dodoc AUTHORS ChangeLog README THANKS TODO \ diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild index 1e911905bc21..11f95413077e 100644 --- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild @@ -29,6 +29,9 @@ get_headers() { } src_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + ) default eautoreconf } diff --git a/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch b/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch new file mode 100644 index 000000000000..0676d0cc9c7f --- /dev/null +++ b/net-misc/bridge-utils/files/libbridge-substitute-AR-variable-from-configure.patch @@ -0,0 +1,40 @@ +From 4dc12feb7b5a0f8f4d27c737513853896e77feea Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Tue, 21 Apr 2020 13:17:33 -0400 +Subject: [PATCH] libbridge: substitute AR variable from configure + +Bug: https://bugs.gentoo.org/717700 +Signed-off-by: Mike Gilbert <floppym@gentoo.org> +--- + configure.ac | 1 + + libbridge/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 8b2e2ea..e66f334 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,6 +12,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_TOOL([AR], [ar]) + + dnl Checks for header files. + AC_HEADER_STDC +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 7932bfe..bd55e9b 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -1,7 +1,7 @@ + + KERNEL_HEADERS=-I@KERNEL_HEADERS@ + +-AR=ar ++AR=@AR@ + RANLIB=@RANLIB@ + + CC=@CC@ +-- +2.26.1 + |