- Link in appropriate libs when creating shared libs, reported by Orcan
'oget' Ogetbil (BZ#475411)
This commit is contained in:
parent
136234a8f8
commit
20c7de3a5a
|
@ -1,5 +1,5 @@
|
||||||
--- makes/Make.lib 2008-06-06 20:57:46.000000000 -0400
|
--- makes/Make.lib 2008-06-06 20:57:46.000000000 -0400
|
||||||
+++ makes/Make.lib.new 2008-12-17 02:01:13.000000000 -0500
|
+++ makes/Make.lib.new 2008-12-21 15:36:21.000000000 -0500
|
||||||
@@ -3,6 +3,8 @@
|
@@ -3,6 +3,8 @@
|
||||||
#
|
#
|
||||||
# override with libatlas.so only when atlas is built to one lib
|
# override with libatlas.so only when atlas is built to one lib
|
||||||
|
@ -9,32 +9,35 @@
|
||||||
DYNlibs = liblapack.so libf77blas.so libcblas.so libatlas.so
|
DYNlibs = liblapack.so libf77blas.so libcblas.so libatlas.so
|
||||||
PTDYNlibs = liblapack.so libptf77blas.so libptcblas.so libatlas.so
|
PTDYNlibs = liblapack.so libptf77blas.so libptcblas.so libatlas.so
|
||||||
CDYNlibs = liblapack.so libcblas.so libatlas.so
|
CDYNlibs = liblapack.so libcblas.so libatlas.so
|
||||||
@@ -32,38 +34,72 @@
|
@@ -32,38 +34,78 @@
|
||||||
mv $(tarnam).tar.gz $(tarnam).tgz
|
mv $(tarnam).tar.gz $(tarnam).tgz
|
||||||
|
|
||||||
ptshared :
|
ptshared :
|
||||||
- - rm -f libatlas.so liblapack.so
|
- - rm -f libatlas.so liblapack.so
|
||||||
|
- $(MAKE) libatlas.so liblapack.so libptf77blas.so libf77blas.so \
|
||||||
|
- libptcblas.so libcblas.so liblapack.so
|
||||||
+ - rm -f libatlas.so* liblapack.so* \
|
+ - rm -f libatlas.so* liblapack.so* \
|
||||||
+ lib*blas.so* libclapack.so*
|
+ lib*blas.so* libclapack.so*
|
||||||
$(MAKE) libatlas.so liblapack.so libptf77blas.so libf77blas.so \
|
+ $(MAKE) libatlas.so libcblas.so libptf77blas.so libf77blas.so \
|
||||||
- libptcblas.so libcblas.so liblapack.so
|
+ libptcblas.so liblapack.so libclapack.so
|
||||||
+ libptcblas.so libcblas.so libclapack.so
|
|
||||||
shared :
|
shared :
|
||||||
- - rm -f libatlas.so liblapack.so
|
- - rm -f libatlas.so liblapack.so
|
||||||
- $(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so liblapack.so
|
- $(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so liblapack.so
|
||||||
+ - rm -f libatlas.so liblapack.so \
|
+ - rm -f libatlas.so liblapack.so \
|
||||||
+ libatlas.so.$(so_ver) liblapack.so.$(so_ver)
|
+ libatlas.so.$(so_ver) liblapack.so.$(so_ver)
|
||||||
+ $(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so libclapack.so
|
+ $(MAKE) libatlas.so libcblas.so libf77blas.so liblapack.so libclapack.so
|
||||||
cptshared :
|
cptshared :
|
||||||
- - rm -f libatlas.so libclapack.so
|
- - rm -f libatlas.so libclapack.so
|
||||||
|
- $(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so
|
||||||
+ - rm -f libatlas.so libclapack.so \
|
+ - rm -f libatlas.so libclapack.so \
|
||||||
+ libatlas.so.$(so_ver) libclapack.so.$(so_ver)
|
+ libatlas.so.$(so_ver) libclapack.so.$(so_ver)
|
||||||
$(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so
|
+ $(MAKE) libatlas.so libptcblas.so libcblas.so libclapack.so
|
||||||
cshared :
|
cshared :
|
||||||
- - rm -f libatlas.so libclapack.so
|
- - rm -f libatlas.so libclapack.so
|
||||||
|
- $(MAKE) libatlas.so libclapack.so libcblas.so
|
||||||
+ - rm -f libatlas.so libclapack.so \
|
+ - rm -f libatlas.so libclapack.so \
|
||||||
+ libatlas.so.$(so_ver) libclapack.so.$(so_ver)
|
+ libatlas.so.$(so_ver) libclapack.so.$(so_ver)
|
||||||
$(MAKE) libatlas.so libclapack.so libcblas.so
|
+ $(MAKE) libatlas.so libcblas.so libclapack.so
|
||||||
|
|
||||||
libatlas.so : libatlas.a
|
libatlas.so : libatlas.a
|
||||||
- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
|
- ld $(LDFLAGS) -shared -soname libatlas.so -o libatlas.so \
|
||||||
|
@ -50,7 +53,8 @@
|
||||||
- liblapack.a --no-whole-archive $(F77SYSLIB)
|
- liblapack.a --no-whole-archive $(F77SYSLIB)
|
||||||
+ mkdir static_libs ; cd static_libs ; ar x ../liblapack.a ; cd ../
|
+ mkdir static_libs ; cd static_libs ; ar x ../liblapack.a ; cd ../
|
||||||
+ gcc $(LDFLAGS) -shared -Wl,-soname=liblapack.so.$(so_ver_major) \
|
+ gcc $(LDFLAGS) -shared -Wl,-soname=liblapack.so.$(so_ver_major) \
|
||||||
+ -o liblapack.so.$(so_ver) static_libs/*.o $(F77SYSLIB)
|
+ -o liblapack.so.$(so_ver) static_libs/*.o $(F77SYSLIB) \
|
||||||
|
+ libf77blas.so.$(so_ver_major) libcblas.so.$(so_ver_major)
|
||||||
+ rm -rf static_libs
|
+ rm -rf static_libs
|
||||||
+ ln -s ./liblapack.so.$(so_ver) liblapack.so.$(so_ver_major)
|
+ ln -s ./liblapack.so.$(so_ver) liblapack.so.$(so_ver_major)
|
||||||
+ ln -s ./liblapack.so.$(so_ver) liblapack.so
|
+ ln -s ./liblapack.so.$(so_ver) liblapack.so
|
||||||
|
@ -59,7 +63,8 @@
|
||||||
- --whole-archive libclapack.a
|
- --whole-archive libclapack.a
|
||||||
+ mkdir static_libs ; cd static_libs ; ar x ../libclapack.a ; cd ../
|
+ mkdir static_libs ; cd static_libs ; ar x ../libclapack.a ; cd ../
|
||||||
+ gcc $(LDFLAGS) -shared -Wl,-soname=libclapack.so.$(so_ver_major) \
|
+ gcc $(LDFLAGS) -shared -Wl,-soname=libclapack.so.$(so_ver_major) \
|
||||||
+ -o libclapack.so.$(so_ver) static_libs/*.o
|
+ -o libclapack.so.$(so_ver) static_libs/*.o \
|
||||||
|
+ libcblas.so.$(so_ver_major) -lc $(LIBS)
|
||||||
+ rm -rf static_libs
|
+ rm -rf static_libs
|
||||||
+ ln -s ./libclapack.so.$(so_ver) libclapack.so.$(so_ver_major)
|
+ ln -s ./libclapack.so.$(so_ver) libclapack.so.$(so_ver_major)
|
||||||
+ ln -s ./libclapack.so.$(so_ver) libclapack.so
|
+ ln -s ./libclapack.so.$(so_ver) libclapack.so
|
||||||
|
@ -68,7 +73,8 @@
|
||||||
- --no-whole-archive $(F77SYSLIB)
|
- --no-whole-archive $(F77SYSLIB)
|
||||||
+ mkdir static_libs ; cd static_libs ; ar x ../libptf77blas.a ; cd ../
|
+ mkdir static_libs ; cd static_libs ; ar x ../libptf77blas.a ; cd ../
|
||||||
+ gcc $(LDFLAGS) -shared -Wl,-soname=libptf77blas.so.$(so_ver_major) \
|
+ gcc $(LDFLAGS) -shared -Wl,-soname=libptf77blas.so.$(so_ver_major) \
|
||||||
+ -o libptf77blas.so.$(so_ver) static_libs/*.o $(F77SYSLIB)
|
+ -o libptf77blas.so.$(so_ver) static_libs/*.o \
|
||||||
|
+ libatlas.so.$(so_ver) $(F77SYSLIB)
|
||||||
+ rm -rf static_libs
|
+ rm -rf static_libs
|
||||||
+ ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so.$(so_ver_major)
|
+ ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so.$(so_ver_major)
|
||||||
+ ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so
|
+ ln -s ./libptf77blas.so.$(so_ver) libptf77blas.so
|
||||||
|
@ -77,7 +83,8 @@
|
||||||
- --no-whole-archive $(F77SYSLIB)
|
- --no-whole-archive $(F77SYSLIB)
|
||||||
+ mkdir static_libs ; cd static_libs ; ar x ../libf77blas.a ; cd ../
|
+ mkdir static_libs ; cd static_libs ; ar x ../libf77blas.a ; cd ../
|
||||||
+ gcc $(LDFLAGS) -shared -Wl,-soname=libf77blas.so.$(so_ver_major) \
|
+ gcc $(LDFLAGS) -shared -Wl,-soname=libf77blas.so.$(so_ver_major) \
|
||||||
+ -o libf77blas.so.$(so_ver) static_libs/*.o $(F77SYSLIB)
|
+ -o libf77blas.so.$(so_ver) static_libs/*.o \
|
||||||
|
+ libatlas.so.$(so_ver) $(F77SYSLIB)
|
||||||
+ rm -rf static_libs
|
+ rm -rf static_libs
|
||||||
+ ln -s ./libf77blas.so.$(so_ver) libf77blas.so.$(so_ver_major)
|
+ ln -s ./libf77blas.so.$(so_ver) libf77blas.so.$(so_ver_major)
|
||||||
+ ln -s ./libf77blas.so.$(so_ver) libf77blas.so
|
+ ln -s ./libf77blas.so.$(so_ver) libf77blas.so
|
||||||
|
@ -85,7 +92,8 @@
|
||||||
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptcblas.a
|
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libptcblas.a
|
||||||
+ mkdir static_libs ; cd static_libs ; ar x ../libptcblas.a ; cd ../
|
+ mkdir static_libs ; cd static_libs ; ar x ../libptcblas.a ; cd ../
|
||||||
+ gcc $(LDFLAGS) -shared -Wl,-soname=libptcblas.so.$(so_ver_major) \
|
+ gcc $(LDFLAGS) -shared -Wl,-soname=libptcblas.so.$(so_ver_major) \
|
||||||
+ -o libptcblas.so.$(so_ver) static_libs/*.o
|
+ -o libptcblas.so.$(so_ver) static_libs/*.o \
|
||||||
|
+ libatlas.so.$(so_ver) -lc $(LIBS)
|
||||||
+ rm -rf static_libs
|
+ rm -rf static_libs
|
||||||
+ ln -s ./libptcblas.so.$(so_ver) libptcblas.so.$(so_ver_major)
|
+ ln -s ./libptcblas.so.$(so_ver) libptcblas.so.$(so_ver_major)
|
||||||
+ ln -s ./libptcblas.so.$(so_ver) libptcblas.so
|
+ ln -s ./libptcblas.so.$(so_ver) libptcblas.so
|
||||||
|
@ -93,7 +101,8 @@
|
||||||
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libcblas.a
|
- ld $(LDFLAGS) -shared -soname $@ -o $@ --whole-archive libcblas.a
|
||||||
+ mkdir static_libs ; cd static_libs ; ar x ../libcblas.a ; cd ../
|
+ mkdir static_libs ; cd static_libs ; ar x ../libcblas.a ; cd ../
|
||||||
+ gcc $(LDFLAGS) -shared -Wl,-soname=libcblas.so.$(so_ver_major) \
|
+ gcc $(LDFLAGS) -shared -Wl,-soname=libcblas.so.$(so_ver_major) \
|
||||||
+ -o libcblas.so.$(so_ver) static_libs/*.o
|
+ -o libcblas.so.$(so_ver) static_libs/*.o \
|
||||||
|
+ libatlas.so.$(so_ver) -lc $(LIBS)
|
||||||
+ rm -rf static_libs
|
+ rm -rf static_libs
|
||||||
+ ln -s ./libcblas.so.$(so_ver) libcblas.so.$(so_ver_major)
|
+ ln -s ./libcblas.so.$(so_ver) libcblas.so.$(so_ver_major)
|
||||||
+ ln -s ./libcblas.so.$(so_ver) libcblas.so
|
+ ln -s ./libcblas.so.$(so_ver) libcblas.so
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: atlas
|
Name: atlas
|
||||||
Version: 3.8.2
|
Version: 3.8.2
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Automatically Tuned Linear Algebra Software
|
Summary: Automatically Tuned Linear Algebra Software
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
@ -279,6 +279,9 @@ rm -rf %{buildroot}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Dec 21 2008 Deji Akingunola <dakingun@gmail.com> - 3.8.2-5
|
||||||
|
- Link in appropriate libs when creating shared libs, reported by Orcan 'oget' Ogetbil (BZ#475411)
|
||||||
|
|
||||||
* Tue Dec 16 2008 Deji Akingunola <dakingun@gmail.com> - 3.8.2-4
|
* Tue Dec 16 2008 Deji Akingunola <dakingun@gmail.com> - 3.8.2-4
|
||||||
- Don't symlink the atlas libdir on i386, cause upgrade issue (BZ#476787)
|
- Don't symlink the atlas libdir on i386, cause upgrade issue (BZ#476787)
|
||||||
- Fix options passed to gcc when making shared libs
|
- Fix options passed to gcc when making shared libs
|
||||||
|
|
Loading…
Reference in New Issue