runtime text relocations preliminary fix, soname added to libsingular

4 files changed, 33 insertions, 6 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 63aaea994..56aef551f 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jul 2010; Thomas Kahle <tom111@gmx.de> singular-3.1.1.3.ebuild,
+  +files/singular-3.1.1.3-soname.patch:
+  runtime text relocations preliminary fix, missing soname added
+
 *singular-3.1.1.3 (13 Jul 2010)
 
   13 Jul 2010; Thomas Kahle <tom111@gmx.de> +singular-3.1.1.3.ebuild:
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 3a3be5abc..6942bf43a 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -3,11 +3,12 @@ AUX singular-3.0.4.4-nostrip.patch 453 RMD160 396d1c318ee76767b9dff9de7db516f988
 AUX singular-3.1.0-emacs-22.patch 637 RMD160 ad6648dd733a064aa8f801056ed8f9c3f84fad90 SHA1 a0f3bc3a866618798f30fdfb97ca8e30bffc4e7f SHA256 2ae842d9636bd132271a23aa03c6810e6bdfaf0bf31b4376d8488402a41dd5a3
 AUX singular-3.1.0-gentoo.patch 4765 RMD160 9ba5f369c473c58ed28019b85a95c27eb58f495d SHA1 385b3932e1d2257fe28ee0dc5cef5729726c1b41 SHA256 ae59a98268270ef68ecb2e7f34074fa5eee379d13565a0f359c48db4f6e02351
 AUX singular-3.1.0-glibc-2.10.patch 1407 RMD160 5cc0db1754b16397b7af3c044489bdb1efacaf6c SHA1 fc696943e0a10217f0839ef2b14128a709fb6bb3 SHA256 57461bf8bba6a44ef6f1c3bcf8a1121fb7ea95ce286118219c22f2bf366905f7
+AUX singular-3.1.1.3-soname.patch 651 RMD160 76c4d10f7fa0f55ffdb55232c8e4c670343ea3e7 SHA1 d7909ac36431742ecb43104d7c55b48fdc4439f6 SHA256 ad025b5a19c29ab8f25782fe3ee36a0139f1db64defa2298afb8b84d37ccdef1
 DIST Singular-3-1-1-2-share.tar.gz 8172459 RMD160 7899cdfd54d131cc7ee6fb95dabe4cfbec696a78 SHA1 57287a74c6bcae5214055ce7d057f29e35f93e37 SHA256 e73db1557fd96d9b88d959ccbf78229771831954614fb7301d275493493e07ee
 DIST Singular-3-1-1-2.tar.gz 19397418 RMD160 205671f1ea2e2f22c025defc3d85c762362c7e3f SHA1 217af7a4e9b36b769a145bf81fb27c49d64333f6 SHA256 4e5929b324f952c69de1dedddbeca1c51a3733a0f63e026d3e7b61a7e469d5a7
 DIST Singular-3-1-1-3-share.tar.gz 8282887 RMD160 341ecf1fd2964f9a796b79d4af28e02ef2d16c4d SHA1 17aae4d08ed2c4aa404b19e2157ea4e09869819b SHA256 c94e7f94749b11a79003691ce28235b543681f717584f577f0e145804e9e3d2a
 DIST Singular-3-1-1-3.tar.gz 19433518 RMD160 732d56b5e7dfdb1c96d6b35242ba001eb0c330f4 SHA1 d0ae1374454ba353522773d9cbd9442d35ca2c85 SHA256 12534fe4c6202b8953163df10e6b6f2629243d3900222694f8dc6bcad3c2112b
 EBUILD singular-3.1.1.2.ebuild 4045 RMD160 a43f98bc944e637e5ee25f5d19b7cc808cf027d0 SHA1 a1b69b8887dc9bc2d269aa2f6482e57c8effaadc SHA256 0d91245a6cbc629ee5a22acf5e9638a3e82f65d7a7826b7b64a325974870cc35
