From c50dd90b91df0f69c3c99804cdd35dd886d9d8a7 Mon Sep 17 00:00:00 2001 From: Guillaume Horel Date: Wed, 29 Mar 2023 16:38:10 -0400 Subject: [PATCH] try to fix parallel archive update --- Makefile | 2 +- Makefile.tail | 14 +++++++------- interface/Makefile | 8 ++++---- lapack-netlib/SRC/Makefile | 10 +++++----- lapack-netlib/SRC/VARIANTS/Makefile | 12 ++++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 144b3400d..721890998 100644 --- a/Makefile +++ b/Makefile @@ -295,7 +295,7 @@ endif -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(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 "LAPACKLIB = ../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc -@echo "TMGLIB = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc diff --git a/Makefile.tail b/Makefile.tail index 54ba649db..e1e6f2307 100644 --- a/Makefile.tail +++ b/Makefile.tail @@ -43,25 +43,25 @@ $(XBLASOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF) $(SBEXTOBJS_P) : override CFLAGS += -DPROFILE $(COMMON_PROF) libs :: $(BLASOBJS) $(COMMONOBJS) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $? prof :: $(BLASOBJS_P) $(COMMONOBJS_P) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $? hpl :: $(HPLOBJS) $(COMMONOBJS) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $? hpl_p :: $(HPLOBJS_P) $(COMMONOBJS_P) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $? kernel :: $(BLASOBJS) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $? commonlibs :: $(COMMONOBJS) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $? commonprof :: $(COMMONOBJS_P) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME_P) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME_P) $? quick : $(MAKE) -C $(TOPDIR) libs diff --git a/interface/Makefile b/interface/Makefile index 3db4b2b6d..26dd4abd9 100644 --- a/interface/Makefile +++ b/interface/Makefile @@ -544,16 +544,16 @@ clean :: @rm -f functable.h 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) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $? level3 : $(SBBLAS3OBJS) $(SBLAS3OBJS) $(DBLAS3OBJS) $(QBLAS3OBJS) $(CBLAS3OBJS) $(ZBLAS3OBJS) $(XBLAS3OBJS) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $? aux : $(CBAUXOBJS) - $(AR) $(ARFLAGS) -ru $(TOPDIR)/$(LIBNAME) $^ + $(AR) $(ARFLAGS) -r $(TOPDIR)/$(LIBNAME) $? $(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 diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile index 8cac42330..6f6e50983 100644 --- a/lapack-netlib/SRC/Makefile +++ b/lapack-netlib/SRC/Makefile @@ -622,24 +622,24 @@ endif all: $(LAPACKLIB) $(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED) - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ .PHONY: single complex double complex16 single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX) - $(AR) $(ARFLAGS) $(LAPACKLIB) $^ + $(AR) $(ARFLAGS) $(LAPACKLIB) $? $(RANLIB) $(LAPACKLIB) complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX) - $(AR) $(ARFLAGS) $(LAPACKLIB) $^ + $(AR) $(ARFLAGS) $(LAPACKLIB) $? $(RANLIB) $(LAPACKLIB) double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX) - $(AR) $(ARFLAGS) $(LAPACKLIB) $^ + $(AR) $(ARFLAGS) $(LAPACKLIB) $? $(RANLIB) $(LAPACKLIB) complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX) - $(AR) $(ARFLAGS) $(LAPACKLIB) $^ + $(AR) $(ARFLAGS) $(LAPACKLIB) $? $(RANLIB) $(LAPACKLIB) $(ALLAUX): $(FRC) diff --git a/lapack-netlib/SRC/VARIANTS/Makefile b/lapack-netlib/SRC/VARIANTS/Makefile index 25d8ee175..b93ac701d 100644 --- a/lapack-netlib/SRC/VARIANTS/Makefile +++ b/lapack-netlib/SRC/VARIANTS/Makefile @@ -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 cholrl.a: $(CHOLRL) - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ choltop.a: $(CHOLTOP) - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ lucr.a: $(LUCR) - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ lull.a: $(LULL) - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ lurec.a: $(LUREC) - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ qrll.a: $(QRLL) - $(AR) $(ARFLAGS) $@ $^ + $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ .PHONY: clean cleanobj cleanlib