| 1 |
xmw 13/02/27 08:53:48 |
| 2 |
|
| 3 |
Modified: ChangeLog libparserutils-0.1.1.ebuild |
| 4 |
Log: |
| 5 |
netsurf eclass preparation. Restore cross-compile functionality (thanks James Le Cuirot, bug 431884) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 dev-libs/libparserutils/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libparserutils/ChangeLog?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libparserutils/ChangeLog?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libparserutils/ChangeLog?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/ChangeLog,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- ChangeLog 18 Jul 2012 07:16:31 -0000 1.4 |
| 23 |
+++ ChangeLog 27 Feb 2013 08:53:48 -0000 1.5 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-libs/libparserutils |
| 26 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/ChangeLog,v 1.4 2012/07/18 07:16:31 xmw Exp $ |
| 28 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/ChangeLog,v 1.5 2013/02/27 08:53:48 xmw Exp $ |
| 30 |
+ |
| 31 |
+ 27 Feb 2013; Michael Weber <xmw@g.o> libparserutils-0.1.1.ebuild: |
| 32 |
+ netsurf eclass preparation. Restore cross-compile functionality (thanks James |
| 33 |
+ Le Cuirot, bug 431884) |
| 34 |
|
| 35 |
18 Jul 2012; Michael Weber <xmw@g.o> libparserutils-0.1.1.ebuild: |
| 36 |
fix shared/static targets for test |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.5 dev-libs/libparserutils/libparserutils-0.1.1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild?rev=1.5&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild?rev=1.5&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild?r1=1.4&r2=1.5 |
| 45 |
|
| 46 |
Index: libparserutils-0.1.1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild,v |
| 49 |
retrieving revision 1.4 |
| 50 |
retrieving revision 1.5 |
| 51 |
diff -u -r1.4 -r1.5 |
| 52 |
--- libparserutils-0.1.1.ebuild 18 Jul 2012 07:16:31 -0000 1.4 |
| 53 |
+++ libparserutils-0.1.1.ebuild 27 Feb 2013 08:53:48 -0000 1.5 |
| 54 |
@@ -1,8 +1,8 @@ |
| 55 |
-# Copyright 1999-2012 Gentoo Foundation |
| 56 |
+# Copyright 1999-2013 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild,v 1.4 2012/07/18 07:16:31 xmw Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libparserutils/libparserutils-0.1.1.ebuild,v 1.5 2013/02/27 08:53:48 xmw Exp $ |
| 60 |
|
| 61 |
-EAPI=4 |
| 62 |
+EAPI=5 |
| 63 |
|
| 64 |
inherit flag-o-matic multilib toolchain-funcs |
| 65 |
|
| 66 |
@@ -13,23 +13,34 @@ |
| 67 |
LICENSE="MIT" |
| 68 |
SLOT="0" |
| 69 |
KEYWORDS="~amd64 ~arm" |
| 70 |
-IUSE="iconv static-libs test" |
| 71 |
+IUSE="debug iconv static-libs test" |
| 72 |
|
| 73 |
RDEPEND="" |
| 74 |
DEPEND="test? ( dev-lang/perl )" |
| 75 |
|
| 76 |
-src_prepare() { |
| 77 |
- sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ |
| 78 |
- -e "s:-Werror::g" \ |
| 79 |
- -i Makefile || die |
| 80 |
- sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ |
| 81 |
- -i ${PN}.pc.in || die |
| 82 |
- echo "Q := " >> Makefile.config.override |
| 83 |
- echo "CC := $(tc-getCC)" >> Makefile.config.override |
| 84 |
- echo "AR := $(tc-getAR)" >> Makefile.config.override |
| 85 |
-} |
| 86 |
- |
| 87 |
-src_configure() { |
| 88 |
+pkg_setup(){ |
| 89 |
+ netsurf_src_prepare() { |
| 90 |
+ sed -e "/^CCOPT :=/s:=.*:=:" \ |
| 91 |
+ -e "/^CCNOOPT :=/s:=.*:=:" \ |
| 92 |
+ -e "/^CCDBG :=/s:=.*:=:" \ |
| 93 |
+ -i build/makefiles/Makefile.{gcc,clang} || die |
| 94 |
+ sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ |
| 95 |
+ -i Makefile || die |
| 96 |
+ sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ |
| 97 |
+ -i ${PN}.pc.in || die |
| 98 |
+ } |
| 99 |
+ netsurf_src_configure() { |
| 100 |
+ echo "Q := " >> Makefile.config |
| 101 |
+ echo "CC := $(tc-getCC)" >> Makefile.config |
| 102 |
+ echo "AR := $(tc-getAR)" >> Makefile.config |
| 103 |
+ } |
| 104 |
+ |
| 105 |
+ netsurf_make() { |
| 106 |
+ emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@" |
| 107 |
+ use static-libs && \ |
| 108 |
+ emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@" |
| 109 |
+ } |
| 110 |
+ |
| 111 |
if use iconv ; then |
| 112 |
append-cflags "-DWITH_ICONV_FILTER" |
| 113 |
else |
| 114 |
@@ -37,19 +48,24 @@ |
| 115 |
fi |
| 116 |
} |
| 117 |
|
| 118 |
+src_prepare() { |
| 119 |
+ netsurf_src_prepare |
| 120 |
+} |
| 121 |
+ |
| 122 |
+src_configure() { |
| 123 |
+ netsurf_src_configure |
| 124 |
+} |
| 125 |
+ |
| 126 |
src_compile() { |
| 127 |
- emake COMPONENT_TYPE=lib-shared |
| 128 |
- use static-libs && emake COMPONENT_TYPE=lib-static |
| 129 |
+ netsurf_make |
| 130 |
} |
| 131 |
|
| 132 |
src_test() { |
| 133 |
- emake COMPONENT_TYPE=lib-shared test |
| 134 |
- use static-libs && emake COMPONENT_TYPE=lib-static test |
| 135 |
+ netsurf_make test |
| 136 |
} |
| 137 |
|
| 138 |
src_install() { |
| 139 |
- emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install |
| 140 |
- use static-libs && \ |
| 141 |
- emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install |
| 142 |
+ netsurf_make DESTDIR="${D}" PREFIX=/usr install |
| 143 |
+ |
| 144 |
dodoc README docs/Todo |
| 145 |
} |
Archives