summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2012-03-22 05:52:13 +0000
committerPatrick Lauer <patrick@gentoo.org>2012-03-22 05:52:13 +0000
commitdba8f63ca0d239e5eb52ce0d701a23f9167df3d0 (patch)
tree1a193e85c352884406f75da11ef3fd7f1e27a6b9 /dev-libs/libowfat
parentAdd AT_M4DIR for introspection.m4 (bug #408781, thanks to Thomas Beutin for r... (diff)
downloadhistorical-dba8f63ca0d239e5eb52ce0d701a23f9167df3d0.tar.gz
historical-dba8f63ca0d239e5eb52ce0d701a23f9167df3d0.tar.bz2
historical-dba8f63ca0d239e5eb52ce0d701a23f9167df3d0.zip
Compile fix for #409139 #383031
Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/libowfat')
-rw-r--r--dev-libs/libowfat/ChangeLog6
-rw-r--r--dev-libs/libowfat/Manifest15
-rw-r--r--dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch10
-rw-r--r--dev-libs/libowfat/libowfat-0.28-r1.ebuild9
4 files changed, 23 insertions, 17 deletions
diff --git a/dev-libs/libowfat/ChangeLog b/dev-libs/libowfat/ChangeLog
index adfa4c057fdb..924dbac3aab6 100644
--- a/dev-libs/libowfat/ChangeLog
+++ b/dev-libs/libowfat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libowfat
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/ChangeLog,v 1.32 2012/01/31 22:10:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/ChangeLog,v 1.33 2012/03/22 05:52:13 patrick Exp $
+
+ 22 Mar 2012; Patrick Lauer <patrick@gentoo.org>
+ +files/libowfat-0.28-GNUmakefile.patch, libowfat-0.28-r1.ebuild:
+ Compile fix for #409139 #383031
31 Jan 2012; Jeroen Roovers <jer@gentoo.org> libowfat-0.28-r1.ebuild:
Marked ~hppa too.
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 377474f134bd..97f27df8a27e 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libowfat-0.28-GNUmakefile.patch 411 RMD160 28f323cc73e4a4b33cd388245f761d311306f48d SHA1 cfab3f097063b66e72f93b41d38f9eaf2c17b29b SHA256 5fb902b0b84f3f8d5c1865801ad05d0e9fe955037b41e6ae48b56c697291b7d4
DIST libowfat-0.24.tar.bz2 112302 RMD160 86d8f7f696715a55439558e9d57ac11d9ced8dac SHA1 5d738c95b4749d88971532e370d53472e4ec1fe5 SHA256 64c6b42af4c9df60f2c672ef89f056cfb8f0c6f437359dfca6618b5d1b9805af
DIST libowfat-0.28.tar.bz2 129622 RMD160 3e8826e10a3f46520bdfa9602edb2741728aa370 SHA1 6bbe997ae1bbe94b784ab50a3d44b63a2e08d857 SHA256 392348c2bbde78cde001ba0ef62c8c2ae27105218fc3ba3833d13d26ecdaa541
EBUILD libowfat-0.24.ebuild 1041 RMD160 3fc91842eaaebd55fd3936e750cd866380e5b864 SHA1 46646f436110958797b97993a1e0baed21711c4f SHA256 4db7759a6ba0678799d4d0bbb9715e4f1ea8cb417882080f1fd402d051f3f60b
-EBUILD libowfat-0.28-r1.ebuild 1252 RMD160 5e2b8e79511e5c64db1d3fe9cf39046e50889e0e SHA1 eab1807add26ed1ae5b9a43cb57c6e769dacae35 SHA256 fc7b055919ddb54540cb61642af6e94a8705f2d4206934749bb7b775b382ea16
+EBUILD libowfat-0.28-r1.ebuild 1325 RMD160 2b5f6ebe2d019fa26750afb77982fc3c3a94b6e6 SHA1 048047e5a8606cfd69c877a76edc93f73391c1a6 SHA256 8059f243ba94924afdb968527185e35b2c2e5ec697b123c06a4b956e9813b145
EBUILD libowfat-0.28.ebuild 1046 RMD160 e627ab9f965ba7b7a81983f1292712567d55f99e SHA1 c0b18a36819ad228c14aba89dfce63bd19c1498e SHA256 89d72bbddeecbb0e4bd4c8d42760ae5b36389e2e87abba55ba841f0fb0a1d55a
-MISC ChangeLog 4140 RMD160 d630dda60876862127a14bffe26253c28a4b18a3 SHA1 daffe5c4976ff6c7f72bd72f0b787b234182f1bc SHA256 a3fea618c6dd16405d35c71e9f1de63f2e795129ee3cc16938b6c5ceac40f24d
+MISC ChangeLog 4296 RMD160 339bf8bda378069c01fdbb3b9be52161189276b7 SHA1 5d53a76307b395734beafaea8fa3260da1f66418 SHA256 dd542a94873e318f2b72156f021d6e9c502d78f9c4ddb534e18ec4ae04eb737b
MISC metadata.xml 407 RMD160 672894cf619ffd35885efc6d238fb679b128920c SHA1 203b64a56a76a2f09f0ef2a4e85856ddccce3f9e SHA256 b83d06e8e5ce635e3e5fad6561d73a6560ffeb5888d13a06b5b8e629501fde51
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk8oZsUACgkQVWmRsqeSphNP9QCfcnSTU15IIirKdOORnnIcAQa5
-VHAAn2q1XjgWp4jFkK3JF09HaHCSTrv4
-=9An/
------END PGP SIGNATURE-----
diff --git a/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch b/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch
new file mode 100644
index 000000000000..03b8981876d2
--- /dev/null
+++ b/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch
@@ -0,0 +1,10 @@
+--- GNUmakefile.bak 2011-10-22 22:08:53.443669478 -0700
++++ GNUmakefile 2011-10-22 22:09:27.535002311 -0700
+@@ -277,6 +277,7 @@
+ socket_accept4.o socket_accept6.o socket_connected.o socket_local4.o \
+ socket_local6.o socket_recv4.o socket_recv6.o socket_remote4.o \
+ socket_remote6.o: havesl.h
++socket_remote4.o: havescope.h
+
+ dns_nd6.o fmt_xlong.o scan_xlong.o fmt_ip6_flat.o $(TEXTCODE_OBJS): haveinline.h
+
diff --git a/dev-libs/libowfat/libowfat-0.28-r1.ebuild b/dev-libs/libowfat/libowfat-0.28-r1.ebuild
index ca2547503983..db6423aae0f3 100644
--- a/dev-libs/libowfat/libowfat-0.28-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.28-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.7 2012/01/31 22:10:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libowfat/libowfat-0.28-r1.ebuild,v 1.8 2012/03/22 05:52:13 patrick Exp $
EAPI=2
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs eutils
DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein."
SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
@@ -29,16 +29,17 @@ src_prepare() {
-e "s:^prefix.*:prefix=/usr:" \
-e "s:^INCLUDEDIR.*:INCLUDEDIR=\${prefix}/include/libowfat:" \
-i GNUmakefile || die "sed failed"
+ epatch "${FILESDIR}/libowfat-0.28-GNUmakefile.patch"
}
src_compile() {
- emake \
+ emake -j1 \
CC=$(tc-getCC) \
$( use diet || echo 'DIET=' )
}
src_install () {
- emake \
+ emake -j1 \
LIBDIR="${D}/usr/lib" \
MAN3DIR="${D}/usr/share/man/man3" \
INCLUDEDIR="${D}/usr/include/libowfat" \