liblinear: new package
PATCH 1/1 liblinear: new package
From: Romain Naour <[email protected]>
Signed-off-by Romain Naour <[email protected]>
Cc "Yann E. MORIN" <[email protected]>
[yann.morin.1998 at free.fr: add ability to build a static lib; handle static-only and static+shared cases]
Signed-off-by Yann E. MORIN <[email protected]>
--- package/Config.in | 1 + .../0001-blas-don-t-overwrite-ar-options.patch | 35 +++++++++++++++++ package/liblinear/0002-build-static-lib.patch | 18 +++++++++ package/liblinear/Config.in | 7 ++++ package/liblinear/liblinear.mk | 44 ++++++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 package/liblinear/0001-blas-don-t-overwrite-ar-options.patch create mode 100644 package/liblinear/0002-build-static-lib.patch create mode 100644 package/liblinear/Config.in create mode 100644 package/liblinear/liblinear.mk
package/Config.in +1 -0
@@ -902,6 +902,7 @@ menu "Other" source "package/libgc/Config.in" source "package/libglib2/Config.in" source "package/libical/Config.in" + source "package/liblinear/Config.in" source "package/libnspr/Config.in" source "package/libpfm4/Config.in" source "package/libplist/Config.in"
package/liblinear/0001-blas-don-t-overwrite-ar-options.patch new file +35 -0
@@ -0,0 +1,35 @@ +From cae4c3b80fee0f3637d70f6d33946888c8105637 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Sat, 13 Dec 2014 17:16:58 +0100 +Subject: [PATCH 1/1] blas: don't overwrite ar options + +ar's rcv options get lost when AR is passed on +the command line. + +Signed-off-by: Romain Naour <[email protected]> +--- + blas/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/blas/Makefile b/blas/Makefile +index 895fd24..78cec9a 100644 +--- a/blas/Makefile ++++ b/blas/Makefile +@@ -1,4 +1,4 @@ +-AR = ar rcv ++AR = ar + RANLIB = ranlib + + HEADERS = blas.h blasp.h +@@ -8,7 +8,7 @@ CFLAGS = $(OPTFLAGS) + FFLAGS = $(OPTFLAGS) + + blas: $(FILES) $(HEADERS) +- $(AR) blas.a $(FILES) ++ $(AR) rcv blas.a $(FILES) + $(RANLIB) blas.a + + clean: +-- +1.9.3 +
package/liblinear/0002-build-static-lib.patch new file +18 -0
@@ -0,0 +1,18 @@ +Makefile: add a rule to build a static library + +Signed-off-by: "Yann E. MORIN" <[email protected]> +diff -durN liblinear-1.96.orig/Makefile liblinear-1.96/Makefile +--- liblinear-1.96.orig/Makefile 2014-11-15 07:50:23.000000000 +0100 ++++ liblinear-1.96/Makefile 2014-12-14 00:23:00.135893956 +0100 +@@ -16,6 +16,11 @@ + fi; \ + $(CXX) $${SHARED_LIB_FLAG} linear.o tron.o blas/blas.a -o liblinear.so.$(SHVER) + ++# Keeping blas/blas.a as a pre-requisite, to ensure all .o files are built ++static-lib: linear.o tron.o blas/blas.a ++ $(AR) rcv liblinear.a linear.o tron.o blas/*.o ++ $(RANLIB) liblinear.a ++ + train: tron.o linear.o train.c blas/blas.a + $(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS) +
package/liblinear/Config.in new file +7 -0
@@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBLINEAR + bool "liblinear" + help + liblinear is a linear classifier for data with millions of instances and + features. + + http://www.csie.ntu.edu.tw/~cjlin/liblinear/
package/liblinear/liblinear.mk new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
1.9.1
Thomas Petazzoni
AppliedPATCH 1/1 liblinear: new package
Dear Yann E. MORIN,
Quoted 7 lines · Yann E. MORIN
From: Romain Naour <[email protected]>
Signed-off-by Romain Naour <[email protected]>Cc "Yann E. MORIN" <[email protected]>[yann.morin.1998 at free.fr: add ability to build a static lib; handle static-only and static+shared cases]
Signed-off-by Yann E. MORIN <[email protected]>
Applied, thanks. Please submit the patches upstream if possible.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com