~olbohlen/oi-userland.git

parent: 7b5e70ef | patch | commit | ignore whitespace

Aurélien Larcher

2017-04-24 c602d3982914f689edde2e59811aed7d2fe0ba37

Bump OpenBLAS to 0.2.19

3 files deleted

5 files modified

	components/scientific/openblas/Makefile	19 ●●●●● patch \| view \| raw \| blame \| history
	components/scientific/openblas/manifests/sample-manifest.p5m	10 ●●●●● patch \| view \| raw \| blame \| history
	components/scientific/openblas/openblas.p5m	3 ●●●●● patch \| view \| raw \| blame \| history
	components/scientific/openblas/patches/openblas-01-shared-lib.patch	18 ●●●●● patch \| view \| raw \| blame \| history
	components/scientific/openblas/patches/openblas-03-link-flag.patch	11 ●●●●● patch \| view \| raw \| blame \| history
	components/scientific/openblas/patches/openblas-05-gcc-attribute.patch	11 ●●●●● patch \| view \| raw \| blame \| history
	components/scientific/openblas/patches/openblas-06-rlimit_nproc.patch	24 ●●●●● patch \| view \| raw \| blame \| history
	components/scientific/openblas/patches/openblas-07-missing-num-procs.patch	16 ●●●●● patch \| view \| raw \| blame \| history

 components/scientific/openblas/Makefile

@@ -18,32 +18,31 @@
#
# CDDL HEADER END
#
# Copyright (c) 2014, Aurelien Larcher. All rights reserved.
# Copyright (c) 2014-2017, Aurelien Larcher. All rights reserved.
#
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        openblas
COMPONENT_VERSION=    0.2.15
COMPONENT_VERSION=    0.2.19
COMPONENT_VERSION_REV=    0
COMPONENT_VERSION_TAG=    ga7126c2
COMPONENT_REVISION_TAG= afedc8e
COMPONENT_REVISION_TAG= 9a7e0ec
COMPONENT_FMRI=         library/math/openblas
COMPONENT_CLASSIFICATION=Development/High Performance Computing
COMPONENT_SRC=        xianyi-OpenBLAS-$(COMPONENT_REVISION_TAG)
COMPONENT_PROJECT_URL=    http://www.openblas.net
COMPONENT_ARCHIVE=    xianyi-OpenBLAS-v$(COMPONENT_VERSION)-$(COMPONENT_VERSION_REV)-$(COMPONENT_VERSION_TAG).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:fe32d7977e9a2dddcd6e9c5350683b5e3cc3d59afdd432e9a5989449e536aecc
    sha256:878353b52940e0d5be32011cd5ba8440758f5270c3fa0f6f6200c26eabc53f1c
COMPONENT_ARCHIVE_URL=    http://github.com/xianyi/OpenBLAS/tarball/v$(COMPONENT_VERSION)
COMPONENT_LICENSE=      BSD 3-Clause
COMPONENT_LICENSE_FILE= $(COMPONENT_NAME).license
COMPONENT_SUMMARY=         Optimized BLAS library based on GotoBLAS2

include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/justmake.mk
include $(WS_MAKE_RULES)/ips.mk

PATH=/usr/gnu/bin:/usr/bin
PATH=$(PATH.gnu)

# In a virtualized environment getarch cannot detect the architecture.
# It falls back to INTEL_UKNOWN which causes failure of the build.
@@ -53,6 +52,7 @@
                            DYNAMIC_ARCH=1 \
                            TARGET=PRESCOTT \
                            BINARY=$(BITS) \
                            CROSS_SUFFIX="" \
                            FC=$(FC) CC=$(CC) \
                            COMMON_OPT="$(CFLAGS) -Wa,--divide" \
                            NO_LAPACKE=1 \
@@ -71,7 +71,6 @@

test: $(NO_TESTS)

BUILD_PKG_DEPENDENCIES =    $(BUILD_TOOLS)

include $(WS_MAKE_RULES)/depend.mk

# Auto-generated dependencies
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/gfortran-4-runtime

 components/scientific/openblas/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2016 <contributor>
# Copyright 2017 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,16 +33,14 @@
    target=libopenblasp-r$(COMPONENT_VERSION).a
