summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir Lamouri <volkmar@gentoo.org>2009-04-20 17:06:55 +0000
committerMounir Lamouri <volkmar@gentoo.org>2009-04-20 17:06:55 +0000
commit045df025a976ef72d6f8f5b5ead9e406c658e2ba (patch)
tree4dc9acdc39d5bc8724b005a171fb3c50f48e7126 /net-libs
parentarm/ia64/sh/sparc stable wrt #266661 (diff)
downloadgentoo-2-045df025a976ef72d6f8f5b5ead9e406c658e2ba.tar.gz
gentoo-2-045df025a976ef72d6f8f5b5ead9e406c658e2ba.tar.bz2
gentoo-2-045df025a976ef72d6f8f5b5ead9e406c658e2ba.zip
use users ldflags
(Portage version: 2.1.6.7/cvs/Linux ppc)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/osptoolkit/ChangeLog5
-rw-r--r--net-libs/osptoolkit/osptoolkit-3.4.2.ebuild15
2 files changed, 13 insertions, 7 deletions
diff --git a/net-libs/osptoolkit/ChangeLog b/net-libs/osptoolkit/ChangeLog
index 0ba2f9cb8678..118afbe8d9f6 100644
--- a/net-libs/osptoolkit/ChangeLog
+++ b/net-libs/osptoolkit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/osptoolkit
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.13 2009/04/20 16:54:30 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/ChangeLog,v 1.14 2009/04/20 17:06:55 volkmar Exp $
+
+ 20 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> osptoolkit-3.4.2.ebuild:
+ Use users LDFLAGS.
*osptoolkit-3.5.0 (20 Apr 2009)
diff --git a/net-libs/osptoolkit/osptoolkit-3.4.2.ebuild b/net-libs/osptoolkit/osptoolkit-3.4.2.ebuild
index 9e8c0be6442d..00db3fa4a411 100644
--- a/net-libs/osptoolkit/osptoolkit-3.4.2.ebuild
+++ b/net-libs/osptoolkit/osptoolkit-3.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.4.2.ebuild,v 1.1 2009/04/20 04:01:41 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/osptoolkit/osptoolkit-3.4.2.ebuild,v 1.2 2009/04/20 17:06:55 volkmar Exp $
EAPI="2"
@@ -24,15 +24,11 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}"/TK-${PV//./_}-${S_DATE}
# TODO:
-# LDFLAGS are not used
# generate a shared lib
-# create a main Makefile
-# => a gentoo-patch ?
# NOTES:
# debian patch is used atm but will surely not for further versions
-# osptest is not a test that can be used for src_test()
-# install it only when test is enabled ?
+# osptest isn't a test that can be used for src_test, it's part of the toolkit
src_prepare() {
# applying debian patches
@@ -46,6 +42,12 @@ src_prepare() {
sed -i -e "s/ -O//" -e "s/^CFLAGS =/CFLAGS +=/" src/Makefile test/Makefile \
enroll/Makefile || die "patching Makefiles failed"
+ # use users LDFLAGS
+ sed -i -e "s:LFLAGS:LDFLAGS:" test/Makefile \
+ || die "patching test/Makefile failed"
+ sed -i -e "s:\(\$(LIBS\):\$(LDFLAGS) \1:" enroll/Makefile \
+ || die "patching enroll/Makefile failed"
+
# change lib dir to $(get_libdir)
sed -i -e "s:\$(INSTALL_PATH)/lib:\$(INSTALL_PATH)/$(get_libdir):" \
src/Makefile || die "patching src/Makefile failed"
@@ -66,6 +68,7 @@ src_compile() {
emake -C src CC="${my_cc}" build || die "emake libosp failed"
emake -C enroll CC="${my_cc}" linux || die "emake enroll failed"
+ # line above doesn't build tests but osptest (see NOTES)
emake -C test CC="${my_cc}" linux || die "emake test failed"
}