diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-01-11 14:02:01 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-01-11 14:02:01 +0000 |
| commit | 7f890e821677d6f9b4c1108d003fd55428659029 (patch) | |
| tree | 26551e826d3e3b8063f360387b9e8b0d562296b3 /dev-libs/stfl | |
| parent | Cleanup (diff) | |
| download | gentoo-2-7f890e821677d6f9b4c1108d003fd55428659029.tar.gz gentoo-2-7f890e821677d6f9b4c1108d003fd55428659029.tar.bz2 gentoo-2-7f890e821677d6f9b4c1108d003fd55428659029.zip | |
Link ruby lib against shared lib.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/stfl')
| -rw-r--r-- | dev-libs/stfl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/stfl/files/stfl-0.22-ruby-sharedlib.patch | 14 | ||||
| -rw-r--r-- | dev-libs/stfl/stfl-0.22.ebuild | 7 |
3 files changed, 24 insertions, 3 deletions
diff --git a/dev-libs/stfl/ChangeLog b/dev-libs/stfl/ChangeLog index 8cc10047f530..69bba7c392ee 100644 --- a/dev-libs/stfl/ChangeLog +++ b/dev-libs/stfl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/stfl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.34 2012/01/11 12:43:35 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/ChangeLog,v 1.35 2012/01/11 14:02:00 radhermit Exp $ + + 11 Jan 2012; Tim Harder <radhermit@gentoo.org> stfl-0.22.ebuild, + +files/stfl-0.22-ruby-sharedlib.patch: + Link ruby lib against shared lib. 11 Jan 2012; Tim Harder <radhermit@gentoo.org> stfl-0.22.ebuild: Fix building ruby support (bug #395569) and update to EAPI 4. diff --git a/dev-libs/stfl/files/stfl-0.22-ruby-sharedlib.patch b/dev-libs/stfl/files/stfl-0.22-ruby-sharedlib.patch new file mode 100644 index 000000000000..90698ec88dd7 --- /dev/null +++ b/dev-libs/stfl/files/stfl-0.22-ruby-sharedlib.patch @@ -0,0 +1,14 @@ +--- stfl-0.22/ruby/Makefile.snippet.orig ++++ stfl-0.22/ruby/Makefile.snippet +@@ -23,9 +23,9 @@ + + install: install_ruby + +-ruby/build_ok: libstfl.a stfl.h ruby/stfl.i swig/*.i ++ruby/build_ok: libstfl.so.$(VERSION) stfl.h ruby/stfl.i swig/*.i + cd ruby && swig -ruby stfl.i && ruby extconf.rb +- $(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.a -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/$(libdir)/ruby ++ $(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.so.$(VERSION) -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/$(libdir)/ruby + touch ruby/build_ok + + install_ruby: ruby/build_ok diff --git a/dev-libs/stfl/stfl-0.22.ebuild b/dev-libs/stfl/stfl-0.22.ebuild index 7e31ac2a36dd..29d9e98a098f 100644 --- a/dev-libs/stfl/stfl-0.22.ebuild +++ b/dev-libs/stfl/stfl-0.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22.ebuild,v 1.2 2012/01/11 12:43:35 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/stfl/stfl-0.22.ebuild,v 1.3 2012/01/11 14:02:00 radhermit Exp $ EAPI="4" SUPPORT_PYTHON_ABIS="1" @@ -41,11 +41,12 @@ src_prepare() { Makefile || die "sed failed" if ! use static-libs ; then - sed -i -e "/install .* libstfl.a/d" Makefile + sed -i -e "/install .* libstfl.a/d" Makefile || die fi epatch "${FILESDIR}"/${PN}-0.21-python.patch epatch "${FILESDIR}"/${P}-soname-symlink.patch + epatch "${FILESDIR}"/${P}-ruby-sharedlib.patch if use perl ; then echo "FOUND_PERL5=1" >> Makefile.cfg @@ -62,6 +63,8 @@ src_prepare() { echo "FOUND_PYTHON=0" >> Makefile.cfg } +src_configure() { :; } + src_compile() { emake CC="$(tc-getCC)" |