Version 5.2.4, Revision 22801, Hash 830bf17

MODIFIED * configure include/version/version.m4 lib/lapack/Makefile.loc lib/netcdf/Makefile.loc lib/netcdff/Makefile.loc Bugs: - few more changes / fixes imported from maintenance branch Patch sent by: Davide Sangalli <[email protected]>
yambo-code · Oct 2, 2024 · 3a0d457 · 3a0d457
1 parent 830bf17
commit 3a0d457
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Yambo 5.2.4 r.22805 h.6c4c47f463.
+# Generated by GNU Autoconf 2.71 for Yambo 5.2.4 r.22806 h.830bf17010.
 #
 # Report bugs to <[email protected]>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Yambo'
 PACKAGE_TARNAME='yambo'
-PACKAGE_VERSION='5.2.4 r.22805 h.6c4c47f463'
-PACKAGE_STRING='Yambo 5.2.4 r.22805 h.6c4c47f463'
+PACKAGE_VERSION='5.2.4 r.22806 h.830bf17010'
+PACKAGE_STRING='Yambo 5.2.4 r.22806 h.830bf17010'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1600,7 +1600,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Yambo 5.2.4 r.22805 h.6c4c47f463 to adapt to many kinds of systems.
+\`configure' configures Yambo 5.2.4 r.22806 h.830bf17010 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1666,7 +1666,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Yambo 5.2.4 r.22805 h.6c4c47f463:";;
+     short | recursive ) echo "Configuration of Yambo 5.2.4 r.22806 h.830bf17010:";;
    esac
   cat <<\_ACEOF
 
@@ -1876,7 +1876,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Yambo configure 5.2.4 r.22805 h.6c4c47f463
+Yambo configure 5.2.4 r.22806 h.830bf17010
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2505,7 +2505,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Yambo $as_me 5.2.4 r.22805 h.6c4c47f463, which was
+It was created by Yambo $as_me 5.2.4 r.22806 h.830bf17010, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3263,8 +3263,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 SVERSION="5"
 SSUBVERSION="2"
 SPATCHLEVEL="4"
-SREVISION="22805"
-SHASH="6c4c47f463"
+SREVISION="22806"
+SHASH="830bf17010"
 
 
 
@@ -16578,7 +16578,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Yambo $as_me 5.2.4 r.22805 h.6c4c47f463, which was
+This file was extended by Yambo $as_me 5.2.4 r.22806 h.830bf17010, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16642,7 +16642,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Yambo config.status 5.2.4 r.22805 h.6c4c47f463
+Yambo config.status 5.2.4 r.22806 h.830bf17010
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git a/include/version/version.m4 b/include/version/version.m4
@@ -1,9 +1,9 @@
-AC_INIT(Yambo, 5.2.4 r.22805 h.6c4c47f463, [email protected])
+AC_INIT(Yambo, 5.2.4 r.22806 h.830bf17010, [email protected])
 SVERSION="5"
 SSUBVERSION="2"
 SPATCHLEVEL="4"
-SREVISION="22805"
-SHASH="6c4c47f463"
+SREVISION="22806"
+SHASH="830bf17010"
 AC_SUBST(SVERSION)
 AC_SUBST(SSUBVERSION)
 AC_SUBST(SPATCHLEVEL)

diff --git a/lib/lapack/Makefile.loc b/lib/lapack/Makefile.loc
@@ -15,8 +15,6 @@ PACKAGE=$(pkgname_lapack)
 include ../config/external_libs_commons.mk
 include ../config/external_libs_defs.mk
 #
-#CONFFLAGS=-DCMAKE_INSTALL_LIBDIR=$(LIBPATH)/lib
-#
 all: $(LIBRARY)
 #
 uncompress:
@@ -27,9 +25,9 @@ configure: uncompress
          echo "\t[$(PACKAGE)] configuration"; \
 	 cd $(PACKAGE); \
 	 mkdir build_static ; cd build_static ; \
-	 ( cmake -DCMAKE_INSTALL_LIBDIR=$(LIBPATH)/lib -DBUILD_SHARED_LIBS=OFF .. ) >> ${compdir}/log/config_$(PACKAGE).log 2>&1 ; \
+	 ( cmake -DCMAKE_C_COMPILER=$(cc) -DCMAKE_Fortran_COMPILER=$(fc) -DCMAKE_INSTALL_PREFIX=$(LIBPATH) -DBUILD_SHARED_LIBS=OFF .. ) >> ${compdir}/log/config_$(PACKAGE).log 2>&1 ; \
 	 cd .. ; mkdir build_shared ; cd build_shared ; \
-	 ( cmake -DCMAKE_INSTALL_LIBDIR=$(LIBPATH)/lib -DBUILD_SHARED_LIBS=ON .. ) >> ${compdir}/log/config_$(PACKAGE).log 2>&1 ; \
+	 ( cmake -DCMAKE_C_COMPILER=$(cc) -DCMAKE_Fortran_COMPILER=$(fc) -DCMAKE_INSTALL_PREFIX=$(LIBPATH) -DBUILD_SHARED_LIBS=ON .. ) >> ${compdir}/log/config_$(PACKAGE).log 2>&1 ; \
 	 cd .. ; \
 	 touch ../configured.stamp ; \
 	fi
@@ -40,6 +38,7 @@ compile: uncompress configure
          cd $(PACKAGE); \
 	 cd build_static ; ( cmake --build . ) >> ${compdir}/log/compile_$(PACKAGE).log 2>&1 ; cd .. ; \
 	 cd build_shared ; ( cmake --build . ) >> ${compdir}/log/compile_$(PACKAGE).log 2>&1 ; cd .. ; \
+         cd ..; \
 	 touch compiled.stamp; \
 	fi
 
@@ -49,7 +48,8 @@ install: uncompress configure compile
          cd $(PACKAGE); \
 	 cd build_static ; ( cmake --build . --target install ) >> ${compdir}/log/install_$(PACKAGE).log 2>&1 ; cd .. ; \
 	 cd build_shared ; ( cmake --build . --target install ) >> ${compdir}/log/install_$(PACKAGE).log 2>&1 ; cd .. ; \
-	 touch ../installed.stamp; \
+         cd ..; \
+	 touch installed.stamp; \
 	fi
 
 $(LIBRARY): uncompress configure compile install

diff --git a/lib/netcdf/Makefile.loc b/lib/netcdf/Makefile.loc
@@ -24,8 +24,8 @@ CONFFLAGS=--prefix=$(LIBPATH) --libdir=$(LIBPATH)/lib \
 	  CPP="$(cpp)" \
 	  CFLAGS="$(cflags)" \
 	  FC="$(fc)" \
-	  CPPFLAGS="$(netcdf_flag) $(ihdf5) $(ipnetcdf)" \
-	  LIBS="$(lpnetcdf) $(lhdf5)" \
+	  CPPFLAGS="$(netcdf_flag) $(ihdf5)" \
+	  LIBS="$(lhdf5)" \
 	  F77="$(f77)"
 # DEBUG <
 # This option is useful for debugging netcdf4 problems

diff --git a/lib/netcdff/Makefile.loc b/lib/netcdff/Makefile.loc
@@ -24,8 +24,8 @@ CONFFLAGS=--prefix=$(LIBPATH) --libdir=$(LIBPATH)/lib \
 	  CFLAGS="$(cflags)" \
 	  CPP="$(cpp)" \
 	  FC="$(fc)" \
-	  CPPFLAGS="$(netcdf_flag) $(ihdf5) $(ipnetcdf) $(inetcdf)" \
-	  LIBS="$(lnetcdf) $(lpnetcdf) $(lhdf5)" \
+	  CPPFLAGS="$(netcdf_flag) $(ihdf5) $(inetcdf)" \
+	  LIBS="$(lnetcdf) $(lhdf5)" \
 	  F77="$(f77)" 
 # DEBUG <
 # This option is useful for debugging netcdf4 problems