ccp4-libs -- libccif.so gets build correctly on amd64

3 files changed, 37 insertions, 1 deletions

diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index 3761f4e1d..53c740097 100644
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -2,6 +2,7 @@ AUX 6.0.2-ppc-double-define-gerror.patch 424 RMD160 4f012233446fffa61e8d775a19a0
 AUX 6.1.1-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
 AUX 6.1.1-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532
 AUX 6.1.1-link-proberly.patch 9325 RMD160 0457062deb5d71f7419d134e89d3d99989fc12b7 SHA1 c7c0453b82b85ae22ea42b562dd2d4ac95b134e7 SHA256 81c4eda497ffa3a0f2d757b7c6b3f6cc35a06ced18ebede2faa31f18667ea8b7
+AUX 6.1.2-ccif-shared.patch 1668 RMD160 803687b13dbe93aaeed8264a73dfe7303b5fcdfb SHA1 3d833aefea874c08e61140613b0a5c75a90e0382 SHA256 57c201ee81e3fd95f174fecfd810ddf12509f0c2bfb1b2f317f893561eb60e3f
 AUX 6.1.2-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
 AUX 6.1.2-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532
 AUX 6.1.2-link-proberly.patch 9325 RMD160 0457062deb5d71f7419d134e89d3d99989fc12b7 SHA1 c7c0453b82b85ae22ea42b562dd2d4ac95b134e7 SHA256 81c4eda497ffa3a0f2d757b7c6b3f6cc35a06ced18ebede2faa31f18667ea8b7
@@ -14,6 +15,6 @@ EBUILD ccp4-libs-6.1.1-r4.ebuild 5776 RMD160 3a36e4a2fff69e2a17028c39f8849a4cfd7
 EBUILD ccp4-libs-6.1.1-r6.ebuild 5956 RMD160 88f4d6e5c9067225501f214002bc5924bc07c1a2 SHA1 8e61890578007833d8a923eeada3bdf064354056 SHA256 1e7bde2c6f9319d699cf95565aa74bd26372b9d1275fdeaaa8ee75fb4001b30a
 EBUILD ccp4-libs-6.1.1-r7.ebuild 6093 RMD160 99176fde51fd41e7b29610a15720859e97b22d01 SHA1 6a52cfb8e4cddd9454db90bb90bad600c3b753ec SHA256 2143d0c1a7905107b9699cce41d7f33a6fedc99cf9046de33d7b42ddafdfa937
 EBUILD ccp4-libs-6.1.1.ebuild 5211 RMD160 6f3705f7ab0c48bbda073eb7dc1a283b3dcaa39a SHA1 8b09909daae034fc393b49b5fda7e06a783bcd14 SHA256 e9b4a3183a8f753ced59968b261bb655c87d13ade8c9964c71f1f2948c42067e
-EBUILD ccp4-libs-6.1.2.ebuild 6315 RMD160 6f2aaf5168c4ab01bb4da8a9bce9deaa2f7fa165 SHA1 29a67d4e54baa80c91ac11e898db28713af93677 SHA256 8f105ffc4e670cfb868ea7dcbe984d40a6ad29d33fb545b2ce23d006829e654a
+EBUILD ccp4-libs-6.1.2.ebuild 6365 RMD160 1b78eb325e72a682294c41879a0994167d3756ea SHA1 590fefb21ef49409608fabf0c3315d677f2a7553 SHA256 e4309918d67246dc5ad576321d6bc55b24e2467b0dc3e0e2f6ca251ea67715d5
 MISC ChangeLog 2431 RMD160 35e051f578142a24e0c488bb79972b6ec03e8f53 SHA1 51c7326eaee4b4cec3d1f847ba92087ada731263 SHA256 df369e675d208c704403dd341ceb4ef57fb8a0e27760762cc59e6e4bce294d98
 MISC metadata.xml 309 RMD160 b9d7f0a63f8fb51e9b4e2d6b4f4028541df5400c SHA1 26ee4b64e0e4d52b1afe00957d53b0cc2956da00 SHA256 04f156de856eae11c0cf8af213f74a9852213844cdd5133aa01dbe60371d57e7
diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild
index c60851eaf..ac9df7963 100644
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.2.ebuild
@@ -90,6 +90,8 @@ src_unpack() {
 	# gerror_ gets defined twice on ppc if you're using gfortran/g95
 	ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
 
+	ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
+
 	einfo "Done." # done applying Gentoo patches
 	echo
 
diff --git a/sci-libs/ccp4-libs/files/6.1.2-ccif-shared.patch b/sci-libs/ccp4-libs/files/6.1.2-ccif-shared.patch
new file mode 100644
index 000000000..ca18d75bc
--- /dev/null
+++ b/sci-libs/ccp4-libs/files/6.1.2-ccif-shared.patch
@@ -0,0 +1,33 @@
+--- configure	2009-08-04 22:35:34.000000000 +0200
++++ configure.new	2009-08-04 22:54:32.000000000 +0200
+@@ -3136,8 +3136,8 @@
+   fi
+   ( touch /tmp/$$.cache_file 2>/dev/null && \
+     cat /dev/null > /tmp/$$.cache_file && \
+-    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file ) || \
+-    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif
++    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file --enable-shared-lib ) || \
++    ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --enable-shared-lib
+   rm -f /tmp/$$.cache_file
+   if [ "X$LIBFOPTIM" != "X" ]; then
+     FOPTIM=$FOPTIM_save
+--- lib/ccif/configure	2009-08-04 22:35:37.000000000 +0200
++++ lib/ccif/configure.new	2009-08-04 23:05:44.000000000 +0200
+@@ -5568,7 +5568,7 @@
+       enable_shared_lib=no
+    ;;
+ 
+-   i?86-unknown-linux | i?86-pc-linux-gnu )
++   i?86-unknown-linux | i?86-pc-linux-gnu | x86_64-unknown-linux-gnu)
+       if test $enable_shared_lib = yes ; then
+ 
+          SO_LOC_VAR='LD_LIBRARY_PATH'
+@@ -5585,7 +5585,7 @@
+          else
+            SHARED_LIB_PATH='LD_LIBRARY_PATH=`pwd`'
+          fi
+-         SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME)'
++         SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm'
+          # SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)'
+          SHARED_LIB_EXPORTS_CMD=''
+       fi