link path=usr/lib/$(MACH64)/libopenblas.so \
    target=libopenblasp-r$(COMPONENT_VERSION).so
link path=usr/lib/$(MACH64)/libopenblas.so.0 \
    target=libopenblasp-r$(COMPONENT_VERSION).so
file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).a
file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).so
file path=usr/lib/$(MACH64)/libopenblasp-r0.2.13.a
file path=usr/lib/$(MACH64)/libopenblasp-r0.2.13.so
link path=usr/lib/libopenblas.a target=libopenblasp-r$(COMPONENT_VERSION).a
link path=usr/lib/libopenblas.so target=libopenblasp-r$(COMPONENT_VERSION).so
link path=usr/lib/libopenblas.so.0 target=libopenblasp-r$(COMPONENT_VERSION).so
file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).a
file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).so
file path=usr/lib/libopenblasp-r0.2.13.a
file path=usr/lib/libopenblasp-r0.2.13.so
file path=usr/share/openblas-$(COMPONENT_VERSION)/OpenBLASConfig.cmake
file path=usr/share/openblas-$(COMPONENT_VERSION)/OpenBLASConfigVersion.cmake
file path=usr/share/openblas-0.2.13/OpenBLASConfig.cmake

 components/scientific/openblas/openblas.p5m

@@ -33,10 +33,13 @@
    target=libopenblasp-r$(COMPONENT_VERSION).a
link path=usr/lib/$(MACH64)/libopenblas.so \
    target=libopenblasp-r$(COMPONENT_VERSION).so
link path=usr/lib/$(MACH64)/libopenblas.so.0 \
    target=libopenblasp-r$(COMPONENT_VERSION).so
file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).a
file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).so
link path=usr/lib/libopenblas.a target=libopenblasp-r$(COMPONENT_VERSION).a
link path=usr/lib/libopenblas.so target=libopenblasp-r$(COMPONENT_VERSION).so
link path=usr/lib/libopenblas.so.0 target=libopenblasp-r$(COMPONENT_VERSION).so
file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).a
file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).so
file path=usr/share/openblas-$(COMPONENT_VERSION)/OpenBLASConfig.cmake

 components/scientific/openblas/patches/openblas-01-shared-lib.patch

@@ -22,10 +22,10 @@
 ifeq ($(OSNAME), Darwin)
     @$(MAKE) -C exports dyn
     @-ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
--- ./Makefile.install.orig    2015-02-10 03:36:22.281524541 +0000
+++ ./Makefile.install    2015-02-10 03:37:24.743697309 +0000
@@ -79,6 +80,11 @@
     @cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
--- xianyi-OpenBLAS-9a7e0ec/Makefile.install.orig    2016-09-01 05:58:42.000000000 +0200
+++ xianyi-OpenBLAS-9a7e0ec/Makefile.install    2017-04-24 00:06:20.207814843 +0200
@@ -80,6 +80,11 @@
     @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
     ln -fs $(LIBSONAME) $(LIBPREFIX).so
 endif
+ifeq ($(OSNAME), SunOS)
@@ -34,14 +34,14 @@
+    ln -fs $(LIBSONAME) $(LIBPREFIX).so
+endif
 ifeq ($(OSNAME), Darwin)
     @-cp $(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
     @-install_name_tool -id $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)
@@ -98,7 +104,7 @@
     @echo "SET(OpenBLAS_INCLUDE_DIRS ${OPENBLAS_INCLUDE_DIR})" > $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
     @-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
     @-install_name_tool -id "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
@@ -101,7 +106,7 @@
 
 ifndef NO_SHARED
 #ifeq logical or
-ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD))
+ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD SunOS))
     @echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).so)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
     @echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).so)" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
 endif
 ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT))

 components/scientific/openblas/patches/openblas-03-link-flag.patch

