[liblinear] 06/09: Update patch Properly-build-shared-and-static-libraries-programs.patch

[Christian Kastner]

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

ckk pushed a commit to branch master
in repository liblinear.

commit 9b81b27cd2589f8c5a11893f6ba76b5294db5738
Author: Christian Kastner <ckk at kvr.at>
Date:   Sun Nov 1 17:12:43 2015 +0100

    Update patch Properly-build-shared-and-static-libraries-programs.patch
    
    Uses the new versioning scheme. See debian/rules.
---
 ...uild-shared-and-static-libraries-programs.patch | 56 ++++++++++------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/debian/patches/Properly-build-shared-and-static-libraries-programs.patch b/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
index c49dc7e..98b6b08 100644
--- a/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
+++ b/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
@@ -7,16 +7,16 @@ and link upstream's programs to the shared libraries. Furthermore, provide
 and install target.
 
 Forwarded: not-needed
-Last-Update: 2015-09-05
+Last-Update: 2015-11-01
 ---
- Makefile | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
- 1 file changed, 43 insertions(+), 16 deletions(-)
+ Makefile | 65 +++++++++++++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 44 insertions(+), 21 deletions(-)
 
-Index: liblinear-2.01.orig/Makefile
-===================================================================
---- liblinear-2.01.orig.orig/Makefile
-+++ liblinear-2.01.orig/Makefile
-@@ -1,32 +1,54 @@
+diff --git a/Makefile b/Makefile
+index 99fdece..e923452 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,32 +1,55 @@
  CXX ?= g++
  CC ?= gcc
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -28,7 +28,10 @@ Index: liblinear-2.01.orig/Makefile
 -OS = $(shell uname)
  
 -all: train predict
--
++LIB_CFLAGS += $(CFLAGS) -fPIC
++LIB_LDFLAGS += $(LDFLAGS)
++LIB_LIBS += $(LIBS) -lblas
+ 
 -lib: linear.o tron.o
 -	if [ "$(OS)" = "Darwin" ]; then \
 -		SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,liblinear.so.$(SHVER)"; \
@@ -36,35 +39,28 @@ Index: liblinear-2.01.orig/Makefile
 -		SHARED_LIB_FLAG="-shared -Wl,-soname,liblinear.so.$(SHVER)"; \
 -	fi; \
 -	$(CXX) $${SHARED_LIB_FLAG} linear.o tron.o -o liblinear.so.$(SHVER)
--
++PROG_CFLAGS += $(CFLAGS)
++PROG_LDFLAGS += $(LDFLAGS)
++PROG_LIBS += $(LIBS) -llinear
+ 
 -train: tron.o linear.o train.c
 -	$(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS)
--
++DMAJOR ?= 0
++DMINOR ?= 0
++LIBFILE = liblinear.so.$(SHVER).$(DMAJOR).$(DMIJOR)
+ 
 -predict: tron.o linear.o predict.c
 -	$(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS)
--
--tron.o: tron.cpp tron.h
--	$(CXX) $(CFLAGS) -c -o tron.o tron.cpp
--
--linear.o: linear.cpp linear.h
--	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
-+LIB_CFLAGS += $(CFLAGS) -fPIC
-+LIB_LDFLAGS += $(LDFLAGS)
-+LIB_LIBS += $(LIBS) -lblas
-+
-+PROG_CFLAGS += $(CFLAGS)
-+PROG_LDFLAGS += $(LDFLAGS)
-+PROG_LIBS += $(LIBS) -llinear
-+
-+UPVER ?= 0.0
-+LIBFILE = liblinear.so.$(SHVER).$(UPVER)
-+
 +bindir ?= /usr/bin/
 +libdir ?= /usr/lib/
 +bindest = $(DESTDIR)$(bindir)
 +libdest = $(DESTDIR)$(libdir)
-+
-+
+ 
+-tron.o: tron.cpp tron.h
+-	$(CXX) $(CFLAGS) -c -o tron.o tron.cpp
+ 
+-linear.o: linear.cpp linear.h
+-	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
 +all: liblinear-train liblinear-predict liblinear.a
 +
 +liblinear-train: train.c $(LIBFILE)

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