Index: head/math/libflame/Makefile =================================================================== --- head/math/libflame/Makefile (revision 533708) +++ head/math/libflame/Makefile (revision 533709) @@ -1,81 +1,80 @@ # Created by: bf@FreeBSD.org # $FreeBSD$ PORTNAME= libflame -DISTVERSION= 5.1.0-53 -DISTVERSIONSUFFIX= -gf4e27a74 +DISTVERSION= 5.2.0 CATEGORIES= math MAINTAINER= jmd@FreeBSD.org COMMENT= FLAME dense linear algebra library LICENSE= BSD3CLAUSE ONLY_FOR_ARCHS= amd64 i386 powerpc64 powerpc ONLY_FOR_ARCHS_REASON= make system does not support other architectures yet BUILD_DEPENDS= bash:shells/bash GNU_CONFIGURE= yes -USES= compiler:c11 gmake +USES= compiler:c11 gmake python:3.7 USE_CSTD= c99 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= flame OPTIONS_RADIO= PARALLELIZATION OPTIONS_RADIO_PARALLELIZATION= NONE THREADS OPENMP OPTIONS_DEFAULT= THREADS NONE_DESC= serial libflame THREADS_DESC= pthread based parallelization OPENMP_DESC= OpenMP based parallelization # enable dynamic build always CONFIGURE_ARGS= --enable-dynamic-build # our shell is also prone to the argument list too long bug CONFIGURE_ARGS+= --enable-max-arg-list-hack # use libflame as a LAPACK CONFIGURE_ARGS+= --enable-lapack2flame # add our CFLAGS to theirs CONFIGURE_ARGS+= --with-extra-cflags="${CFLAGS}" # enable supermatrix CONFIGURE_ARGS+= --enable-supermatrix # disable ldim alignment (we cannot assume input to be aligned) CONFIGURE_ARGS+= --disable-ldim-alignment .for b in M K N .if defined(${b}_BLOCKSIZE) CONFIGURE_ARGS+= --enable-default-${b:tl}-blocksize=${${b}_BLOCKSIZE} .endif .endfor .include .if ${PORT_OPTIONS:MOPENMP} .if ${CHOSEN_COMPILER_TYPE} == clang IGNORE= clang does not support OPENMP, use THREADS instead .endif OPENMP_CFLAGS ?= -fopenmp CFLAGS+= ${OPENMP_CFLAGS} LDFLAGS+= ${OPENMP_CFLAGS} CONFIGURE_ARGS+= --enable-multithreading=openmp .elif ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --enable-multithreading=pthreads .elif ${PORT_OPTIONS:MNONE} CONFIGURE_ARGS+= --enable-multithreading=no .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200060 IGNORE= requires a newer linker such as lld .endif .if !(defined(USE_GCC) || !empty(CC:M*gcc4*)) CONFIGURE_ARGS+= --disable-autodetect-f77-ldflags \ --disable-autodetect-f77-name-mangling .endif -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/include/libflame - ${INSTALL_DATA} ${WRKSRC}/include_local/* ${STAGEDIR}/${PREFIX}/include/libflame/ +#post-install: +# @${MKDIR} ${STAGEDIR}${PREFIX}/include/libflame +# ${INSTALL_DATA} ${WRKSRC}/include_local/* ${STAGEDIR}/${PREFIX}/include/libflame/ .include Index: head/math/libflame/distinfo =================================================================== --- head/math/libflame/distinfo (revision 533708) +++ head/math/libflame/distinfo (revision 533709) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529638615 -SHA256 (flame-libflame-5.1.0-53-gf4e27a74_GH0.tar.gz) = b5319c33e0b03a14ed994ac8119cdf4419f6be0575c130c4bc0fcd1e85fb0dc7 -SIZE (flame-libflame-5.1.0-53-gf4e27a74_GH0.tar.gz) = 19159156 +TIMESTAMP = 1565464353 +SHA256 (flame-libflame-5.2.0_GH0.tar.gz) = 997c860f351a5c7aaed8deec00f502167599288fd0559c92d5bfd77d0b4d475c +SIZE (flame-libflame-5.2.0_GH0.tar.gz) = 19165184 Index: head/math/libflame/files/patch-Makefile.diff =================================================================== --- head/math/libflame/files/patch-Makefile.diff (revision 533708) +++ head/math/libflame/files/patch-Makefile.diff (nonexistent) @@ -1,162 +0,0 @@ ---- Makefile.orig 2018-06-02 13:26:25.000000000 -0400 -+++ Makefile 2018-06-06 22:23:38.079036000 -0400 -@@ -79,7 +79,7 @@ - # Construct the architecture-version string, which will be used to name the - # libraries upon installation. - VERSION := $(shell cat version) --ARCH_VERS := $(ARCH)-$(VERSION) -+ARCH_VERS := - - # --- Library names --- - ALL_FLAMEC_LIB_NAME := libflame.a -@@ -117,25 +117,25 @@ - # --- Define install target names for static libraries --- - MK_FLAMEC_LIBS := $(MK_ALL_FLAMEC_LIB) - MK_FLAMEC_LIBS_INST := $(patsubst $(BASE_LIB_DIR)/%.a, \ -- $(INSTALL_PREFIX)/lib/%.a, \ -+ $(STAGEDIR)$(INSTALL_PREFIX)/lib/%.a, \ - $(MK_FLAMEC_LIBS)) - MK_FLAMEC_LIBS_INST_W_ARCH_VERS := $(patsubst $(BASE_LIB_DIR)/%.a, \ -- $(INSTALL_PREFIX)/lib/%-$(ARCH_VERS).a, \ -+ $(STAGEDIR)$(INSTALL_PREFIX)/lib/%.a, \ - $(MK_FLAMEC_LIBS)) - #MK_FLAMEC_LIBS_INST_W_ARCH_ONLY := $(patsubst $(BASE_LIB_DIR)/%.a, \ --# $(INSTALL_PREFIX)/lib/%-$(ARCH).a, \ -+# $(STAGEDIR)$(INSTALL_PREFIX)/lib/%.a, \ - # $(MK_FLAMEC_LIBS)) - - # --- Define install target names for dynamic libraries --- - MK_FLAMEC_DLLS := $(MK_ALL_FLAMEC_DLL) - MK_FLAMEC_DLLS_INST := $(patsubst $(BASE_LIB_DIR)/%.so, \ -- $(INSTALL_PREFIX)/lib/%.so, \ -+ $(STAGEDIR)$(INSTALL_PREFIX)/lib/%.so, \ - $(MK_FLAMEC_DLLS)) - MK_FLAMEC_DLLS_INST_W_ARCH_VERS := $(patsubst $(BASE_LIB_DIR)/%.so, \ -- $(INSTALL_PREFIX)/lib/%-$(ARCH_VERS).so, \ -+ $(STAGEDIR)$(INSTALL_PREFIX)/lib/%.so, \ - $(MK_FLAMEC_DLLS)) - #MK_FLAMEC_DLLS_INST_W_ARCH_ONLY := $(patsubst $(BASE_LIB_DIR)/%.so, \ --# $(INSTALL_PREFIX)/lib/%-$(ARCH).so, \ -+# $(STAGEDIR)$(INSTALL_PREFIX)/lib/%-$(ARCH).so, \ - # $(MK_FLAMEC_DLLS)) - - # --- Determine which libraries to build --- -@@ -159,9 +159,9 @@ - endif - - # --- Set the include directory names --- --MK_INCL_DIR_INST := $(INSTALL_PREFIX)/include --MK_INCL_DIR_INST_W_ARCH_VERS := $(INSTALL_PREFIX)/include-$(ARCH_VERS) --#MK_INCL_DIR_INST_W_ARCH_ONLY := $(INSTALL_PREFIX)/include-$(ARCH) -+MK_INCL_DIR_INST := $(STAGEDIR)$(INSTALL_PREFIX)/include -+MK_INCL_DIR_INST_W_ARCH_VERS := $(STAGEDIR)$(INSTALL_PREFIX)/include -+#MK_INCL_DIR_INST_W_ARCH_ONLY := $(STAGEDIR)$(INSTALL_PREFIX)/include-$(ARCH) - - - -@@ -452,22 +452,22 @@ - @$(INSTALL) -m 0644 $(MK_HEADER_FILES) $(@) - endif - --$(INSTALL_PREFIX)/lib/%-$(ARCH_VERS).a: $(BASE_LIB_DIR)/%.a -+$(STAGEDIR)$(INSTALL_PREFIX)/lib/%.a: $(BASE_LIB_DIR)/%.a - ifeq ($(FLA_ENABLE_VERBOSE_MAKE_OUTPUT),yes) - $(INSTALL) -m 0755 -d $(@D) - $(INSTALL) -m 0644 $< $@ - else -- @echo "Installing $(@F) into $(INSTALL_PREFIX)/lib/" -+ @echo "Installing $(@F) into $(STAGEDIR)$(INSTALL_PREFIX)/lib/" - @$(INSTALL) -m 0755 -d $(@D) - @$(INSTALL) -m 0644 $< $@ - endif - --$(INSTALL_PREFIX)/lib/%-$(ARCH_VERS).so: $(BASE_LIB_DIR)/%.so -+$(STAGEDIR)$(INSTALL_PREFIX)/lib/%.so: $(BASE_LIB_DIR)/%.so - ifeq ($(FLA_ENABLE_VERBOSE_MAKE_OUTPUT),yes) - $(INSTALL) -m 0755 -d $(@D) - $(INSTALL) -m 0644 $< $@ - else -- @echo "Installing $(@F) into $(INSTALL_PREFIX)/lib/" -+ @echo "Installing $(@F) into $(STAGEDIR)$(INSTALL_PREFIX)/lib/" - @$(INSTALL) -m 0755 -d $(@D) - @$(INSTALL) -m 0644 $< $@ - endif -@@ -475,30 +475,30 @@ - - - # --- Install-symlinks rules --- --install-lib-symlinks: check-config $(MK_LIBS_INST) -+#install-lib-symlinks: check-config $(MK_LIBS_INST) -+# -+#install-header-symlinks: check-config $(MK_INCL_DIR_INST) -+# -+#$(MK_INCL_DIR_INST): $(MK_INCL_DIR_INST_W_ARCH_VERS) -+#ifeq ($(FLA_ENABLE_VERBOSE_MAKE_OUTPUT),yes) -+# $(SYMLINK) $(