diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-18 20:29:26 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-18 20:29:26 +0000 |
| commit | 8e33dc9ae48a328e4deed1f810747a81b78fc10e (patch) | |
| tree | 988f3029b0afb198e2af5b1bb925accd6160e383 /dev-libs/libebml | |
| parent | Inter-block this package with net-dialup/speedtouch-usb (#110665). (diff) | |
| download | gentoo-2-8e33dc9ae48a328e4deed1f810747a81b78fc10e.tar.gz gentoo-2-8e33dc9ae48a328e4deed1f810747a81b78fc10e.tar.bz2 gentoo-2-8e33dc9ae48a328e4deed1f810747a81b78fc10e.zip | |
Add patch to respect LDFLAGS and CXX.
(Portage version: 2.1_pre6-r3)
Diffstat (limited to 'dev-libs/libebml')
| -rw-r--r-- | dev-libs/libebml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libebml/files/libebml-0.7.6-respectflags.patch | 13 | ||||
| -rw-r--r-- | dev-libs/libebml/libebml-0.7.6.ebuild | 13 |
3 files changed, 24 insertions, 8 deletions
diff --git a/dev-libs/libebml/ChangeLog b/dev-libs/libebml/ChangeLog index 225cc35c0cb1..2f1635179853 100644 --- a/dev-libs/libebml/ChangeLog +++ b/dev-libs/libebml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libebml # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.55 2006/03/06 13:40:06 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/ChangeLog,v 1.56 2006/03/18 20:29:26 flameeyes Exp $ + + 18 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/libebml-0.7.6-respectflags.patch, libebml-0.7.6.ebuild: + Add patch to respect LDFLAGS and CXX. 06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> libebml-0.7.1-r1.ebuild, libebml-0.7.3.ebuild: diff --git a/dev-libs/libebml/files/libebml-0.7.6-respectflags.patch b/dev-libs/libebml/files/libebml-0.7.6-respectflags.patch new file mode 100644 index 000000000000..8eeb83ef4e09 --- /dev/null +++ b/dev-libs/libebml/files/libebml-0.7.6-respectflags.patch @@ -0,0 +1,13 @@ +Index: libebml-0.7.6/make/linux/Makefile +=================================================================== +--- libebml-0.7.6.orig/make/linux/Makefile ++++ libebml-0.7.6/make/linux/Makefile +@@ -94,7 +94,7 @@ $(LIBRARY): $(objects) + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) ++ $(CXX) $(LDFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + + clean: diff --git a/dev-libs/libebml/libebml-0.7.6.ebuild b/dev-libs/libebml/libebml-0.7.6.ebuild index 40692f28124c..50f0fc3f7a1f 100644 --- a/dev-libs/libebml/libebml-0.7.6.ebuild +++ b/dev-libs/libebml/libebml-0.7.6.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.6.ebuild,v 1.4 2006/02/04 18:36:40 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-0.7.6.ebuild,v 1.5 2006/03/18 20:29:26 flameeyes Exp $ -IUSE="" +inherit eutils toolchain-funcs -inherit flag-o-matic eutils +IUSE="" DESCRIPTION="Extensible binary format library (kinda like XML)" HOMEPAGE="http://www.matroska.org/" @@ -19,9 +19,10 @@ RDEPEND="" src_unpack() { unpack ${A} - cd ${S} + epatch "${FILESDIR}/${P}-respectflags.patch" + if use ppc-macos; then sed -i \ -e 's/\.so/\.dylib/g' \ @@ -30,14 +31,12 @@ src_unpack() { -e 's/LD=$(CXX)/LD=libtool/' ${S}/make/linux/Makefile \ || die "sed Makefile failed" fi - - sed -i -e 's:CXXFLAGS=:CXXFLAGS+=:g' ${S}/make/linux/Makefile } src_compile() { cd ${S}/make/linux - emake PREFIX=/usr || die "make failed" + emake PREFIX=/usr CXX="$(tc-getCXX)"|| die "make failed" } src_install() { |