Gentoo Archives: gentoo-commits

From: "Thomas Anderson (gentoofan23)" <gentoofan23@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/stfl/files: stfl-0.18-multilib.patch
Date: Sun, 22 Jun 2008 17:30:55
Message-Id: E1KATOs-0007Ev-FO@stork.gentoo.org
1 gentoofan23 08/06/22 17:30:50
2
3 Added: stfl-0.18-multilib.patch
4 Log:
5 Fixed multilib bugs; keyworded ~amd64, bug #209304
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 dev-libs/stfl/files/stfl-0.18-multilib.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/stfl/files/stfl-0.18-multilib.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/stfl/files/stfl-0.18-multilib.patch?rev=1.1&content-type=text/plain
13
14 Index: stfl-0.18-multilib.patch
15 ===================================================================
16 diff -aur stfl-0.18-orig/python/Makefile.snippet stfl-0.18/python/Makefile.snippet
17 --- stfl-0.18-orig/python/Makefile.snippet 2007-09-03 12:13:04.000000000 -0400
18 +++ stfl-0.18/python/Makefile.snippet 2008-06-22 13:13:13.000000000 -0400
19 @@ -33,7 +33,8 @@
20
21 install_python: python/_stfl.so python/stfl.py python/stfl.pyc
22 mkdir -p $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
23 - cp python/_stfl.so $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
24 + [ ! -d $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/ ] && mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
25 + cp python/_stfl.so $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
26 cp python/stfl.pyc $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
27 cp python/stfl.py $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
28
29 diff -aur stfl-0.18-orig/ruby/Makefile.snippet stfl-0.18/ruby/Makefile.snippet
30 --- stfl-0.18-orig/ruby/Makefile.snippet 2007-09-03 12:13:04.000000000 -0400
31 +++ stfl-0.18/ruby/Makefile.snippet 2008-06-22 13:15:16.000000000 -0400
32 @@ -25,9 +25,9 @@
33
34 ruby/build_ok: libstfl.a stfl.h ruby/stfl.i swig/*.i
35 cd ruby && swig -ruby stfl.i && ruby extconf.rb
36 - $(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.a -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/lib/ruby
37 + $(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.a -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/$(LIBDIR)/ruby
38 touch ruby/build_ok
39
40 install_ruby: ruby/build_ok
41 - $(MAKE) -C ruby DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir='$(DESTDIR)$(prefix)/lib/ruby' install
42 + $(MAKE) -C ruby DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir='$(DESTDIR)$(prefix)/$(LIBDIR)/ruby' install
43
44
45
46
47 --
48 gentoo-commits@l.g.o mailing list