Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 94883 Details for
Bug 144314
sci-libs/atlas 3.7.23 released
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
3.7.15-shared-libs.patch
3.7.15-shared-libs.patch (text/plain), 37.18 KB, created by
Adam Piątyszek
on 2006-08-22 13:19:48 UTC
(
hide
)
Description:
3.7.15-shared-libs.patch
Filename:
MIME Type:
Creator:
Adam Piątyszek
Created:
2006-08-22 13:19:48 UTC
Size:
37.18 KB
patch
obsolete
>diff -Nru ATLAS.orig/CONFIG/src/Makefile ATLAS/CONFIG/src/Makefile >--- ATLAS.orig/CONFIG/src/Makefile 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/CONFIG/src/Makefile 2006-08-22 13:08:45.000000000 +0200 >@@ -310,3 +310,19 @@ > clean : > rm -f *.o x* > $(MAKE) -f Make.top clean >+ >+#Gentoo stuff: >+shared : >+ $(MAKE) -f Make.top shared >+ >+shared-strip : >+ $(MAKE) -f Make.top shared-strip >+ >+ptshared : >+ $(MAKE) -f Make.top ptshared >+ >+ptshared-strip : >+ $(MAKE) -f Make.top ptshared-strip >+ >+liblapack.so : >+ $(MAKE) -f Make.top liblapack.so >diff -Nru ATLAS.orig/CONFIG/src/SpewMakeInc.c ATLAS/CONFIG/src/SpewMakeInc.c >--- ATLAS.orig/CONFIG/src/SpewMakeInc.c 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/CONFIG/src/SpewMakeInc.c 2006-08-22 13:08:45.000000000 +0200 >@@ -538,7 +538,12 @@ > fprintf(fpout, " NCFLAGS = $(ICCFLAGS)\n"); > fprintf(fpout, "\n CLINKER = $(ICC)\n CLINKFLAGS = $(ICCFLAGS)\n"); > fprintf(fpout, " FLINKER = $(F77)\n FLINKFLAGS = $(F77FLAGS)\n"); >+#ifdef USE_LIBTOOL >+ fprintf(fpout, " LIBTOOL = libtool --mode=compile\n"); >+ fprintf(fpout, " ARCHIVER = $(BLDdir)/war ar\n"); >+#else > fprintf(fpout, " ARCHIVER = ar\n"); >+#endif > fprintf(fpout, " ARFLAGS = r\n"); > fprintf(fpout, " RANLIB = echo\n\n"); > >diff -Nru ATLAS.orig/makes/Make.aux ATLAS/makes/Make.aux >--- ATLAS.orig/makes/Make.aux 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.aux 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,7 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) >+SKC:=$(LIBTOOL) --tag=CC $(SKC) >+DKC:=$(LIBTOOL) --tag=CC $(DKC) > mySRCdir = $(SRCdir)/src/auxil > > ptobj = ATL_ptflushcache.o >@@ -114,12 +117,16 @@ > > ATL_cputime.o : $(SYSdir)/ATL_cputime.o > cp $(SYSdir)/ATL_cputime.o ATL_cputime.o >+ ln -sf $(SYSdir)/ATL_cputime.lo ATL_cputime.lo >+ ln -sf $(SYSdir)/.libs/ATL_cputime.o .libs/ATL_cputime.o > $(SYSdir)/ATL_cputime.o: $(SYSdir)/ATL_cputime.c > cd $(SYSdir) ; $(MAKE) ATL_cputime.o > $(SYSdir)/ATL_cputime.c: > cd $(SYSdir) ; $(MAKE) ATL_cputime.o > ATL_walltime.o : $(SYSdir)/ATL_walltime.o > cp $(SYSdir)/ATL_walltime.o ATL_walltime.o >+ ln -sf $(SYSdir)/ATL_walltime.lo ATL_walltime.lo >+ ln -sf $(SYSdir)/.libs/ATL_walltime.o .libs/ATL_walltime.o > $(SYSdir)/ATL_walltime.o: $(SYSdir)/ATL_walltime.c > cd $(SYSdir) ; $(MAKE) ATL_walltime.o > $(SYSdir)/ATL_walltime.c: >diff -Nru ATLAS.orig/makes/Make.cblas ATLAS/makes/Make.cblas >--- ATLAS.orig/makes/Make.cblas 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.cblas 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,5 @@ > include Make.inc >+ICC:= $(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/interfaces/blas/C/src/ > > aobj = cblas_xerbla.o cblas_errprn.o >diff -Nru ATLAS.orig/makes/Make.f77blas ATLAS/makes/Make.f77blas >--- ATLAS.orig/makes/Make.f77blas 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.f77blas 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,8 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) >+F77:=$(LIBTOOL) --tag=F77 $(F77) > mySRCdir = $(SRCdir)/interfaces/blas/F77/src > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.gpmm ATLAS/makes/Make.gpmm >--- ATLAS.orig/makes/Make.gpmm 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.gpmm 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,5 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/pklevel3/gpmm > > all : lib >diff -Nru ATLAS.orig/makes/Make.l1ref ATLAS/makes/Make.l1ref >--- ATLAS.orig/makes/Make.l1ref 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l1ref 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/reference/level1 > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.l1src ATLAS/makes/Make.l1src >--- ATLAS.orig/makes/Make.l1src 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l1src 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,7 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) >+SKC:=$(LIBTOOL) --tag=CC $(SKC) >+DKC:=$(LIBTOOL) --tag=CC $(DKC) > mySRCdir = $(SRCdir)/src/blas/level1 > > sobj = ATL_dsdot.o ATL_sdsdot.o ATL_srotg.o ATL_srotm.o ATL_srotmg.o >@@ -17,29 +20,29 @@ > > sgen : > $(MAKE) Make_srot >- $(MAKE) -f Make_srot lib >+ $(MAKE) -f Make_srot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_saxpby >- $(MAKE) -f Make_saxpby lib >+ $(MAKE) -f Make_saxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_scpsc >- $(MAKE) -f Make_scpsc lib >+ $(MAKE) -f Make_scpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_sset >- $(MAKE) -f Make_sset lib >+ $(MAKE) -f Make_sset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_snrm2 >- $(MAKE) -f Make_snrm2 lib >+ $(MAKE) -f Make_snrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_sasum >- $(MAKE) -f Make_sasum lib >+ $(MAKE) -f Make_sasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_sdot >- $(MAKE) -f Make_sdot lib >+ $(MAKE) -f Make_sdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_sswap >- $(MAKE) -f Make_sswap lib >+ $(MAKE) -f Make_sswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_sscal >- $(MAKE) -f Make_sscal lib >+ $(MAKE) -f Make_sscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_scopy >- $(MAKE) -f Make_scopy lib >+ $(MAKE) -f Make_scopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_saxpy >- $(MAKE) -f Make_saxpy lib >+ $(MAKE) -f Make_saxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_siamax >- $(MAKE) -f Make_siamax lib >+ $(MAKE) -f Make_siamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > slvl1 : slib > slib : slib.grd > $(MAKE) sgen >@@ -52,29 +55,29 @@ > rm -f $(sobj) s*.grd > dgen : > $(MAKE) Make_drot >- $(MAKE) -f Make_drot lib >+ $(MAKE) -f Make_drot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_daxpby >- $(MAKE) -f Make_daxpby lib >+ $(MAKE) -f Make_daxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_dcpsc >- $(MAKE) -f Make_dcpsc lib >+ $(MAKE) -f Make_dcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_dset >- $(MAKE) -f Make_dset lib >+ $(MAKE) -f Make_dset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_dnrm2 >- $(MAKE) -f Make_dnrm2 lib >+ $(MAKE) -f Make_dnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_dasum >- $(MAKE) -f Make_dasum lib >+ $(MAKE) -f Make_dasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_ddot >- $(MAKE) -f Make_ddot lib >+ $(MAKE) -f Make_ddot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_dswap >- $(MAKE) -f Make_dswap lib >+ $(MAKE) -f Make_dswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_dscal >- $(MAKE) -f Make_dscal lib >+ $(MAKE) -f Make_dscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_dcopy >- $(MAKE) -f Make_dcopy lib >+ $(MAKE) -f Make_dcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_daxpy >- $(MAKE) -f Make_daxpy lib >+ $(MAKE) -f Make_daxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_diamax >- $(MAKE) -f Make_diamax lib >+ $(MAKE) -f Make_diamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > dlvl1 : dlib > dlib : dlib.grd > $(MAKE) dgen >@@ -87,31 +90,31 @@ > rm -f $(dobj) d*.grd > cgen : > $(MAKE) Make_crot >- $(MAKE) -f Make_crot lib >+ $(MAKE) -f Make_crot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_caxpby >- $(MAKE) -f Make_caxpby lib >+ $(MAKE) -f Make_caxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_ccpsc >- $(MAKE) -f Make_ccpsc lib >+ $(MAKE) -f Make_ccpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_cset >- $(MAKE) -f Make_cset lib >+ $(MAKE) -f Make_cset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_cnrm2 >- $(MAKE) -f Make_cnrm2 lib >+ $(MAKE) -f Make_cnrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_casum >- $(MAKE) -f Make_casum lib >+ $(MAKE) -f Make_casum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_cdot >- $(MAKE) -f Make_cdot lib >+ $(MAKE) -f Make_cdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_cswap >- $(MAKE) -f Make_cswap lib >+ $(MAKE) -f Make_cswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_cscal >- $(MAKE) -f Make_cscal lib >+ $(MAKE) -f Make_cscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_ccopy >- $(MAKE) -f Make_ccopy lib >+ $(MAKE) -f Make_ccopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_caxpy >- $(MAKE) -f Make_caxpy lib >+ $(MAKE) -f Make_caxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_ciamax >- $(MAKE) -f Make_ciamax lib >+ $(MAKE) -f Make_ciamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_cdotc >- $(MAKE) -f Make_cdotc lib >+ $(MAKE) -f Make_cdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > clvl1 : clib > clib : slib clib.grd > $(MAKE) cgen >@@ -124,31 +127,31 @@ > rm -f $(cobj) c*.grd > zgen : > $(MAKE) Make_zrot >- $(MAKE) -f Make_zrot lib >+ $(MAKE) -f Make_zrot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zaxpby >- $(MAKE) -f Make_zaxpby lib >+ $(MAKE) -f Make_zaxpby lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zcpsc >- $(MAKE) -f Make_zcpsc lib >+ $(MAKE) -f Make_zcpsc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zset >- $(MAKE) -f Make_zset lib >+ $(MAKE) -f Make_zset lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_znrm2 >- $(MAKE) -f Make_znrm2 lib >+ $(MAKE) -f Make_znrm2 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zasum >- $(MAKE) -f Make_zasum lib >+ $(MAKE) -f Make_zasum lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zdot >- $(MAKE) -f Make_zdot lib >+ $(MAKE) -f Make_zdot lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zswap >- $(MAKE) -f Make_zswap lib >+ $(MAKE) -f Make_zswap lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zscal >- $(MAKE) -f Make_zscal lib >+ $(MAKE) -f Make_zscal lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zcopy >- $(MAKE) -f Make_zcopy lib >+ $(MAKE) -f Make_zcopy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zaxpy >- $(MAKE) -f Make_zaxpy lib >+ $(MAKE) -f Make_zaxpy lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_ziamax >- $(MAKE) -f Make_ziamax lib >+ $(MAKE) -f Make_ziamax lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(MAKE) Make_zdotc >- $(MAKE) -f Make_zdotc lib >+ $(MAKE) -f Make_zdotc lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > zlvl1 : zlib > zlib : dlib zlib.grd > $(MAKE) zgen >diff -Nru ATLAS.orig/makes/Make.l2 ATLAS/makes/Make.l2 >--- ATLAS.orig/makes/Make.l2 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l2 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/level2/ > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.l2aux ATLAS/makes/Make.l2aux >--- ATLAS.orig/makes/Make.l2aux 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l2aux 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/level2/kernel > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.l2ref ATLAS/makes/Make.l2ref >--- ATLAS.orig/makes/Make.l2ref 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l2ref 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/reference/level2 > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.l2src ATLAS/makes/Make.l2src >--- ATLAS.orig/makes/Make.l2src 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l2src 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,5 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > > sobj = ATL_sktrmvLNN.o ATL_sktrmvLNU.o ATL_sktrmvLTN.o ATL_sktrmvLTU.o \ > ATL_sktrmvUNN.o ATL_sktrmvUNU.o ATL_sktrmvUTN.o ATL_sktrmvUTU.o \ >diff -Nru ATLAS.orig/makes/Make.l3 ATLAS/makes/Make.l3 >--- ATLAS.orig/makes/Make.l3 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l3 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/level3 > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.l3aux ATLAS/makes/Make.l3aux >--- ATLAS.orig/makes/Make.l3aux 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l3aux 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/level3/rblas > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.l3kern ATLAS/makes/Make.l3kern >--- ATLAS.orig/makes/Make.l3kern 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l3kern 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,5 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/level3/kernel > > sobj = ATL_ssycopyL_a1.o ATL_ssycopyL_aX.o ATL_ssycopyU_a1.o \ >diff -Nru ATLAS.orig/makes/Make.l3ptblas ATLAS/makes/Make.l3ptblas >--- ATLAS.orig/makes/Make.l3ptblas 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l3ptblas 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/pthreads/blas/level3 > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.l3ref ATLAS/makes/Make.l3ref >--- ATLAS.orig/makes/Make.l3ref 2006-08-18 03:48:50.000000000 +0200 >+++ ATLAS/makes/Make.l3ref 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/reference/level3 > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.miptblas ATLAS/makes/Make.miptblas >--- ATLAS.orig/makes/Make.miptblas 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/makes/Make.miptblas 2006-08-22 13:08:45.000000000 +0200 >@@ -43,6 +43,7 @@ > ######################################################################## > # > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/pthreads/misc > # > ######################################################################## >diff -Nru ATLAS.orig/makes/Make.mmsrc ATLAS/makes/Make.mmsrc >--- ATLAS.orig/makes/Make.mmsrc 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/makes/Make.mmsrc 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,7 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) >+SMC:=$(LIBTOOL) --tag=CC $(SMC) >+DMC:=$(LIBTOOL) --tag=CC $(DMC) > mySRCdir = $(SRCdir)/src/blas/gemm > > $(INCAdir)/atlas_type.h : >@@ -82,7 +85,7 @@ > sclean : > rm -f $(sobj) s*.grd > scleanuplib : >- cd KERNEL ; $(MAKE) -f sMakefile slib >+ cd KERNEL ; $(MAKE) -f sMakefile slib SMC="$(SMC)" > > slib : > $(MAKE) auxillib scleanuplib susergemm >@@ -205,7 +208,7 @@ > dclean : > rm -f $(dobj) d*.grd > dcleanuplib : >- cd KERNEL ; $(MAKE) -f dMakefile dlib >+ cd KERNEL ; $(MAKE) -f dMakefile dlib DMC="$(DMC)" > > dlib : > $(MAKE) auxillib dcleanuplib dusergemm >@@ -328,7 +331,7 @@ > cclean : > rm -f $(cobj) c*.grd > ccleanuplib : >- cd KERNEL ; $(MAKE) -f cMakefile clib >+ cd KERNEL ; $(MAKE) -f cMakefile clib SMC="$(SMC)" > > clib : > $(MAKE) auxillib ccleanuplib cusergemm >@@ -515,7 +518,7 @@ > zclean : > rm -f $(zobj) z*.grd > zcleanuplib : >- cd KERNEL ; $(MAKE) -f zMakefile zlib >+ cd KERNEL ; $(MAKE) -f zMakefile zlib DMC="$(DMC)" > > zlib : > $(MAKE) auxillib zcleanuplib zusergemm >diff -Nru ATLAS.orig/makes/Make.mvsrc ATLAS/makes/Make.mvsrc >--- ATLAS.orig/makes/Make.mvsrc 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/makes/Make.mvsrc 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,7 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) >+SKC:=$(LIBTOOL) --tag=CC $(SKC) >+DKC:=$(LIBTOOL) --tag=CC $(DKC) > mySRCdir = $(SRCdir)/src/blas/gemv > > sobj = ATL_sgemv.o >@@ -19,7 +22,7 @@ > clean : sclean dclean cclean zclean > > dlib : >- $(PMAKE) -f Make_dmv dlib >+ $(PMAKE) -f Make_dmv dlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(PMAKE) dlib.grd > dlib.grd : $(dobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj) >@@ -28,7 +31,7 @@ > dclean : > rm -f $(dobj) d*.grd > slib : >- $(PMAKE) -f Make_smv slib >+ $(PMAKE) -f Make_smv slib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(PMAKE) slib.grd > slib.grd : $(sobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj) >@@ -37,7 +40,7 @@ > sclean : > rm -f $(sobj) s*.grd > clib : >- $(PMAKE) -f Make_cmv clib >+ $(PMAKE) -f Make_cmv clib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(PMAKE) clib.grd > clib.grd : $(cobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj) >@@ -46,7 +49,7 @@ > cclean : > rm -f $(cobj) c*.grd > zlib : >- $(PMAKE) -f Make_zmv zlib >+ $(PMAKE) -f Make_zmv zlib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > $(PMAKE) zlib.grd > zlib.grd : $(zobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj) >diff -Nru ATLAS.orig/makes/Make.r1src ATLAS/makes/Make.r1src >--- ATLAS.orig/makes/Make.r1src 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/makes/Make.r1src 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,7 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) >+SKC:=$(LIBTOOL) --tag=CC $(SKC) >+DKC:=$(LIBTOOL) --tag=CC $(DKC) > mySRCdir = $(SRCdir)/src/blas/ger > > sobj = ATL_sger.o >@@ -17,7 +20,7 @@ > > dlib : > $(PMAKE) dlib.grd >- $(PMAKE) -f Make_dr1 lib >+ $(PMAKE) -f Make_dr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > dlib.grd : $(dobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(dobj) > $(RANLIB) $(ATLASlib) >@@ -26,7 +29,7 @@ > rm -f $(dobj) d*.grd > slib : > $(PMAKE) slib.grd >- $(PMAKE) -f Make_sr1 lib >+ $(PMAKE) -f Make_sr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > slib.grd : $(sobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(sobj) > $(RANLIB) $(ATLASlib) >@@ -35,7 +38,7 @@ > rm -f $(sobj) s*.grd > clib : > $(PMAKE) clib.grd >- $(PMAKE) -f Make_cr1 lib >+ $(PMAKE) -f Make_cr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > clib.grd : $(cobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(cobj) > $(RANLIB) $(ATLASlib) >@@ -44,7 +47,7 @@ > rm -f $(cobj) c*.grd > zlib : > $(PMAKE) zlib.grd >- $(PMAKE) -f Make_zr1 lib >+ $(PMAKE) -f Make_zr1 lib ICC="$(ICC)" SKC="$(SKC)" DKC="$(DKC)" > zlib.grd : $(zobj) > $(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(zobj) > $(RANLIB) $(ATLASlib) >diff -Nru ATLAS.orig/makes/Make.sprk ATLAS/makes/Make.sprk >--- ATLAS.orig/makes/Make.sprk 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/makes/Make.sprk 2006-08-22 13:08:45.000000000 +0200 >@@ -1,4 +1,5 @@ > include Make.inc >+ICC:=$(LIBTOOL) --tag=CC $(ICC) > mySRCdir = $(SRCdir)/src/blas/pklevel3/sprk > > all : lib >diff -Nru ATLAS.orig/makes/Make.sysinfo ATLAS/makes/Make.sysinfo >--- ATLAS.orig/makes/Make.sysinfo 2006-08-18 03:48:51.000000000 +0200 >+++ ATLAS/makes/Make.sysinfo 2006-08-22 13:08:45.000000000 +0200 >@@ -103,12 +103,12 @@ > ATL_cputime.c : > cp $(mySRCdir)/ATL_cputime.c . > ATL_cputime.o : ATL_cputime.c >- $(ICC) -c $(ICCFLAGS) ATL_cputime.c >+ $(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_cputime.c > > ATL_walltime.c : > cp $(mySRCdir)/ATL_walltime.c . > ATL_walltime.o : ATL_walltime.c >- $(ICC) -c $(ICCFLAGS) ATL_walltime.c >+ $(LIBTOOL) --tag=CC $(ICC) -c $(ICCFLAGS) ATL_walltime.c > > ATL_Xwalltime.o : ATL_walltime.o > $(XCC) $(XCCFLAGS) -c -o ATL_Xwalltime.o ATL_walltime.c >diff -Nru ATLAS.orig/Make.top ATLAS/Make.top >--- ATLAS.orig/Make.top 2006-08-18 03:48:47.000000000 +0200 >+++ ATLAS/Make.top 2006-08-22 13:08:45.000000000 +0200 >@@ -297,3 +297,85 @@ > - cp $(LIBdir)/libptf77blas.a $(INSTdir)/. > - chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a > >+shared: INSTALLER = cp >+shared: RPATH = /usr/lib/blas/atlas >+shared: libatlas.so libblas.so libcblas.so >+ >+shared-strip: INSTALLER = install -s >+shared-strip: RPATH = /usr/lib/blas/atlas >+shared-strip: libatlas.so libblas.so libcblas.so >+ >+ptshared: INSTALLER = cp >+ptshared: RPATH = /usr/lib/blas/threaded-atlas >+ptshared: libptblas.so libptcblas.so >+ >+ptshared-strip: INSTALLER = install -s >+ptshared-strip: RPATH = /usr/lib/blas/threaded-atlas >+ptshared-strip: libptblas.so libptcblas.so >+ >+liblapack.so: RPATH = /usr/lib/lapack/atlas >+ >+libatlas.so: >+ mkdir -p gentoo/libs >+ @echo >+ @echo Linking a really big library, please be patient... >+ @echo >+ cd gentoo/libatlas.a ; \ >+ libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libatlas.la *.lo \ >+ -rpath /usr/lib ; \ >+ libtool --mode=install $(INSTALLER) libatlas.la $(BLDdir)/gentoo/libs >+ >+# libg2c is part of GNU gcc. It is listed here as a dependency for the F77 >+# BLAS libraries in case the user wants to link with the libraries using >+# the Intel Fortran Compiler. The issue is with xerbla.f, which calls the >+# STOP instrinsic. Linking with ifc will result in undefined symbols like >+# e_wsfe and others. These symbols are contained in libg2c. If you will not >+# use ifc, you most likely want to remove the '-lg2c' from libblas.so >+# and possibly libptblas.so. Of course, you can just remove -lg2c, and >+# specify it explicitly when using ifc. >+libblas.so: >+ cd gentoo/libf77blas.a ; \ >+ libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libblas.la \ >+ ../libs/libatlas.la *.lo -rpath $(RPATH); \ >+ rm -f .libs/libblas.so.0.0.0; \ >+ $(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \ >+ -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \ >+ libtool --mode=install $(INSTALLER) libblas.la $(BLDdir)/gentoo/libs >+ >+libcblas.so: >+ cd gentoo/libcblas.a ; \ >+ libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libcblas.la \ >+ ../libs/libatlas.la *.lo -rpath $(RPATH) ; \ >+ rm -f .libs/libcblas.so.0.0.0; \ >+ $(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \ >+ -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \ >+ libtool --mode=install $(INSTALLER) libcblas.la $(BLDdir)/gentoo/libs >+ >+libptblas.so: >+ mkdir -p gentoo/threaded-libs >+ cd gentoo/libptf77blas.a ; \ >+ libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libblas.la \ >+ ../libs/libatlas.la *.lo -rpath $(RPATH); \ >+ rm -f .libs/libblas.so.0.0.0; \ >+ $(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \ >+ -Wl,-soname -Wl,libblas.so.0 -o .libs/libblas.so.0.0.0; \ >+ libtool --mode=install $(INSTALLER) libblas.la \ >+ $(BLDdir)/gentoo/threaded-libs >+ >+libptcblas.so: >+ cd gentoo/libptcblas.a ; \ >+ libtool --mode=link --tag=CC $(ICC) SHRD_LNK -o libcblas.la \ >+ ../libs/libatlas.la *.lo -rpath $(RPATH); \ >+ rm -f .libs/libcblas.so.0.0.0; \ >+ $(ICC) --shared .libs/*.o SHRD_LNK $(BLDdir)/gentoo/libs/libatlas.so \ >+ -Wl,-soname -Wl,libcblas.so.0 -o .libs/libcblas.so.0.0.0; \ >+ libtool --mode=install $(INSTALLER) libcblas.la \ >+ $(BLDdir)/gentoo/threaded-libs >+ >+liblapack.so: >+ mkdir -p gentoo/libs >+ cd gentoo/liblapack.a ; \ >+ libtool --mode=link --tag=CC $(ICC) -o liblapack.la *.lo \ >+ -rpath $(RPATH) -lblas -lcblas -latlas SHRD_LNK; \ >+ libtool --mode=install $(INSTALLER) liblapack.la $(BLDdir)/gentoo/libs >+ >diff -Nru ATLAS.orig/tune/blas/gemm/emit_mm.c ATLAS/tune/blas/gemm/emit_mm.c >--- ATLAS.orig/tune/blas/gemm/emit_mm.c 2006-08-18 03:50:18.000000000 +0200 >+++ ATLAS/tune/blas/gemm/emit_mm.c 2006-08-22 13:08:45.000000000 +0200 >@@ -2433,6 +2433,7 @@ > assert(fp); > > fprintf(fp, "include ../Make.inc\n\n"); >+ fprintf(fp, "CC:=$(LIBTOOL) --tag=CC $(CC)\n\n"); > fprintf(fp, "CDEFS2 = $(CDEFS)"); > for (i=0; i < 3; i++) > if (cp[i]) fprintf(fp, " -DATL_UCLEAN%c", cwh[i]); >@@ -2512,7 +2513,7 @@ > wp->NBs[k], wp->imult, wp->fixed, betas[j]); > else sprintf(fnam, "ATL_%cNBmm_b%c", pre, betas[j]); > fprintf(fp, "%s.o : %s.c \n", fnam, fnam); >- fprintf(fp, "\t%s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n", >+ fprintf(fp, "\t$(LIBTOOL) --tag=CC %s $(CDEFS2) -DATL_BETA=%c -c %s %s.c\n", > wp->CC, betas[j], wp->CCFLAGS, fnam); > } > } >diff -Nru ATLAS.orig/tune/blas/gemv/mvsearch.c ATLAS/tune/blas/gemv/mvsearch.c >--- ATLAS.orig/tune/blas/gemv/mvsearch.c 2006-08-18 03:50:17.000000000 +0200 >+++ ATLAS/tune/blas/gemv/mvsearch.c 2006-08-22 13:08:45.000000000 +0200 >@@ -512,7 +512,7 @@ > fprintf(fp, "include Make.inc\n\n"); > > if (ccN[0] == '\0') fprintf(fp, "MVNCC = $(%cKC)\n", UPR); >- else fprintf(fp, "MVNCC = %s\n", ccN); >+ else fprintf(fp, "MVNCC = $(LIBTOOL) --tag=CC %s\n", ccN); > if (ccN[0] == '\0' && ccflagsN[0] != '\0') > fprintf(fp, "MVNFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n", > UPR, ccflagsN, typ); >@@ -526,7 +526,7 @@ > } > > if (ccT[0] == '\0') fprintf(fp, "MVTCC = $(%cKC)\n", UPR); >- else fprintf(fp, "MVTCC = %s\n", ccT); >+ else fprintf(fp, "MVTCC = $(LIBTOOL) --tag=CC %s\n", ccT); > if (ccT[0] == '\0' && ccflagsT[0] != '\0') > fprintf(fp, "MVTFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s\n", > UPR, ccflagsT, typ); >@@ -540,7 +540,7 @@ > } > > if (ccS[0] == '\0') fprintf(fp, "MVSCC = $(%cKC)\n", UPR); >- else fprintf(fp, "MVSCC = %s\n", ccS); >+ else fprintf(fp, "MVSCC = $(LIBTOOL) --tag=CC %s\n", ccS); > if (ccS[0] == '\0' && ccflagsS[0] != '\0') > fprintf(fp, "MVSFLAGS = $(CDEFS) $(%cKCFLAGS) %s -D%s", > UPR, ccflagsS, typ); >diff -Nru ATLAS.orig/tune/blas/level1/asumsrch.c ATLAS/tune/blas/level1/asumsrch.c >--- ATLAS.orig/tune/blas/level1/asumsrch.c 2006-08-18 03:50:18.000000000 +0200 >+++ ATLAS/tune/blas/level1/asumsrch.c 2006-08-22 18:48:07.000000000 +0200 >@@ -159,6 +159,7 @@ > FILE *fpin; > FILENODE *fbase, *fn, *fp=NULL; > char ln[512], rout[256], auth[256], cc[256], ccflags[256]; >+ char temp[256]; > char *pcc, *pccflags; > int i, n, ID, alpha, beta, incX, incY; > >@@ -180,7 +181,10 @@ > assert(fgets(ccflags, 512, fpin) != NULL); > FixFlags(cc); > FixFlags(ccflags); >- pcc = cc; >+/* Gentoo pcc = cc; */ >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ pcc = temp; > pccflags = ccflags; > } > else pcc = pccflags = NULL; >@@ -575,6 +579,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "asum"; > int i; > FILE *fpout; >@@ -611,6 +618,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/axpbysrch.c ATLAS/tune/blas/level1/axpbysrch.c >--- ATLAS.orig/tune/blas/level1/axpbysrch.c 2006-08-18 03:50:18.000000000 +0200 >+++ ATLAS/tune/blas/level1/axpbysrch.c 2006-08-22 18:49:34.000000000 +0200 >@@ -902,6 +902,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "axpby"; > int i; > FILE *fpout; >@@ -938,6 +941,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/axpysrch.c ATLAS/tune/blas/level1/axpysrch.c >--- ATLAS.orig/tune/blas/level1/axpysrch.c 2006-08-18 03:50:18.000000000 +0200 >+++ ATLAS/tune/blas/level1/axpysrch.c 2006-08-22 18:45:03.000000000 +0200 >@@ -744,6 +744,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "axpy"; > int i; > FILE *fpout; >@@ -780,6 +783,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/copysrch.c ATLAS/tune/blas/level1/copysrch.c >--- ATLAS.orig/tune/blas/level1/copysrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/copysrch.c 2006-08-22 18:47:35.000000000 +0200 >@@ -159,6 +159,7 @@ > FILE *fpin; > FILENODE *fbase, *fn, *fp=NULL; > char ln[512], rout[256], auth[256], cc[256], ccflags[256]; >+ char temp[256]; > char *pcc, *pccflags; > int i, n, ID, alpha, beta, incX, incY; > >@@ -180,7 +181,10 @@ > assert(fgets(ccflags, 512, fpin) != NULL); > FixFlags(cc); > FixFlags(ccflags); >- pcc = cc; >+/* Gentoo pcc = cc; */ >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ pcc = temp; > pccflags = ccflags; > } > else pcc = pccflags = NULL; >@@ -673,6 +677,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "copy"; > int i; > FILE *fpout; >@@ -709,6 +716,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/cpscsrch.c ATLAS/tune/blas/level1/cpscsrch.c >--- ATLAS.orig/tune/blas/level1/cpscsrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/cpscsrch.c 2006-08-22 18:50:49.000000000 +0200 >@@ -753,6 +753,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "cpsc"; > int i; > FILE *fpout; >@@ -789,6 +792,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/dotsrch.c ATLAS/tune/blas/level1/dotsrch.c >--- ATLAS.orig/tune/blas/level1/dotsrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/dotsrch.c 2006-08-22 18:50:27.000000000 +0200 >@@ -688,6 +688,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "dot"; > int i; > FILE *fpout; >@@ -733,6 +736,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/iamaxsrch.c ATLAS/tune/blas/level1/iamaxsrch.c >--- ATLAS.orig/tune/blas/level1/iamaxsrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/iamaxsrch.c 2006-08-22 18:46:05.000000000 +0200 >@@ -159,6 +159,7 @@ > FILE *fpin; > FILENODE *fbase, *fn, *fp=NULL; > char ln[512], rout[256], auth[256], cc[256], ccflags[256]; >+ char temp[256]; > char *pcc, *pccflags; > int i, n, ID, alpha, beta, incX, incY; > >@@ -179,7 +180,10 @@ > assert(fgets(ccflags, 512, fpin) != NULL); > FixFlags(cc); > FixFlags(ccflags); >- pcc = cc; >+/* Gentoo pcc = cc; */ >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ pcc = temp; > pccflags = ccflags; > } > else pcc = pccflags = NULL; >@@ -574,6 +578,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "iamax"; > int i; > FILE *fpout; >@@ -610,6 +617,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/nrm2srch.c ATLAS/tune/blas/level1/nrm2srch.c >--- ATLAS.orig/tune/blas/level1/nrm2srch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/nrm2srch.c 2006-08-22 18:51:54.000000000 +0200 >@@ -575,6 +575,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "nrm2"; > int i; > FILE *fpout; >@@ -611,6 +614,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/rotsrch.c ATLAS/tune/blas/level1/rotsrch.c >--- ATLAS.orig/tune/blas/level1/rotsrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/rotsrch.c 2006-08-22 18:45:02.000000000 +0200 >@@ -838,6 +838,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "rot"; > int i; > FILE *fpout; >@@ -874,6 +877,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/scalsrch.c ATLAS/tune/blas/level1/scalsrch.c >--- ATLAS.orig/tune/blas/level1/scalsrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/scalsrch.c 2006-08-22 18:51:27.000000000 +0200 >@@ -647,6 +647,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "scal"; > int i; > FILE *fpout; >@@ -683,6 +686,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/setsrch.c ATLAS/tune/blas/level1/setsrch.c >--- ATLAS.orig/tune/blas/level1/setsrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/setsrch.c 2006-08-22 18:46:44.000000000 +0200 >@@ -159,6 +159,7 @@ > FILE *fpin; > FILENODE *fbase, *fn, *fp=NULL; > char ln[512], rout[256], auth[256], cc[256], ccflags[256]; >+ char temp[256]; > char *pcc, *pccflags; > int i, n, ID, alpha, beta, incX, incY; > >@@ -181,7 +182,10 @@ > assert(fgets(ccflags, 512, fpin) != NULL); > FixFlags(cc); > FixFlags(ccflags); >- pcc = cc; >+/* Gentoo pcc = cc; */ >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ pcc = temp; > pccflags = ccflags; > } > else pcc = pccflags = NULL; >@@ -631,6 +635,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "set"; > int i; > FILE *fpout; >@@ -667,6 +674,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam); >diff -Nru ATLAS.orig/tune/blas/level1/swapsrch.c ATLAS/tune/blas/level1/swapsrch.c >--- ATLAS.orig/tune/blas/level1/swapsrch.c 2006-08-18 03:50:19.000000000 +0200 >+++ ATLAS/tune/blas/level1/swapsrch.c 2006-08-22 18:52:23.000000000 +0200 >@@ -673,6 +673,9 @@ > { > char *cc, *ccflags, *nam, *typ=""; > char ln[32]; >+/* Gentoo */ >+ char temp[256]; >+/* end Gentoo */ > char *rout = "swap"; > int i; > FILE *fpout; >@@ -709,6 +712,12 @@ > cc = bp[i]->cc; > ccflags = bp[i]->ccflags; > if (!cc) cc = (pre == 's' || pre == 'c') ? "$(SKC)" : "$(DKC)"; >+/* Gentoo */ >+ else { >+ strcpy(temp, "$(LIBTOOL) --tag=CC "); >+ strcat(temp, cc); >+ } >+/* end Gentoo */ > if (!ccflags) > ccflags = (pre == 's' || pre == 'c') ? "$(SKCFLAGS)":"$(DKCFLAGS)"; > fprintf(fpout, "%s.o : %s.c\n", nam, nam);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=94883">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 144314
:
94726
|
94727
|
94855
|
94856
| 94883 |
94884
|
95324
|
95325
|
95326