@@ -9,14 +9,3 @@
         }
 
     if (
--- ./f_check.orig    2015-02-09 21:24:09.692826943 +0000
+++ ./f_check    2015-02-09 21:24:56.395177199 +0000
@@ -271,7 +271,7 @@
     }
 
     if ($flags =~ /^\-Y/) {
-        $linker_L .= "-Wl,". $flags . " ";
+        #$linker_L .= "-Wl,". $flags . " ";
         }
 
     if ($flags =~ /^\-rpath\@/) {

 components/scientific/openblas/patches/openblas-05-gcc-attribute.patch

File was deleted

 components/scientific/openblas/patches/openblas-06-rlimit_nproc.patch

File was deleted

 components/scientific/openblas/patches/openblas-07-missing-num-procs.patch

File was deleted

			@@ -18,32 +18,31 @@
			#
			# CDDL HEADER END
			#
			# Copyright (c) 2014, Aurelien Larcher. All rights reserved.
			# Copyright (c) 2014-2017, Aurelien Larcher. All rights reserved.
			#
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= openblas
			COMPONENT_VERSION= 0.2.15
			COMPONENT_VERSION= 0.2.19
			COMPONENT_VERSION_REV= 0
			COMPONENT_VERSION_TAG= ga7126c2
			COMPONENT_REVISION_TAG= afedc8e
			COMPONENT_REVISION_TAG= 9a7e0ec
			COMPONENT_FMRI= library/math/openblas
			COMPONENT_CLASSIFICATION=Development/High Performance Computing
			COMPONENT_SRC= xianyi-OpenBLAS-$(COMPONENT_REVISION_TAG)
			COMPONENT_PROJECT_URL= http://www.openblas.net
			COMPONENT_ARCHIVE= xianyi-OpenBLAS-v$(COMPONENT_VERSION)-$(COMPONENT_VERSION_REV)-$(COMPONENT_VERSION_TAG).tar.gz
			COMPONENT_ARCHIVE_HASH= \
			sha256:fe32d7977e9a2dddcd6e9c5350683b5e3cc3d59afdd432e9a5989449e536aecc
			sha256:878353b52940e0d5be32011cd5ba8440758f5270c3fa0f6f6200c26eabc53f1c
			COMPONENT_ARCHIVE_URL= http://github.com/xianyi/OpenBLAS/tarball/v$(COMPONENT_VERSION)
			COMPONENT_LICENSE= BSD 3-Clause
			COMPONENT_LICENSE_FILE= $(COMPONENT_NAME).license
			COMPONENT_SUMMARY= Optimized BLAS library based on GotoBLAS2

			include $(WS_MAKE_RULES)/prep.mk
			include $(WS_MAKE_RULES)/justmake.mk
			include $(WS_MAKE_RULES)/ips.mk

			PATH=/usr/gnu/bin:/usr/bin
			PATH=$(PATH.gnu)

			# In a virtualized environment getarch cannot detect the architecture.
			# It falls back to INTEL_UKNOWN which causes failure of the build.
			@@ -53,6 +52,7 @@
			DYNAMIC_ARCH=1 \
			TARGET=PRESCOTT \
			BINARY=$(BITS) \
			CROSS_SUFFIX="" \
			FC=$(FC) CC=$(CC) \
			COMMON_OPT="$(CFLAGS) -Wa,--divide" \
			NO_LAPACKE=1 \
			@@ -71,7 +71,6 @@

			test: $(NO_TESTS)

			BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)

			include $(WS_MAKE_RULES)/depend.mk

			# Auto-generated dependencies
			REQUIRED_PACKAGES += system/library
			REQUIRED_PACKAGES += system/library/gfortran-4-runtime

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2016 <contributor>
			# Copyright 2017 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -33,16 +33,14 @@
			target=libopenblasp-r$(COMPONENT_VERSION).a
			link path=usr/lib/$(MACH64)/libopenblas.so \
			target=libopenblasp-r$(COMPONENT_VERSION).so
			link path=usr/lib/$(MACH64)/libopenblas.so.0 \
			target=libopenblasp-r$(COMPONENT_VERSION).so
			file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).a
			file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).so
			file path=usr/lib/$(MACH64)/libopenblasp-r0.2.13.a
			file path=usr/lib/$(MACH64)/libopenblasp-r0.2.13.so
			link path=usr/lib/libopenblas.a target=libopenblasp-r$(COMPONENT_VERSION).a
			link path=usr/lib/libopenblas.so target=libopenblasp-r$(COMPONENT_VERSION).so
			link path=usr/lib/libopenblas.so.0 target=libopenblasp-r$(COMPONENT_VERSION).so
			file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).a
			file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).so
			file path=usr/lib/libopenblasp-r0.2.13.a
			file path=usr/lib/libopenblasp-r0.2.13.so
			file path=usr/share/openblas-$(COMPONENT_VERSION)/OpenBLASConfig.cmake
			file path=usr/share/openblas-$(COMPONENT_VERSION)/OpenBLASConfigVersion.cmake
			file path=usr/share/openblas-0.2.13/OpenBLASConfig.cmake

			@@ -33,10 +33,13 @@
			target=libopenblasp-r$(COMPONENT_VERSION).a
			link path=usr/lib/$(MACH64)/libopenblas.so \
			target=libopenblasp-r$(COMPONENT_VERSION).so
			link path=usr/lib/$(MACH64)/libopenblas.so.0 \
			target=libopenblasp-r$(COMPONENT_VERSION).so
			file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).a
			file path=usr/lib/$(MACH64)/libopenblasp-r$(COMPONENT_VERSION).so
			link path=usr/lib/libopenblas.a target=libopenblasp-r$(COMPONENT_VERSION).a
			link path=usr/lib/libopenblas.so target=libopenblasp-r$(COMPONENT_VERSION).so
			link path=usr/lib/libopenblas.so.0 target=libopenblasp-r$(COMPONENT_VERSION).so
			file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).a
			file path=usr/lib/libopenblasp-r$(COMPONENT_VERSION).so
			file path=usr/share/openblas-$(COMPONENT_VERSION)/OpenBLASConfig.cmake

			@@ -22,10 +22,10 @@
			ifeq ($(OSNAME), Darwin)
			@$(MAKE) -C exports dyn
			@-ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
			--- ./Makefile.install.orig 2015-02-10 03:36:22.281524541 +0000
			+++ ./Makefile.install 2015-02-10 03:37:24.743697309 +0000
			@@ -79,6 +80,11 @@
			@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
			--- xianyi-OpenBLAS-9a7e0ec/Makefile.install.orig 2016-09-01 05:58:42.000000000 +0200
			+++ xianyi-OpenBLAS-9a7e0ec/Makefile.install 2017-04-24 00:06:20.207814843 +0200
			@@ -80,6 +80,11 @@
			@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
			ln -fs $(LIBSONAME) $(LIBPREFIX).so
			endif
			+ifeq ($(OSNAME), SunOS)
			@@ -34,14 +34,14 @@
			+ ln -fs $(LIBSONAME) $(LIBPREFIX).so
			+endif
			ifeq ($(OSNAME), Darwin)
			@-cp $(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
			@-install_name_tool -id $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)
			@@ -98,7 +104,7 @@
			@echo "SET(OpenBLAS_INCLUDE_DIRS ${OPENBLAS_INCLUDE_DIR})" > $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
			@-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
			@-install_name_tool -id "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
			@@ -101,7 +106,7 @@

			ifndef NO_SHARED
			#ifeq logical or
			-ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD))
			+ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD NetBSD SunOS))
			@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).so)" >> $(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)
			@echo "SET(OpenBLAS_LIBRARIES ${OPENBLAS_LIBRARY_DIR}/$(LIBPREFIX).so)" >> "$(DESTDIR)$(OPENBLAS_CMAKE_DIR)/$(OPENBLAS_CMAKE_CONFIG)"
			endif
			ifeq ($(OSNAME), $(filter $(OSNAME),WINNT CYGWIN_NT))

			@@ -9,14 +9,3 @@
			}

			if (
			--- ./f_check.orig 2015-02-09 21:24:09.692826943 +0000
			+++ ./f_check 2015-02-09 21:24:56.395177199 +0000
			@@ -271,7 +271,7 @@
			}

			if ($flags =~ /^\-Y/) {
			- $linker_L .= "-Wl,". $flags . " ";
			+ #$linker_L .= "-Wl,". $flags . " ";
			}

			if ($flags =~ /^\-rpath\@/) {