building shared libs now

(Portage version: 2.2_rc65/cvs/Linux x86_64)

3 files changed, 55 insertions, 13 deletions

diff --git a/dev-libs/cvector/ChangeLog b/dev-libs/cvector/ChangeLog
index aef17b1bbe94..5ef6d9cad743 100644
--- a/dev-libs/cvector/ChangeLog
+++ b/dev-libs/cvector/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cvector
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cvector/ChangeLog,v 1.2 2010/02/15 08:40:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cvector/ChangeLog,v 1.3 2010/03/07 18:30:50 jlec Exp $
+
+*cvector-1.0.3-r1 (07 Mar 2010)
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/1.0.3-dynlib.patch, -cvector-1.0.3.ebuild,
+  +cvector-1.0.3-r1.ebuild:
+  building shared libs now
 
   15 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
   cvector-1.0.3.ebuild:
diff --git a/dev-libs/cvector/cvector-1.0.3.ebuild b/dev-libs/cvector/cvector-1.0.3-r1.ebuild
index 51c018d5db37..e2ec926246bb 100644
--- a/dev-libs/cvector/cvector-1.0.3.ebuild
+++ b/dev-libs/cvector/cvector-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cvector/cvector-1.0.3.ebuild,v 1.2 2010/02/15 08:40:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cvector/cvector-1.0.3-r1.ebuild,v 1.1 2010/03/07 18:30:50 jlec Exp $
 
-inherit eutils toolchain-funcs
+inherit base eutils toolchain-funcs versionator
 
 MY_PN=CVector
 MY_P="${MY_PN}-${PV}"
@@ -21,25 +21,24 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-LDFLAGS.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-LDFLAGS.patch
+	"${FILESDIR}"/${PV}-dynlib.patch
+	)
 
 src_compile() {
 	emake \
 		CC=$(tc-getCC) \
 		CXX=$(tc-getCXX) \
 		CFLAGS="${CFLAGS}" \
-		all || die "compilation failed"
-}
-
-src_test() {
-	emake tests || die "test failed"
+		all || die
 }
 
 src_install() {
-	dobin bin/* || die
-	dolib.a lib/.libs/*.a || die
+	dolib.so *.so.${PV} || die
+	dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so.$(get_version_component_range 1-2) || die
+	dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so.$(get_major_version) || die
+	dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so || die
 
 	insinto /usr/include
 	doins *.h || die
diff --git a/dev-libs/cvector/files/1.0.3-dynlib.patch b/dev-libs/cvector/files/1.0.3-dynlib.patch
new file mode 100644
index 000000000000..890935161182
--- /dev/null
+++ b/dev-libs/cvector/files/1.0.3-dynlib.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile b/Makefile
+index 865db81..227376c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -96,8 +96,8 @@ BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(IN
+ INSTALL_COMMAND        =  $(LIBTOOL) --mode=install cp
+ INSTALL_FINISH_COMMAND =  $(LIBTOOL) --mode=finish
+ 
+-OBJ_EXT                =  lo
+-LIB_EXT                =  la
++OBJ_EXT                =  o
++LIB_EXT                =  so
+ 
+ ######################################################################
+ #  You should not need to make modifications below this line         #
+@@ -181,8 +181,7 @@ default:
+ # Compile the library and examples
+ #
+ all:	$(LIB) $(BIN) $(SOURCE) $(HEADERS) \
+-		$(LIB)/libCVector.$(LIB_EXT) \
+-		$(BIN)/CVectorBasicTest
++		$(LIB)/libCVector.$(LIB_EXT)
+ 		
+ install:  all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \
+           $(INC) $(LIB)/libCVector.$(LIB_EXT)  $(INC)/CVector.h
+@@ -232,8 +231,8 @@ $(BIN):
+ # CVector library
+ #
+ $(LIB)/libCVector.$(LIB_EXT): $(SOURCE) $(HEADERS) $(COMMONDEP)
+-	$(COMPILE_COMMAND) -c $(SOURCE)
+-	$(LIBRARY_LINK_COMMAND) -o $(LIB)/libCVector.$(LIB_EXT) *.$(OBJ_EXT) 
++	$(CC) $(CFLAGS) -fPIC -c $(SOURCE) -o CVector.o
++	$(CC) $(LDFLAGS) -Wl,--soname,libCVector.so.1 -shared -o libCVector.so.$(RELEASE) *.$(OBJ_EXT) -lm 
+ 
+ #
+ # CVectorBasicTest example program