diff options
Diffstat (limited to 'meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch')
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch b/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch index 1c8a79ce0b..be60fe97f6 100644 --- a/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch +++ b/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch | |||
@@ -1,23 +1,26 @@ | |||
1 | From afc8712a9e6c72fbd03c36f84ecf8703e5d22a8c Mon Sep 17 00:00:00 2001 | 1 | From 711e2f76890e3c5b08f64859d9fd913ddbec7d50 Mon Sep 17 00:00:00 2001 |
2 | From: Christopher Larson <chris_larson@mentor.com> | 2 | From: Christopher Larson <chris_larson@mentor.com> |
3 | Date: Mon, 15 Feb 2016 16:11:32 -0700 | 3 | Date: Mon, 22 Oct 2018 15:26:47 +0800 |
4 | Subject: [PATCH 2/2] Add argument to control the libargp dependency | 4 | Subject: [PATCH 2/4] Add argument to control the libargp dependency |
5 | 5 | ||
6 | This ensures that the builds are always deterministic. If the argument isn't | 6 | This ensures that the builds are always deterministic. If the argument isn't |
7 | passed, the default behavior is to use libargp if the libc doesn't have argp. | 7 | passed, the default behavior is to use libargp if the libc doesn't have argp. |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 10 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
11 | |||
12 | Rebase to 6.6 | ||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
11 | --- | 14 | --- |
12 | configure.ac | 55 ++++++++++++++++++++++++++++++++++++------------------- | 15 | configure.ac | 55 ++++++++++++++++++++++++++++++++++++------------------- |
13 | 1 file changed, 36 insertions(+), 19 deletions(-) | 16 | 1 file changed, 36 insertions(+), 19 deletions(-) |
14 | 17 | ||
15 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
16 | index 04fcd25..11a5321 100644 | 19 | index c4a5dd8..dd1c30f 100644 |
17 | --- a/configure.ac | 20 | --- a/configure.ac |
18 | +++ b/configure.ac | 21 | +++ b/configure.ac |
19 | @@ -32,6 +32,13 @@ AC_ARG_WITH([libgcrypt], | 22 | @@ -40,6 +40,13 @@ AC_ARG_WITH([nistbeacon], |
20 | [with_libgcrypt=check] | 23 | [with_nistbeacon=check] |
21 | ) | 24 | ) |
22 | 25 | ||
23 | +AC_ARG_WITH([libargp], | 26 | +AC_ARG_WITH([libargp], |
@@ -29,8 +32,8 @@ index 04fcd25..11a5321 100644 | |||
29 | + | 32 | + |
30 | dnl Make sure anyone changing configure.ac/Makefile.am has a clue | 33 | dnl Make sure anyone changing configure.ac/Makefile.am has a clue |
31 | AM_MAINTAINER_MODE | 34 | AM_MAINTAINER_MODE |
32 | 35 | AM_PROG_AS | |
33 | @@ -82,27 +89,37 @@ AS_IF( | 36 | @@ -135,27 +142,37 @@ AS_IF( |
34 | ] | 37 | ] |
35 | ) | 38 | ) |
36 | 39 | ||
@@ -88,5 +91,5 @@ index 04fcd25..11a5321 100644 | |||
88 | dnl ----------------- | 91 | dnl ----------------- |
89 | dnl Configure options | 92 | dnl Configure options |
90 | -- | 93 | -- |
91 | 2.2.1 | 94 | 2.7.4 |
92 | 95 | ||