| 1 |
jlec 10/11/03 09:30:24 |
| 2 |
|
| 3 |
Added: 3.2.1-shared.patch 3.2.1-gcc4.4.patch |
| 4 |
3.2.1-minuit2.patch |
| 5 |
Log: |
| 6 |
New Addition, imported from sci overlay |
| 7 |
|
| 8 |
(Portage version: 2.1.9.24/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-libs/libcmatrix/files/3.2.1-shared.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libcmatrix/files/3.2.1-shared.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libcmatrix/files/3.2.1-shared.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 3.2.1-shared.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/Makefile.in b/Makefile.in |
| 19 |
index 1361371..1448e76 100755 |
| 20 |
--- a/Makefile.in |
| 21 |
+++ b/Makefile.in |
| 22 |
@@ -13,8 +13,8 @@ AR=@AR@ |
| 23 |
|
| 24 |
# You shouldn't need to alter anything below here |
| 25 |
|
| 26 |
-COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c |
| 27 |
-ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG |
| 28 |
+COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c |
| 29 |
+#ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG |
| 30 |
|
| 31 |
LOCALOBJS= local/CrystalSystem.o local/CrystalGeneric.o local/MoleculeStructure.o |
| 32 |
COREOBJS= coredefs/complex.o coredefs/common.o coredefs/diagonal.o coredefs/diagonalise.o coredefs/power.o coredefs/invert.o coredefs/transforms.o coredefs/blocking.o coredefs/mixed.o coredefs/realtransforms.o coredefs/Chebyshev.o |
| 33 |
@@ -36,7 +36,7 @@ ALLTHROBJS=$(UNSAFEOBJS:.o=_r.o) $(ALLSAFEOBJS) |
| 34 |
|
| 35 |
ROOT=.. |
| 36 |
|
| 37 |
-first: lib/libcmatrix.a |
| 38 |
+first: lib/libcmatrix.so.3.2.1 |
| 39 |
|
| 40 |
#%.o: %.f |
| 41 |
# @F77@ @FFLAGS@ -c -o $@ $< |
| 42 |
@@ -68,25 +68,25 @@ tempclean: |
| 43 |
# -cd optim; @CLEAN@ |
| 44 |
# -cd local; @CLEAN@ |
| 45 |
|
| 46 |
-lib/libcmatrix.a: $(ALLNORMOBJS) |
| 47 |
- $(AR) $@ $(ALLNORMOBJS) |
| 48 |
- chmod a+rx $@ |
| 49 |
- $(RANLIB) $@ |
| 50 |
- |
| 51 |
-lib/libcmatrix_p.a: $(ALLPROFOBJS) |
| 52 |
- $(AR) $@ $(ALLPROFOBJS) |
| 53 |
- chmod a+rx $@ |
| 54 |
- $(RANLIB) $@ |
| 55 |
- |
| 56 |
-lib/libcmatrix-g.a: $(ALLGOBJS) |
| 57 |
- $(AR) $@ $(ALLGOBJS) |
| 58 |
- chmod a+rx $@ |
| 59 |
- $(RANLIB) $@ |
| 60 |
- |
| 61 |
-lib/libcmatrix_r.a: $(ALLTHROBJS) |
| 62 |
- $(AR) @MTFLAGS@ $@ $(ALLTHROBJS) |
| 63 |
- chmod a+rx $@ |
| 64 |
- $(RANLIB) $@ |
| 65 |
+lib/libcmatrix.so.3.2.1: $(ALLNORMOBJS) |
| 66 |
+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) |
| 67 |
+ ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so.3 |
| 68 |
+ ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so |
| 69 |
+ |
| 70 |
+lib/libcmatrix_p.so.3.2.1: $(ALLPROFOBJS) |
| 71 |
+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) |
| 72 |
+ ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so.3 |
| 73 |
+ ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so |
| 74 |
+ |
| 75 |
+lib/libcmatrix-g.so.3.2.1: $(ALLGOBJS) |
| 76 |
+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) |
| 77 |
+ ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so.3 |
| 78 |
+ ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so |
| 79 |
+ |
| 80 |
+lib/libcmatrix.so_r.3.2.1: $(ALLTHROBJS) |
| 81 |
+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) |
| 82 |
+ ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so.3 |
| 83 |
+ ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so |
| 84 |
|
| 85 |
@CONFIGLEAF@××××.gz: |
| 86 |
cd $(ROOT) ; tar --exclude lib/* --exclude *.o --exclude=*~ --exclude=Makefile --exclude=include/config.h --exclude=config.status -cvf @CONFIGLEAF@.tar @CONFIGLEAF@ |
| 87 |
diff --git a/configure.ac b/configure.ac |
| 88 |
index c0ae0e1..50dcd5a 100755 |
| 89 |
--- a/configure.ac |
| 90 |
+++ b/configure.ac |
| 91 |
@@ -1,5 +1,6 @@ |
| 92 |
AC_INIT(configure.ac) |
| 93 |
AC_CONFIG_HEADER(include/config.h) |
| 94 |
+LT_INIT |
| 95 |
|
| 96 |
DEFAR="ar ru" |
| 97 |
MAKEEXTRA= |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.1 sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch?rev=1.1&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libcmatrix/files/3.2.1-gcc4.4.patch?rev=1.1&content-type=text/plain |
| 105 |
|
| 106 |
Index: 3.2.1-gcc4.4.patch |
| 107 |
=================================================================== |
| 108 |
diff --git a/include/DynamicList.h b/include/DynamicList.h |
| 109 |
index f8c1346..05a7b10 100755 |
| 110 |
--- a/include/DynamicList.h |
| 111 |
+++ b/include/DynamicList.h |
| 112 |
@@ -4,6 +4,7 @@ |
| 113 |
#include "BaseList.h" |
| 114 |
#include "lcm_basethreads.h" |
| 115 |
#include "Warnings.h" |
| 116 |
+#include <cstdio> |
| 117 |
|
| 118 |
namespace libcmatrix { |
| 119 |
|
| 120 |
|
| 121 |
|
| 122 |
|
| 123 |
1.1 sci-libs/libcmatrix/files/3.2.1-minuit2.patch |
| 124 |
|
| 125 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libcmatrix/files/3.2.1-minuit2.patch?rev=1.1&view=markup |
| 126 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libcmatrix/files/3.2.1-minuit2.patch?rev=1.1&content-type=text/plain |
| 127 |
|
| 128 |
Index: 3.2.1-minuit2.patch |
| 129 |
=================================================================== |
| 130 |
--- configure-libraries.ac 2008-03-04 00:48:46.000000000 +0100 |
| 131 |
+++ configure-libraries.ac.new 2009-03-19 18:22:21.000000000 +0100 |
| 132 |
@@ -14,8 +14,8 @@ |
| 133 |
fi |
| 134 |
if test x$FOUNDMINUIT = xyes; then |
| 135 |
AC_CHECK_LIB(lcg_Minuit,main,, |
| 136 |
- AC_CHECK_LIB(Minuit,main,,FOUNDMINUIT=no |
| 137 |
- AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit) not found |
| 138 |
+ AC_CHECK_LIB(Minuit2,main,,FOUNDMINUIT=no |
| 139 |
+ AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit2) not found |
| 140 |
Is LDFLAGS is defined to include relevant directory?]))) |
| 141 |
if test x$FOUNDMINUIT = xyes; then |
| 142 |
AC_DEFINE(HAVE_LIBMINUIT) |
Archives