[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/

[Anthony G. Basile]

commit:     cd17366a8641123c44de0e9b86038da943afd41a
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 17:21:14 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 17:21:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd17366a

app-misc/screen: add support for musl

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-misc/screen/screen-4.6.1.ebuild    | 7 +++++--
 app-misc/screen/screen-4.6.2-r1.ebuild | 5 ++++-
 app-misc/screen/screen-4.6.2.ebuild    | 7 +++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app-misc/screen/screen-4.6.1.ebuild 
b/app-misc/screen/screen-4.6.1.ebuild
index 47cbadae894..ee99e929f82 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,10 +59,13 @@ src_prepare() {
                doc/screen.1 \
                || die
 
-       if [[ ${CHOST} == *-darwin* ]] ; then
+       if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
                sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
        fi
 
+       # disable musl dummy headers for utmp[x]
+       use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
        # reconfigure
        eautoreconf
 }

diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild 
b/app-misc/screen/screen-4.6.2-r1.ebuild
index 3d5650e3147..5c29400df81 100644
--- a/app-misc/screen/screen-4.6.2-r1.ebuild
+++ b/app-misc/screen/screen-4.6.2-r1.ebuild
@@ -58,10 +58,13 @@ src_prepare() {
                doc/screen.1 \
                || die
 
-       if [[ ${CHOST} == *-darwin* ]] ; then
+       if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
                sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
        fi
 
+       # disable musl dummy headers for utmp[x]
+       use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
        # reconfigure
        eautoreconf
 }

diff --git a/app-misc/screen/screen-4.6.2.ebuild 
b/app-misc/screen/screen-4.6.2.ebuild
index 5de7a9460c3..74566a73346 100644
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,10 +60,13 @@ src_prepare() {
                doc/screen.1 \
                || die
 
-       if [[ ${CHOST} == *-darwin* ]] ; then
+       if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
                sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
        fi
 
+       # disable musl dummy headers for utmp[x]
+       use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
        # reconfigure
        eautoreconf
 }