diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-05-10 01:01:15 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-10 01:01:15 +0000 |
commit | 3fd82dcb78397d84e0b62cde8cf6bf8ed0f771b6 (patch) | |
tree | f9c97885c4c0e64326542939bd25bbe1a06b7bbe /sys-libs/ncurses | |
parent | update digest #91947 (diff) | |
download | gentoo-2-3fd82dcb78397d84e0b62cde8cf6bf8ed0f771b6.tar.gz gentoo-2-3fd82dcb78397d84e0b62cde8cf6bf8ed0f771b6.tar.bz2 gentoo-2-3fd82dcb78397d84e0b62cde8cf6bf8ed0f771b6.zip |
Install libraries into /usr/lib on Darwin #92018.
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'sys-libs/ncurses')
-rw-r--r-- | sys-libs/ncurses/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/ncurses/ncurses-5.4.20050319.ebuild | 21 |
2 files changed, 18 insertions, 9 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index b6f19e3def1c..046c2b39651c 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/ncurses # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.94 2005/05/01 17:17:56 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.95 2005/05/10 01:01:15 vapier Exp $ + + 10 May 2005; Mike Frysinger <vapier@gentoo.org> + ncurses-5.4.20050319.ebuild: + Install libraries into /usr/lib on Darwin #92018. 01 May 2005; Michael Hanselmann <hansmi@gentoo.org> ncurses-5.4-r6.ebuild: Stable on ppc. diff --git a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild index 5e8d47448201..7c05f8339ff5 100644 --- a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild +++ b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.2 2005/05/03 04:48:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.3 2005/05/10 01:01:15 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -65,11 +65,14 @@ src_compile() { do_compile() { ECONF_SOURCE=${S} + local mylibprefix="" + [[ ${USERLAND} == "Darwin" ]] && mylibprefix="/usr" + # We need the basic terminfo files in /etc, bug #37026. We will # add '--with-terminfo-dirs' and then populate /etc/terminfo in # src_install() ... econf \ - --libdir=/$(get_libdir) \ + --libdir=${mylibprefix}/$(get_libdir) \ --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \ --disable-termcap \ --with-shared \ @@ -102,12 +105,14 @@ src_install() { cd "${WORKDIR}"/narrowc make DESTDIR="${D}" install || die "make narrowc install failed" - # Move static and extraneous ncurses libraries out of /lib - dodir /usr/$(get_libdir) - cd "${D}"/$(get_libdir) - mv libform* libmenu* libpanel* *.a "${D}"/usr/$(get_libdir)/ - gen_usr_ldscript lib{,n}curses.so - use unicode && gen_usr_ldscript lib{,n}cursesw.so + if [[ ${USERLAND} != "Darwin" ]] ; then + # Move static and extraneous ncurses libraries out of /lib + dodir /usr/$(get_libdir) + cd "${D}"/$(get_libdir) + mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/ + gen_usr_ldscript lib{,n}curses.so + use unicode && gen_usr_ldscript lib{,n}cursesw.so + fi # We need the basic terminfo files in /etc, bug #37026 einfo "Installing basic terminfo files in /etc..." |