| 1 |
commit: cd17366a8641123c44de0e9b86038da943afd41a |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 17:21:14 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 17:21:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd17366a |
| 7 |
|
| 8 |
app-misc/screen: add support for musl |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
app-misc/screen/screen-4.6.1.ebuild | 7 +++++-- |
| 14 |
app-misc/screen/screen-4.6.2-r1.ebuild | 5 ++++- |
| 15 |
app-misc/screen/screen-4.6.2.ebuild | 7 +++++-- |
| 16 |
3 files changed, 14 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild |
| 19 |
index 47cbadae894..ee99e929f82 100644 |
| 20 |
--- a/app-misc/screen/screen-4.6.1.ebuild |
| 21 |
+++ b/app-misc/screen/screen-4.6.1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
@@ -59,10 +59,13 @@ src_prepare() { |
| 29 |
doc/screen.1 \ |
| 30 |
|| die |
| 31 |
|
| 32 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 33 |
+ if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then |
| 34 |
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
| 35 |
fi |
| 36 |
|
| 37 |
+ # disable musl dummy headers for utmp[x] |
| 38 |
+ use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H" |
| 39 |
+ |
| 40 |
# reconfigure |
| 41 |
eautoreconf |
| 42 |
} |
| 43 |
|
| 44 |
diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild |
| 45 |
index 3d5650e3147..5c29400df81 100644 |
| 46 |
--- a/app-misc/screen/screen-4.6.2-r1.ebuild |
| 47 |
+++ b/app-misc/screen/screen-4.6.2-r1.ebuild |
| 48 |
@@ -58,10 +58,13 @@ src_prepare() { |
| 49 |
doc/screen.1 \ |
| 50 |
|| die |
| 51 |
|
| 52 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 53 |
+ if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then |
| 54 |
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
| 55 |
fi |
| 56 |
|
| 57 |
+ # disable musl dummy headers for utmp[x] |
| 58 |
+ use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H" |
| 59 |
+ |
| 60 |
# reconfigure |
| 61 |
eautoreconf |
| 62 |
} |
| 63 |
|
| 64 |
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild |
| 65 |
index 5de7a9460c3..74566a73346 100644 |
| 66 |
--- a/app-misc/screen/screen-4.6.2.ebuild |
| 67 |
+++ b/app-misc/screen/screen-4.6.2.ebuild |
| 68 |
@@ -1,4 +1,4 @@ |
| 69 |
-# Copyright 1999-2018 Gentoo Foundation |
| 70 |
+# Copyright 1999-2018 Gentoo Authors |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
EAPI=6 |
| 74 |
@@ -60,10 +60,13 @@ src_prepare() { |
| 75 |
doc/screen.1 \ |
| 76 |
|| die |
| 77 |
|
| 78 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 79 |
+ if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then |
| 80 |
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die |
| 81 |
fi |
| 82 |
|
| 83 |
+ # disable musl dummy headers for utmp[x] |
| 84 |
+ use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H" |
| 85 |
+ |
| 86 |
# reconfigure |
| 87 |
eautoreconf |
| 88 |
} |
Archives