| 1 |
commit: 8c3df282744fd5ef80fbc49b273f7830c858f93b |
| 2 |
Author: Oz N Tiram <oz.tiram <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Dec 8 16:47:30 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 9 09:25:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3df282 |
| 7 |
|
| 8 |
dev-libs/libite: fix failing tests |
| 9 |
|
| 10 |
* This commit adds two patches from upstream |
| 11 |
They should be removed as soon as upstream |
| 12 |
releases new version. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/640202 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/6481 |
| 16 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 17 |
|
| 18 |
dev-libs/libite/files/libite-2.0.0-fix-path.patch | 12 +++++++++++ |
| 19 |
.../libite/files/libite-2.0.0-fix-which-path.patch | 25 ++++++++++++++++++++++ |
| 20 |
dev-libs/libite/libite-2.0.0.ebuild | 5 +++++ |
| 21 |
3 files changed, 42 insertions(+) |
| 22 |
|
| 23 |
diff --git a/dev-libs/libite/files/libite-2.0.0-fix-path.patch b/dev-libs/libite/files/libite-2.0.0-fix-path.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..47a3dad538b |
| 26 |
--- /dev/null |
| 27 |
+++ b/dev-libs/libite/files/libite-2.0.0-fix-path.patch |
| 28 |
@@ -0,0 +1,12 @@ |
| 29 |
+diff --git a/tests/which.c b/tests/which.c |
| 30 |
+index cda57c6..3e74867 100644 |
| 31 |
+--- a/tests/which.c |
| 32 |
++++ b/tests/which.c |
| 33 |
+@@ -21,6 +21,7 @@ int main(void) |
| 34 |
+ { NULL, 0 } |
| 35 |
+ }; |
| 36 |
+ |
| 37 |
++ setenv("PATH", "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin", 1); |
| 38 |
+ for (i = 0; test[i].cmd; i++) { |
| 39 |
+ char *path; |
| 40 |
+ |
| 41 |
|
| 42 |
diff --git a/dev-libs/libite/files/libite-2.0.0-fix-which-path.patch b/dev-libs/libite/files/libite-2.0.0-fix-which-path.patch |
| 43 |
new file mode 100644 |
| 44 |
index 00000000000..301c4371589 |
| 45 |
--- /dev/null |
| 46 |
+++ b/dev-libs/libite/files/libite-2.0.0-fix-which-path.patch |
| 47 |
@@ -0,0 +1,25 @@ |
| 48 |
+diff --git a/tests/which.c b/tests/which.c |
| 49 |
+index 46dcccf..cda57c6 100644 |
| 50 |
+--- a/tests/which.c |
| 51 |
++++ b/tests/which.c |
| 52 |
+@@ -11,13 +11,13 @@ int main(void) |
| 53 |
+ int result = 0; |
| 54 |
+ size_t i; |
| 55 |
+ struct tc test[] = { |
| 56 |
+- { "ls", 1 }, |
| 57 |
+- { "free", 1 }, |
| 58 |
+- { "modinfo", 1 }, |
| 59 |
+- { "useradd", 1 }, |
| 60 |
+- { "/bin/which", 1 }, |
| 61 |
+- { "/bin/ps aux", 1 }, |
| 62 |
+- { "/etc/passwd", 0 }, |
| 63 |
++ { "ls", 1 }, |
| 64 |
++ { "free", 1 }, |
| 65 |
++ { "modinfo", 1 }, |
| 66 |
++ { "useradd", 1 }, |
| 67 |
++ { "/usr/bin/which", 1 }, |
| 68 |
++ { "/bin/ps aux", 1 }, |
| 69 |
++ { "/etc/passwd", 0 }, |
| 70 |
+ { NULL, 0 } |
| 71 |
+ }; |
| 72 |
+ |
| 73 |
|
| 74 |
diff --git a/dev-libs/libite/libite-2.0.0.ebuild b/dev-libs/libite/libite-2.0.0.ebuild |
| 75 |
index 4dff1da74a4..0380b8e161c 100644 |
| 76 |
--- a/dev-libs/libite/libite-2.0.0.ebuild |
| 77 |
+++ b/dev-libs/libite/libite-2.0.0.ebuild |
| 78 |
@@ -12,6 +12,11 @@ SLOT="0" |
| 79 |
KEYWORDS="~amd64 ~x86" |
| 80 |
IUSE="static-libs" |
| 81 |
|
| 82 |
+PATCHES=( |
| 83 |
+ "${FILESDIR}"/${P}-fix-which-path.patch |
| 84 |
+ "${FILESDIR}"/${P}-fix-path.patch |
| 85 |
+) |
| 86 |
+ |
| 87 |
src_configure(){ |
| 88 |
econf --enable-static=$(usex static-libs) |
| 89 |
} |
Archives