-EBUILD singular-3.1.1.3.ebuild 4119 RMD160 18ff50589db22cf4c8a1150fa0bac5b91f43b1fc SHA1 7e151b413cde06cff6c5f64bf8033a3aab8b6b0a SHA256 3aa5b9e9e0ec81d7ef41766b02f98805bbd096811c7181bd0c0fb11b124f45b9
-MISC ChangeLog 971 RMD160 b23cd6d4ca6339ef8699b4807e3c7b12292aa3d4 SHA1 9f5daae1c2b8bedf046f139049b764b26b2b014a SHA256 c049c0dcd8274798b1661c5611b4fa4e196643384291b5de2f23d6e231e439e0
+EBUILD singular-3.1.1.3.ebuild 4475 RMD160 b13983437833cdcf586f35899f2cf1849c434761 SHA1 97b4ba3c9cfc5ddbe8fc1346aa0fcab8a06c334e SHA256 f37235918de9a6bbab15b61e1ddad1f371f104c2287e227b6b4387e37ce8d088
+MISC ChangeLog 1146 RMD160 a36684c2350c570adc8e24cb837fa65ac58679f4 SHA1 5d30dc247da87eba14ab1001b5bfbd8fce21f49e SHA256 265eec5266f4109992f8904964e71521b8bf6963eee11543c3b3adb188b2aa6f
 MISC metadata.xml 471 RMD160 f505db20910413450175a8a9dc6dc27cc41ffa41 SHA1 4f0d34a55b6d10392e819cf08877d5877adc9729 SHA256 d1b8811843425ea5cf1d1ce1e90eeb4fae2198f1f93de190aeab4c10400b9805
diff --git a/sci-mathematics/singular/files/singular-3.1.1.3-soname.patch b/sci-mathematics/singular/files/singular-3.1.1.3-soname.patch
new file mode 100644
index 000000000..989133f00
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.1.3-soname.patch
@@ -0,0 +1,11 @@
+--- Singular/Makefile.in	2010-06-24 15:10:14.000000000 +0200
++++ Singular/Makefile.in.new	2010-07-14 21:30:08.000000000 +0200
+@@ -332,7 +332,7 @@
+ 
+ libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
+          iparith.o libsingular-tesths.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) 
+-	$(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
++	$(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -Wl,-soname,libsingular.so.3 -o libsingular.${SO_SUFFIX} \
+ 	libsingular-tesths.o iparith.o mpsr_Tok.o claptmpl.o \
+ 	${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
+ 
diff --git a/sci-mathematics/singular/singular-3.1.1.3.ebuild b/sci-mathematics/singular/singular-3.1.1.3.ebuild
index ab9bda84f..8c4029480 100644
--- a/sci-mathematics/singular/singular-3.1.1.3.ebuild
+++ b/sci-mathematics/singular/singular-3.1.1.3.ebuild
@@ -5,7 +5,7 @@
 EAPI="2"
 WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix
 
-inherit eutils elisp-common autotools multilib versionator
+inherit autotools eutils elisp-common flag-o-matic multilib versionator
 
 MY_PN=Singular
 MY_PV=$(replace_all_version_separators -)
@@ -37,6 +37,8 @@ S="${WORKDIR}"/${MY_PN}-${MY_DIR}
 SITEFILE=60${PN}-gentoo.el
 
 pkg_setup() {
+	append-flags "-fPIC"
+	append-ldflags "-fPIC"
 	tc-export CC CPP CXX
 }
 
@@ -47,11 +49,17 @@ src_prepare () {
 	# older versions to me. The shipped code is fine !
 #	epatch "${FILESDIR}"/${PN}-3.1.0-glibc-2.10.patch
 	epatch "${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch
+	epatch "${FILESDIR}"/${PN}-${PV}-soname.patch
 
 	sed -i \
-		-e '/CXXFLAGS/ s/--no-exceptions//g' \
+		-e "/CXXFLAGS/ s/--no-exceptions//g" \
 		"${S}"/Singular/configure.in || die
 
+	SOSUFFIX=$(get_version_component_range 1-3)
+	sed -i \
+		-e "s:SO_SUFFIX = so:SO_SUFFIX = so.${SOSUFFIX}:" \
+		"${S}"/Singular/Makefile.in || die
+
 	cd "${S}"/Singular || die "failed to cd into Singular/"
 	eautoconf
 }
@@ -105,9 +113,12 @@ src_install () {
 		|| die "failed to create symbolic link"
 
 	if use libsingular; then
+		cd "${S}"/Singular
 		insinto /usr/include
-		doins "${S}"/Singular/libsingular.h
-		dolib.so "${S}"/Singular/libsingular.so
+		doins libsingular.h
+		dolib.so libsingular.so."${SOSUFFIX}"
+		dosym libsingular.so."${SOSUFFIX}" /usr/lib/libsingular.so \
+			|| die "failed to create symlink"
 	fi
 
 	# stuff from the share tar ball