Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Apr 2016 20:46:22 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412529 - in head/math/openblas: . files
Message-ID:  <201604042046.u34KkMgJ008145@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Apr  4 20:46:22 2016
New Revision: 412529
URL: https://svnweb.freebsd.org/changeset/ports/412529

Log:
  Create a proper library with a SONAME
  
  PR:		208472
  Submitted by:	phd_kimberlite@yahoo.co.jp (maintainer)
  MFH:		2016Q2

Modified:
  head/math/openblas/Makefile
  head/math/openblas/files/patch-Makefile.system
  head/math/openblas/files/patch-exports+Makefile

Modified: head/math/openblas/Makefile
==============================================================================
--- head/math/openblas/Makefile	Mon Apr  4 19:14:37 2016	(r412528)
+++ head/math/openblas/Makefile	Mon Apr  4 20:46:22 2016	(r412529)
@@ -4,6 +4,7 @@
 PORTNAME=	openblas
 PORTVERSION=	0.2.15
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	GH NL/lapack/timing/:lapack_tmg

Modified: head/math/openblas/files/patch-Makefile.system
==============================================================================
--- head/math/openblas/files/patch-Makefile.system	Mon Apr  4 19:14:37 2016	(r412528)
+++ head/math/openblas/files/patch-Makefile.system	Mon Apr  4 20:46:22 2016	(r412529)
@@ -8,7 +8,25 @@
  MD5SUM = md5 -r
  endif
  
-@@ -1020,15 +1021,6 @@ ifndef LIBSUFFIX
+@@ -889,9 +890,17 @@ SYMBOLSUFFIX =
+ endif
+ 
+ ifndef LIBNAMESUFFIX
++ifndef SMP
+ LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
+ else
++LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)
++endif
++else
++ifndef SMP
+ LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
++else
++LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
++endif
+ endif
+ 
+ KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
+@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX
  LIBSUFFIX = a
  endif
  
@@ -21,18 +39,19 @@
 -LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
 -endif
 -else
- ifndef SMP
+-ifndef SMP
  LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
  LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
-@@ -1036,7 +1028,6 @@ else
- LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
- LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
- endif
+-else
+-LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
+-LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
 -endif
- 
+-endif
+-
  
  LIBDLLNAME   = $(LIBPREFIX).dll
-@@ -1067,7 +1058,7 @@ LIB_COMPONENTS = CBLAS
+ LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
+@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS
  endif
  
  export OSNAME

Modified: head/math/openblas/files/patch-exports+Makefile
==============================================================================
--- head/math/openblas/files/patch-exports+Makefile	Mon Apr  4 19:14:37 2016	(r412528)
+++ head/math/openblas/files/patch-exports+Makefile	Mon Apr  4 20:46:22 2016	(r412529)
@@ -8,3 +8,11 @@
  so : ../$(LIBSONAME)
  
  ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
+@@ -151,6 +152,7 @@ else
+ endif
+ 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
+ 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
++	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
+ 	$(FEXTRALIB) $(EXTRALIB)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
+ 	rm -f linktest



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604042046.u34KkMgJ008145>