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
commitce49786e9218258213b69227e37d5d014ccadd7f (patch)
treebaf6a11da95e3a21df0836eb6e4a7f169392a2e9 /net-libs
parentarm/ia64/sh/sparc stable wrt #266661 (diff)
downloadhistorical-ce49786e9218258213b69227e37d5d014ccadd7f.tar.gz
historical-ce49786e9218258213b69227e37d5d014ccadd7f.tar.bz2
historical-ce49786e9218258213b69227e37d5d014ccadd7f.zip
use users ldflags
Package-Manager: portage-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/Manifest4
-rw-r--r--net-libs/osptoolkit/osptoolkit-3.4.2.ebuild15
3 files changed, 15 insertions, 9 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/Manifest b/net-libs/osptoolkit/Manifest
index e903bf05c7e6..966f54871913 100644
--- a/net-libs/osptoolkit/Manifest
+++ b/net-libs/osptoolkit/Manifest
@@ -3,7 +3,7 @@ DIST OSPToolkit-3.4.2.tar.gz 411940 RMD160 cb2fd45dabd8c1ca21ad0753d2542f936f2b5
DIST OSPToolkit-3.5.0.tar.gz 393788 RMD160 dc900c011409cb166851406ca137f1cca9444455 SHA1 306944f1eb94b7a9685df8b2ed0a4c641daf9b97 SHA256 b15e2b8deec032c1e12dcbf28e2fe2b3f964ebab647e0705ec051bf17932d7b1
DIST osptoolkit_3.4.2-1.diff.gz 11972 RMD160 722605261d76df412c74451efd2165ecbcc6ffe8 SHA1 9564879a7fa31b9648f26ce5e93dc314e92c712a SHA256 82c8225ed617795064a5733d8022006c720bcc3f3b19fd1375b3fdb923276335
EBUILD osptoolkit-3.3.6-r1.ebuild 1899 RMD160 d6ce582da7093da4e7e8db066b0892da01fefdf3 SHA1 2795de1a9a9524eddcaccd79848e7a3800555ede SHA256 254b88e0da2ddb8d209a30e715d8643dc3a3f704f7462630adf3dae6405740cd
-EBUILD osptoolkit-3.4.2.ebuild 2935 RMD160 6c9b1976bbbe6eae7517120ab055512c45469843 SHA1 d383f099a37a4d338c146b293fc626469f79e27b SHA256 246527358ef8697cb9042b77010755475aa9448c75db1292d03c2a4e6717dbe5
+EBUILD osptoolkit-3.4.2.ebuild 3119 RMD160 ab358f0fe2c4b6f81f1fe6e5e1d98deb06ffb6f2 SHA1 900f984404c026d1b4d9489bc1ac1386d89e4b5a SHA256 a649386596362ba08994207770d70e2a96e43963addf3049d7e263c205b5bbc0
EBUILD osptoolkit-3.5.0.ebuild 2944 RMD160 e4b493e92bea1d7b13b991073e997a57a16dacb6 SHA1 e7bd15da8bf14d021eba8c348cbae544b657a3a4 SHA256 8f5a420de7ee6333028e1f468aa734bdb6fd34004f2abf487aeed0bbbe477d48
-MISC ChangeLog 2058 RMD160 44f489cf8e2e3272b92fd4ba2c9181180cb9b4e1 SHA1 2698166a837e5fc76d3a0f75c598fc3d9979c8b4 SHA256 3402bd707cb4671654696ed32a96165aa3c5906a5c013a3e70610700ecd11f96
+MISC ChangeLog 2156 RMD160 d6e52b41bbae88ec374e290968c3f31f3cc9f164 SHA1 9061b3eb39226230e7b22cce5d552d09ac984b8d SHA256 9c2686c2d1c5c7891d72d9fda56faed31106f6873fe1d72f2df3ef688e107a97
MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
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"
}