[openblas] 03/04: kfreebsd.patch: install shared library and link it against libm.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository openblas.

commit 12d00f6f546f5a37791fa10cc07bfba4ad7b4042
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Aug 5 20:51:18 2014 +0200

    kfreebsd.patch: install shared library and link it against libm.
    
    This patch also incorporates the former content of kfreebsd-soname.patch.
    
    Git-Dch: Full
---
 debian/patches/kfreebsd-soname.patch | 27 ----------------
 debian/patches/kfreebsd.patch        | 61 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  2 +-
 3 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/debian/patches/kfreebsd-soname.patch b/debian/patches/kfreebsd-soname.patch
deleted file mode 100644
index 03bc8ba..0000000
--- a/debian/patches/kfreebsd-soname.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Ensure that the shared library under kFreeBSD has a SONAME
- Simply use the same code for shared object creation than under Linux.
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: not-needed
-Last-Update: 2014-02-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/exports/Makefile
-+++ b/exports/Makefile
-@@ -99,7 +99,7 @@ $(LIBDYNNAME) : ../$(LIBNAME) osx.def
- dllinit.$(SUFFIX) : dllinit.c
- 	$(CC) $(CFLAGS) -c -o $(@F) -s $<
- 
--ifeq ($(OSNAME), Linux)
-+ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD))
- 
- so : ../$(LIBSONAME)
- 
-@@ -121,7 +121,7 @@ endif
- endif
- 
- #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
--ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
-+ifeq ($(OSNAME), $(filter $(OSNAME),NetBSD))
- 
- so : ../$(LIBSONAME)
- 
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
new file mode 100644
index 0000000..82a1617
--- /dev/null
+++ b/debian/patches/kfreebsd.patch
@@ -0,0 +1,61 @@
+Description: Various fixes for kFreeBSD shared library
+ Under kFreeBSD, give a SONAME to the shared library and install it. Also link
+ it against libm.
+ Simply use the same code as Linux for all these operations.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-08-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/exports/Makefile
++++ b/exports/Makefile
+@@ -99,7 +99,7 @@ $(LIBDYNNAME) : ../$(LIBNAME) osx.def
+ dllinit.$(SUFFIX) : dllinit.c
+ 	$(CC) $(CFLAGS) -c -o $(@F) -s $<
+ 
+-ifeq ($(OSNAME), Linux)
++ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD))
+ 
+ so : ../$(LIBSONAME)
+ 
+@@ -121,7 +121,7 @@ endif
+ endif
+ 
+ #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
+-ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
++ifeq ($(OSNAME), $(filter $(OSNAME),NetBSD))
+ 
+ so : ../$(LIBSONAME)
+ 
+--- a/Makefile.install
++++ b/Makefile.install
+@@ -60,17 +60,12 @@ endif
+ #for install shared library
+ ifndef NO_SHARED
+ 	@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+-ifeq ($(OSNAME), Linux)
++ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD))
+ 	@install -pm755 $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+ 	@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
+ 	ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
+ 	ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
+ endif
+-ifeq ($(OSNAME), FreeBSD)
+-	@cp $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+-	@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
+-	ln -fs $(LIBSONAME) $(LIBPREFIX).so
+-endif
+ ifeq ($(OSNAME), NetBSD)
+ 	@cp $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+ 	@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -204,7 +204,7 @@ ifeq ($(OSNAME), NetBSD)
+ MD5SUM = md5 -n
+ endif
+ 
+-ifeq ($(OSNAME), Linux)
++ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD))
+ EXTRALIB	+= -lm
+ NO_EXPRECISION = 1
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index 73806f0..b38443c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 arm-gcc-flags.patch
-kfreebsd-soname.patch
+kfreebsd.patch
 test-custom-package.patch
 remove-openmp-warning.patch
 no-embedded-lapack.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openblas.git