try to fix parallel archive update

This commit is contained in:
Guillaume Horel 2023-03-29 16:38:10 -04:00
parent c05da5960d
commit c50dd90b91
5 changed files with 23 additions and 23 deletions

View File

@ -295,7 +295,7 @@ endif
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "AR = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "AR = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "ARFLAGS = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "ARFLAGS = $(ARFLAGS) -r" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "LAPACKLIB = ../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "LAPACKLIB = ../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@echo "TMGLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "TMGLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc

View File

@ -43,25 +43,25 @@ $(XBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
$(SBEXTOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF) $(SBEXTOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF)
libs :: $(BLASOBJS) $(COMMONOBJS) libs :: $(BLASOBJS) $(COMMONOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
prof :: $(BLASOBJS_P) $(COMMONOBJS_P) prof :: $(BLASOBJS_P) $(COMMONOBJS_P)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $?
hpl :: $(HPLOBJS) $(COMMONOBJS) hpl :: $(HPLOBJS) $(COMMONOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
hpl_p :: $(HPLOBJS_P) $(COMMONOBJS_P) hpl_p :: $(HPLOBJS_P) $(COMMONOBJS_P)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $?
kernel :: $(BLASOBJS) kernel :: $(BLASOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
commonlibs :: $(COMMONOBJS) commonlibs :: $(COMMONOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
commonprof :: $(COMMONOBJS_P) commonprof :: $(COMMONOBJS_P)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $?
quick : quick :
$(MAKE) -C $(TOPDIR) libs $(MAKE) -C $(TOPDIR) libs

View File

@ -544,16 +544,16 @@ clean ::
@rm -f functable.h @rm -f functable.h
level1 : $(SBEXTOBJS) $(SBBLAS1OBJS) $(SBLAS1OBJS) $(DBLAS1OBJS) $(QBLAS1OBJS) $(CBLAS1OBJS) $(ZBLAS1OBJS) $(XBLAS1OBJS) level1 : $(SBEXTOBJS) $(SBBLAS1OBJS) $(SBLAS1OBJS) $(DBLAS1OBJS) $(QBLAS1OBJS) $(CBLAS1OBJS) $(ZBLAS1OBJS) $(XBLAS1OBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
level2 : $(SBBLAS2OBJS) $(SBLAS2OBJS) $(DBLAS2OBJS) $(QBLAS2OBJS) $(CBLAS2OBJS) $(ZBLAS2OBJS) $(XBLAS2OBJS) level2 : $(SBBLAS2OBJS) $(SBLAS2OBJS) $(DBLAS2OBJS) $(QBLAS2OBJS) $(CBLAS2OBJS) $(ZBLAS2OBJS) $(XBLAS2OBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
level3 : $(SBBLAS3OBJS) $(SBLAS3OBJS) $(DBLAS3OBJS) $(QBLAS3OBJS) $(CBLAS3OBJS) $(ZBLAS3OBJS) $(XBLAS3OBJS) level3 : $(SBBLAS3OBJS) $(SBLAS3OBJS) $(DBLAS3OBJS) $(QBLAS3OBJS) $(CBLAS3OBJS) $(ZBLAS3OBJS) $(XBLAS3OBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
aux : $(CBAUXOBJS) aux : $(CBAUXOBJS)
$(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $?
$(CSBBLASOBJS) $(CSBBLASOBJS_P) $(CSBLASOBJS) $(CSBLASOBJS_P) $(CDBLASOBJS) $(CDBLASOBJS_P) $(CQBLASOBJS) $(CQBLASOBJS_P) \ $(CSBBLASOBJS) $(CSBBLASOBJS_P) $(CSBLASOBJS) $(CSBLASOBJS_P) $(CDBLASOBJS) $(CDBLASOBJS_P) $(CQBLASOBJS) $(CQBLASOBJS_P) \
$(CCBLASOBJS) $(CCBLASOBJS_P) $(CZBLASOBJS) $(CZBLASOBJS_P) $(CXBLASOBJS) $(CXBLASOBJS_P) $(CBAUXOBJS_P) : override CFLAGS += -DCBLAS $(CCBLASOBJS) $(CCBLASOBJS_P) $(CZBLASOBJS) $(CZBLASOBJS_P) $(CXBLASOBJS) $(CXBLASOBJS_P) $(CBAUXOBJS_P) : override CFLAGS += -DCBLAS

View File

@ -622,24 +622,24 @@ endif
all: $(LAPACKLIB) all: $(LAPACKLIB)
$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED) $(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
.PHONY: single complex double complex16 .PHONY: single complex double complex16
single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX) single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^ $(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB) $(RANLIB) $(LAPACKLIB)
complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX) complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^ $(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB) $(RANLIB) $(LAPACKLIB)
double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX) double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^ $(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB) $(RANLIB) $(LAPACKLIB)
complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX) complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
$(AR) $(ARFLAGS) $(LAPACKLIB) $^ $(AR) $(ARFLAGS) $(LAPACKLIB) $?
$(RANLIB) $(LAPACKLIB) $(RANLIB) $(LAPACKLIB)
$(ALLAUX): $(FRC) $(ALLAUX): $(FRC)

View File

@ -35,27 +35,27 @@ QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o qr/LL/sceil.o
all: cholrl.a choltop.a lucr.a lull.a lurec.a qrll.a all: cholrl.a choltop.a lucr.a lull.a lurec.a qrll.a
cholrl.a: $(CHOLRL) cholrl.a: $(CHOLRL)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
choltop.a: $(CHOLTOP) choltop.a: $(CHOLTOP)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
lucr.a: $(LUCR) lucr.a: $(LUCR)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
lull.a: $(LULL) lull.a: $(LULL)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
lurec.a: $(LUREC) lurec.a: $(LUREC)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
qrll.a: $(QRLL) qrll.a: $(QRLL)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
.PHONY: clean cleanobj cleanlib .PHONY: clean cleanobj cleanlib