Attachment 128944 Details for Bug 172852 – file.diff

[patch] file.diff

file.diff (text/plain), 7.71 KB, created by Eijiro Shibusawa on 2012-10-18 14:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eijiro Shibusawa

Created: 2012-10-18 14:20:00 UTC

Size: 7.71 KB

patch

obsolete

>diff -uNr /usr/ports/math/openblas/./Makefile ./Makefile
>--- /usr/ports/math/openblas/./Makefile	2012-09-10 10:47:43.000000000 +0900
>+++ ./Makefile	2012-10-13 00:34:59.000000000 +0900
>@@ -1,7 +1,12 @@
>+# New ports collection makefile for:    openblas
>+# Date created: 17 Feb 2012
>+# Whom:         Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
>+#
> # $FreeBSD: ports/math/openblas/Makefile,v 1.2 2012/09/10 01:47:43 maho Exp $
>+#
> 
> PORTNAME=	openblas
>-PORTVERSION=	0.2.3
>+PORTVERSION=	0.2.4
> CATEGORIES=	math
> MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
> 		NL:lapack,lapack_tmg
>@@ -20,9 +25,9 @@
> FETCH_ARGS=	-pRr
> GH_USER=	xianyi
> GH_PORTNAME=	OpenBLAS
>-GH_REVISION=	48f075c
>+GH_REVISION=	3a26470
> GH_VERSION=	v${PORTVERSION}
>-LAPACKVER=	3.4.1
>+LAPACKVER=	3.4.2
> LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
> LARGE_FILE=	large.tgz
> TIMING_FILE=	timing.tgz
>@@ -38,7 +43,7 @@
> PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
> 
> MAKE_JOBS_SAFE=	yes
>-WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-e552452
>+WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-ea9a46c
> 
> .if defined(PACKAGE_BUILDING)
> DYNAMIC_ARCH_DEFAULT=	on
>@@ -87,6 +92,10 @@
> BUILDFLAGS+=	QUAD_PRECISION=1
> .endif
> 
>+.if ! ( defined(WITH_AVX) )
>+BUILDFLAGS+=	NO_AVX=1
>+.endif
>+
> post-extract:
> 	cd ${DISTDIR}/${DIST_SUBDIR} ; \
> 	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
>@@ -128,11 +137,6 @@
> 		${WRKSRC}/test/Makefile \
> 		${WRKSRC}/ctest/Makefile
> .endif
>-.if ! ( defined(WITH_AVX) )
>-	${REINPLACE_CMD} -e "s+CPUTYPE_SANDYBRIDGE+CPUTYPE_NEHALEM+g" \
>-	 -e "s+CORE_SANDYBRIDGE+CORE_NEHALEM+g" \
>-		${WRKSRC}/cpuid_x86.c
>-.endif
> 
> do-build:
> 	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \
>diff -uNr /usr/ports/math/openblas/./distinfo ./distinfo
>--- /usr/ports/math/openblas/./distinfo	2012-09-10 10:47:43.000000000 +0900
>+++ ./distinfo	2012-10-13 00:34:59.000000000 +0900
>@@ -1,7 +1,7 @@
>-SHA256 (openblas/xianyi-OpenBLAS-v0.2.3-0-g48f075c.tar.gz) = b9c10675a0c4b6b6adc4b0461749d6ec2d81f1498727935b9e38ec71a565a43e
>-SIZE (openblas/xianyi-OpenBLAS-v0.2.3-0-g48f075c.tar.gz) = 3236430
>-SHA256 (openblas/lapack-3.4.1.tgz) = 93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f
>-SIZE (openblas/lapack-3.4.1.tgz) = 6147915
>+SHA256 (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = e5f7a46da2b2b2fc82a905650df14d0a0562c52c8ef6d83db8fe91899275335a
>+SIZE (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = 3249943
>+SHA256 (openblas/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
>+SIZE (openblas/lapack-3.4.2.tgz) = 6168281
> SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
> SIZE (openblas/large.tgz) = 2595
> SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
>diff -uNr /usr/ports/math/openblas/./files/patch-Makefile ./files/patch-Makefile
>--- /usr/ports/math/openblas/./files/patch-Makefile	2012-09-10 10:47:43.000000000 +0900
>+++ ./files/patch-Makefile	2012-10-13 00:34:59.000000000 +0900
>@@ -1,24 +1,24 @@
>---- Makefile.orig	2012-07-06 23:09:12.000000000 +0900
>-+++ Makefile	2012-08-28 23:16:44.000000000 +0900
>-@@ -203,7 +203,7 @@
>+--- Makefile.orig	2012-10-09 21:08:28.000000000 +0900
>++++ Makefile	2012-10-12 21:37:18.000000000 +0900
>+@@ -201,7 +201,7 @@
>  netlib : 
>  
>  else
>--netlib : lapack-3.4.1 patch.for_lapack-3.4.1 $(NETLIB_LAPACK_DIR)/make.inc
>+-netlib : lapack-3.4.2 patch.for_lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
> +netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
>  ifndef NOFORTRAN
>  	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
>  endif
>-@@ -212,7 +212,7 @@
>+@@ -210,7 +210,7 @@
>  endif
>  endif
>  
>--prof_lapack : lapack-3.4.1 $(NETLIB_LAPACK_DIR)/make.inc
>+-prof_lapack : lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
> +prof_lapack : lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
>  	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
>  
>  $(NETLIB_LAPACK_DIR)/make.inc :
>-@@ -225,7 +225,7 @@
>+@@ -223,7 +223,7 @@
>  	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
>  	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
>  	-@echo "CFLAGS      = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
>@@ -27,21 +27,21 @@
>  	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
>  	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
>  	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
>-@@ -237,24 +237,19 @@
>+@@ -235,24 +235,19 @@
>  	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
>  endif
>  
>--lapack-3.4.1 : lapack-3.4.1.tgz
>+-lapack-3.4.2 : lapack-3.4.2.tgz
> +lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz
>  ifndef NOFORTRAN
>  ifndef NO_LAPACK
>--	@if test `$(MD5SUM) lapack-3.4.1.tgz | $(AWK) '{print $$1}'` = 44c3869c38c8335c2b9c2a8bb276eb55; then \
>+-	@if test `$(MD5SUM) lapack-3.4.2.tgz | $(AWK) '{print $$1}'` = 61bf1a8a4469d4bdb7604f5897179478; then \
> -		echo $(TAR) zxf $< ;\
>--		$(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.1) ;\
>+-		$(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.2) ;\
> -		rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\
> -	else \
> -		rm -rf $(NETLIB_LAPACK_DIR) ;\
>--		echo "	Cannot download lapack-3.4.1.tgz or the MD5 check sum is wrong (Please use orignal)."; \
>+-		echo "	Cannot download lapack-3.4.2.tgz or the MD5 check sum is wrong (Please use orignal)."; \
> -		exit 1; \
> -	fi
> +	echo $(TAR) zxf $< ;\
>@@ -51,24 +51,24 @@
>  endif
>  endif
>  
>--LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.1.tgz
>+-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.2.tgz
> +LAPACK_URL=http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz
>  
>--lapack-3.4.1.tgz :
>+-lapack-3.4.2.tgz :
> +lapack-%%LAPACKVER%%.tgz :
>  ifndef NOFORTRAN
>  #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
>  ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
>-@@ -278,7 +273,7 @@
>+@@ -276,7 +271,7 @@
>  	-wget http://www.netlib.org/lapack/timing/timing.tgz
>  endif
>  
>--lapack-timing : lapack-3.4.1 large.tgz timing.tgz
>+-lapack-timing : lapack-3.4.2 large.tgz timing.tgz
> +lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz
>  ifndef NOFORTRAN
>  	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
>  	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
>-@@ -316,4 +311,4 @@
>+@@ -314,4 +309,4 @@
>  	rm -rf $(NETLIB_LAPACK_DIR) ;\
>  	fi
>  	@rm -f *.grd Makefile.conf_last config_last.h
>diff -uNr /usr/ports/math/openblas/./files/patch-Makefile.system ./files/patch-Makefile.system
>--- /usr/ports/math/openblas/./files/patch-Makefile.system	2012-09-10 10:47:43.000000000 +0900
>+++ ./files/patch-Makefile.system	2012-10-13 00:34:59.000000000 +0900
>@@ -1,15 +1,15 @@
>---- Makefile.system.orig	2012-08-20 17:52:35.000000000 +0900
>-+++ Makefile.system	2012-08-29 22:42:27.000000000 +0900
>+--- Makefile.system.orig	2012-10-09 21:08:28.000000000 +0900
>++++ Makefile.system	2012-10-12 21:33:31.000000000 +0900
> @@ -10,7 +10,7 @@
>  endif
>  
>  ifndef NETLIB_LAPACK_DIR
>--NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-3.4.1
>+-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-3.4.2
> +NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-%%LAPACKVER%%
>  endif
>  
>  # Default C compiler
>-@@ -117,6 +117,9 @@
>+@@ -125,6 +125,9 @@
>  endif
>  
>  ifeq ($(OSNAME), FreeBSD)
>@@ -19,7 +19,7 @@
>  MD5SUM = md5 -r
>  endif
>  
>-@@ -714,15 +717,6 @@
>+@@ -753,15 +756,6 @@
>  LIBSUFFIX = a
>  endif
>  
>@@ -35,7 +35,7 @@
>  ifndef SMP
>  LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
>  LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
>-@@ -730,7 +724,6 @@
>+@@ -769,7 +763,6 @@
>  LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
>  LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
>  endif
>@@ -43,7 +43,7 @@
>  
>  
>  LIBDLLNAME   = $(LIBPREFIX).dll
>-@@ -744,7 +737,7 @@
>+@@ -783,7 +776,7 @@
>  LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
>  
>  export OSNAME

Actions: View | Diff

Attachments on bug 172852: 128944