Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 278829 Details for
Bug 309681
media-plugins/live shouldn't call ld directly
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
live-2011.06.16.ebuild-multilib.patch
live-2011.06.16.ebuild-multilib.patch (text/plain), 4.55 KB, created by
Nathan Phillip Brink (binki) (RETIRED)
on 2011-07-02 05:02:26 UTC
(
hide
)
Description:
live-2011.06.16.ebuild-multilib.patch
Filename:
MIME Type:
Creator:
Nathan Phillip Brink (binki) (RETIRED)
Created:
2011-07-02 05:02:26 UTC
Size:
4.55 KB
patch
obsolete
>--- /home/ohnobinki/gentoo-x86/media-plugins/live/live-2011.06.16.ebuild 2011-06-22 10:28:26.000000000 -0400 >+++ live-2011.06.16.ebuild 2011-07-01 19:18:37.000000000 -0400 >@@ -1,9 +1,10 @@ > # Copyright 1999-2011 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2011.06.16.ebuild,v 1.1 2011/06/22 14:28:26 aballier Exp $ > >-EAPI=3 >-inherit flag-o-matic eutils toolchain-funcs multilib >+EAPI=4 >+ >+inherit eutils toolchain-funcs multilib > > DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications" > HOMEPAGE="http://www.live555.com/" >@@ -22,22 +23,28 @@ > LIVE_ABI_VERSION=4 > > src_prepare() { >- cd "${WORKDIR}" >+ epatch "${FILESDIR}"/${PN}-2009.09.28-buildorder.patch > epatch "${FILESDIR}/${PN}-recursive.patch" > >- cp -pPR live live-shared >- mv live live-static >+ cp -pPR live live-shared || die >+ pushd live-shared || die >+ # To build shared libraries with proper NEEDED entries, we need >+ # these libraries to link to eachother. This patch does this. >+ epatch "${FILESDIR}"/${PN}-2009.06.02-libdeps.patch >+ popd || die >+ >+ mv live live-static || die > >- cp "${FILESDIR}/config.gentoo" live-static >- cp "${FILESDIR}/config.gentoo-so-r1" live-shared >+ cp "${FILESDIR}"/config.gentoo-r1 live-static/ || die >+ cp "${FILESDIR}"/config.gentoo-so-r2 live-shared/ || die > > case ${CHOST} in > *-solaris*) > sed -i \ > -e '/^COMPILE_OPTS /s/$/ -DSOLARIS/' \ > -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \ >- live-static/config.gentoo \ >- live-shared/config.gentoo-so-r1 \ >+ live-static/config.gentoo-r1 \ >+ live-shared/config.gentoo-so-r2 \ > || die > ;; > *-darwin*) >@@ -46,59 +53,60 @@ > -e '/^LINK /s/$/ /' \ > -e '/^LIBRARY_LINK /s/$/ /' \ > -e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \ >- live-static/config.gentoo \ >+ live-static/config.gentoo-r1 \ > || die static > sed -i \ > -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \ > -e '/^LINK /s/$/ /' \ > -e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \ > -e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \ >- live-shared/config.gentoo-so-r1 \ >+ live-shared/config.gentoo-so-r2 \ > || die shared > ;; > esac > } > >-src_configure() { :; } >+src_configure() { >+ tc-export CC CXX >+ export LIVE_ABI_VERSION LIBDIR=/usr/"$(get_libdir)" > >-src_compile() { >- tc-export CC CXX LD >+ cd "${WORKDIR}"/${PN}-static || die >+ ./genMakefiles gentoo-r1 || die > >- cd "${WORKDIR}/live-static" >+ cd "${WORKDIR}"/${PN}-shared || die >+ ./genMakefiles gentoo-so-r2 || die >+} > >+src_compile() { > einfo "Beginning static library build" >- ./genMakefiles gentoo >- emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" >+ emake -C ${PN}-static -j1 > >- einfo "Beginning programs build" >- cd "${WORKDIR}/live-static/testProgs" >- emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" >- cd "${WORKDIR}/live-static/mediaServer" >- emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver" >- >- cd "${WORKDIR}/live-shared" > einfo "Beginning shared library build" >- ./genMakefiles gentoo-so-r1 >- local suffix=$(get_libname ${LIVE_ABI_VERSION}) >- emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" >+ emake -C ${PN}-shared -j1 >+ >+ einfo "Beginning programs build" >+ emake -C ${PN}-shared/testProgs >+ emake -C ${PN}-shared/mediaServer > } > > src_install() { > for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do > dolib.a live-static/${library}/lib${library}.a >- dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION}) >- dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname) >+ >+ mv ${PN}-shared/${library}/lib${library}.so{,.${LIVE_ABI_VERSION}} || die >+ dolib.so ${PN}-shared/${library}/lib${library}.so.${LIVE_ABI_VERSION} >+ dosym lib${library}.so.${LIVE_ABI_VERSION} /usr/$(get_libdir)/lib${library}.so > > insinto /usr/include/${library} > doins live-shared/${library}/include/*h > done > > # Should we really install these? >- find live-static/testProgs -type f -perm +111 -print0 | \ >+ find live-shared/testProgs -type f -perm +111 -print0 | \ > xargs -0 dobin > > #install included live555MediaServer aplication >- dobin live-static/mediaServer/live555MediaServer >+ dobin live-shared/mediaServer/live555MediaServer > > # install docs > dodoc live-static/README
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 309681
:
223833
|
273005
|
273007
|
273009
|
278829
|
278831
|
278833
|
296795
|
296797