diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-25 19:55:42 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-25 19:55:42 +0000 |
| commit | 1d93f7370b70c7ad944276d36be5751b1088d16d (patch) | |
| tree | c5ab1df5d5ecba6284612a8efab0564b56800ea0 /sys-freebsd/freebsd-lib | |
| parent | ppc stable, bug #130887 (diff) | |
| download | gentoo-2-1d93f7370b70c7ad944276d36be5751b1088d16d.tar.gz gentoo-2-1d93f7370b70c7ad944276d36be5751b1088d16d.tar.bz2 gentoo-2-1d93f7370b70c7ad944276d36be5751b1088d16d.zip | |
Build and installa lso libm.
(Portage version: 2.1_pre9-r4)
Diffstat (limited to 'sys-freebsd/freebsd-lib')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild | 20 |
2 files changed, 21 insertions, 5 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 2fcdcfa49d5e..7030445aba57 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.8 2006/04/25 18:49:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.9 2006/04/25 19:55:42 flameeyes Exp $ + + 25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + freebsd-lib-6.0-r2.ebuild: + Build and installa lso libm. 25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-lib-6.0-r2.ebuild: diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild index 27f10c5b4bba..39fbbfe6d042 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.2 2006/04/25 18:49:52 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.0-r2.ebuild,v 1.3 2006/04/25 19:55:42 flameeyes Exp $ inherit bsdmk freebsd flag-o-matic toolchain-funcs @@ -119,11 +119,14 @@ src_compile() { export YACC='yacc -by' CHOST=${CTARGET} tc-export CC LD CXX + local machine + machine=$(tc-arch-kernel ${CTARGET}) + local csudir - if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then - csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" + if [[ -d "${S}/csu/${machine}-elf" ]]; then + csudir="${S}/csu/${machine}-elf" else - csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})" + csudir="${S}/csu/${machine}" fi cd "${csudir}" $(freebsd_get_bmake) ${mymakeopts} || die "make csu failed" @@ -133,6 +136,10 @@ src_compile() { append-ldflags "-B ${csudir}" cd "${S}/libc" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" + + append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}" + cd "${S}/msun" + $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" else cd "${S}" freebsd_src_compile @@ -175,6 +182,11 @@ src_install() { cd "${S}/libc" $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/lib" || die "Install failed" + + cd "${S}/msun" + $(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \ + INCLUDEDIR="/usr/${CTARGET}/include" \ + SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/lib" || die "Install failed" else cd "${S}" mkinstall || die "Install failed" |