summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-08-16 00:52:43 +0000
committerJeroen Roovers <jer@gentoo.org>2010-08-16 00:52:43 +0000
commita51b9e02636e41e3bbe9926709e943d01bcb1e73 (patch)
treebde48b91f24b130969800099e8d90d65bcfc08f3 /dev-libs/libhash
parentMark alpha/arm/ia64/s390/sh stable #307633. (diff)
downloadgentoo-2-a51b9e02636e41e3bbe9926709e943d01bcb1e73.tar.gz
gentoo-2-a51b9e02636e41e3bbe9926709e943d01bcb1e73.tar.bz2
gentoo-2-a51b9e02636e41e3bbe9926709e943d01bcb1e73.zip
Add SONAME thanks to Nathan Phillip Brink (bug #332937).
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-libs/libhash')
-rw-r--r--dev-libs/libhash/ChangeLog8
-rw-r--r--dev-libs/libhash/libhash-1.0.3-r1.ebuild (renamed from dev-libs/libhash/libhash-1.0.2.ebuild)22
2 files changed, 24 insertions, 6 deletions
diff --git a/dev-libs/libhash/ChangeLog b/dev-libs/libhash/ChangeLog
index ab2ee2716da9..fe523f7eefc0 100644
--- a/dev-libs/libhash/ChangeLog
+++ b/dev-libs/libhash/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/libhash
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/ChangeLog,v 1.6 2010/05/18 18:50:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/ChangeLog,v 1.7 2010/08/16 00:52:43 jer Exp $
+
+*libhash-1.0.3-r1 (16 Aug 2010)
+
+ 16 Aug 2010; Jeroen Roovers <jer@gentoo.org> -libhash-1.0.2.ebuild,
+ +libhash-1.0.3-r1.ebuild:
+ Add SONAME thanks to Nathan Phillip Brink (bug #332937).
18 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
libhash-1.0.3.ebuild:
diff --git a/dev-libs/libhash/libhash-1.0.2.ebuild b/dev-libs/libhash/libhash-1.0.3-r1.ebuild
index 04c292b95387..94097716ff7f 100644
--- a/dev-libs/libhash/libhash-1.0.2.ebuild
+++ b/dev-libs/libhash/libhash-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/libhash-1.0.2.ebuild,v 1.4 2005/06/14 22:41:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhash/libhash-1.0.3-r1.ebuild,v 1.1 2010/08/16 00:52:43 jer Exp $
inherit toolchain-funcs
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ugh.net.au/pub/unix/libhash/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
IUSE="doc"
DEPEND=""
@@ -19,8 +19,20 @@ S=${WORKDIR}/${PN}
src_compile() {
rm -f Makefile
- $(tc-getCC) ${CFLAGS} -fPIC -shared -o libhash.so hash.c || die ".so failed"
- $(tc-getCC) ${CFLAGS} -c -o libhash.a hash.c || die ".a failed"
+ $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} \
+ -Wl,-soname,libhash.so -fPIC -shared \
+ -o libhash.so hash.c || die ".so failed"
+ $(tc-getCC) ${CPPFLAGS} ${CFLAGS} \
+ -c -o libhash.a hash.c || die ".a failed"
+}
+
+src_test() {
+ cd tests
+ sed -i '/wrappers.h/d' *.c
+ for n in 2 3 ; do
+ $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -I.. -L.. ${n}.c -o ${n} -lhash || die "compile ${n} failed"
+ LD_LIBRARY_PATH=.. ./${n} || die "test ${n} failed"
+ done
}
src_install() {