diff options
author | Joe MacDonald <joe_macdonald@mentor.com> | 2017-11-01 09:23:42 -0400 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2018-01-08 11:57:34 -0500 |
commit | f0764a12deb3a64c6824669ca41e0c07f4ab8080 (patch) | |
tree | cb1ca7c70bfecad5263f08ad8a689d9ffef5c82a /meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch | |
parent | f9a1fe6ab2dfb6a53e58fc8da3a1580e76954e5e (diff) | |
download | meta-openembedded-f0764a12deb3a64c6824669ca41e0c07f4ab8080.tar.gz |
bridge-utils: update to v1.6
Updating to the latest version (1.6) and taking the opportunity to clean
up the old patches, switch to the upstream git repo for SRC_URI and make
the requested change to the older AR patch from a while back.
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
merge conflict with master-next
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch')
-rw-r--r-- | meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch new file mode 100644 index 000000000..3f65761f5 --- /dev/null +++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From c924f66743c054d7ebafef90ca1bbebc96732357 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe MacDonald <joe_macdonald@mentor.com> | ||
3 | Date: Mon, 30 Oct 2017 13:48:33 -0400 | ||
4 | Subject: [PATCH] libbridge: Modifying the AR to cross toolchain | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | The Makefile uses the host “ar” tool when it should be using the ar from | ||
10 | the target toolchain. | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
15 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> | ||
16 | --- | ||
17 | configure.ac | 1 + | ||
18 | libbridge/Makefile.in | 2 +- | ||
19 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index 8b2e2ea..8426b7c 100644 | ||
23 | --- a/configure.ac | ||
24 | +++ b/configure.ac | ||
25 | @@ -12,6 +12,10 @@ dnl Checks for programs. | ||
26 | AC_PROG_CC | ||
27 | AC_PROG_INSTALL | ||
28 | AC_PROG_RANLIB | ||
29 | +AN_MAKEVAR([AR], [AC_PROG_AR]) | ||
30 | +AN_PROGRAM([ar], [AC_PROG_AR]) | ||
31 | +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) | ||
32 | +AC_PROG_AR | ||
33 | |||
34 | dnl Checks for header files. | ||
35 | AC_HEADER_STDC | ||
36 | diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in | ||
37 | index 7932bfe..bd55e9b 100644 | ||
38 | --- a/libbridge/Makefile.in | ||
39 | +++ b/libbridge/Makefile.in | ||
40 | @@ -1,7 +1,7 @@ | ||
41 | |||
42 | KERNEL_HEADERS=-I@KERNEL_HEADERS@ | ||
43 | |||
44 | -AR=ar | ||
45 | +AR=@AR@ | ||
46 | RANLIB=@RANLIB@ | ||
47 | |||
48 | CC=@CC@ | ||
49 | -- | ||
50 | 2.7.4 | ||
51 | |||