diff options
author | adam <adam@pkgsrc.org> | 2015-11-20 14:47:20 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2015-11-20 14:47:20 +0000 |
commit | f1e4b149929fd02171c926dfab62c11beb13938b (patch) | |
tree | c5cc3c3ca031f0f44dcdcd45e34429693579fa07 /math | |
parent | 47a3ffc5d76e32f33885c3e89f0b561181c46655 (diff) | |
download | pkgsrc-f1e4b149929fd02171c926dfab62c11beb13938b.tar.gz |
Changes 2.1:
Unknown
Diffstat (limited to 'math')
-rw-r--r-- | math/liblinear/Makefile | 10 | ||||
-rw-r--r-- | math/liblinear/PLIST | 5 | ||||
-rw-r--r-- | math/liblinear/buildlink3.mk | 12 | ||||
-rw-r--r-- | math/liblinear/distinfo | 11 | ||||
-rw-r--r-- | math/liblinear/patches/patch-Makefile | 50 |
5 files changed, 75 insertions, 13 deletions
diff --git a/math/liblinear/Makefile b/math/liblinear/Makefile index a5dfcdb890b..e74044a2f4b 100644 --- a/math/liblinear/Makefile +++ b/math/liblinear/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2014/10/19 09:57:21 cheusov Exp $ +# $NetBSD: Makefile,v 1.2 2015/11/20 14:47:20 adam Exp $ -DISTNAME= liblinear-1.94 +DISTNAME= liblinear-2.1 CATEGORIES= math MASTER_SITES= http://www.csie.ntu.edu.tw/~cjlin/liblinear/ @@ -9,7 +9,8 @@ HOMEPAGE= http://www.csie.ntu.edu.tw/~cjlin/liblinear/ COMMENT= Library for large linear classification LICENSE= modified-bsd -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes BUILD_TARGET= all lib AUTO_MKDIRS= yes @@ -17,8 +18,7 @@ AUTO_MKDIRS= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/predict ${DESTDIR}${PREFIX}/bin/liblinear-predict ${INSTALL_PROGRAM} ${WRKSRC}/train ${DESTDIR}${PREFIX}/bin/liblinear-train - ${INSTALL_LIB} ${WRKSRC}/liblinear.so.1 ${DESTDIR}${PREFIX}/lib - ${LN} -s liblinear.so.1 ${DESTDIR}${PREFIX}/lib/liblinear.so + ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/liblinear.la ${DESTDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/linear.h ${DESTDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/README \ ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} diff --git a/math/liblinear/PLIST b/math/liblinear/PLIST index c0dc24e1ca6..20539357f90 100644 --- a/math/liblinear/PLIST +++ b/math/liblinear/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2014/10/19 09:57:21 cheusov Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/11/20 14:47:20 adam Exp $ bin/liblinear-predict bin/liblinear-train include/linear.h -lib/liblinear.so -lib/liblinear.so.1 +lib/liblinear.la share/doc/liblinear/README share/examples/liblinear/heart_scale diff --git a/math/liblinear/buildlink3.mk b/math/liblinear/buildlink3.mk new file mode 100644 index 00000000000..7b4a8fdd9ae --- /dev/null +++ b/math/liblinear/buildlink3.mk @@ -0,0 +1,12 @@ +# $NetBSD: buildlink3.mk,v 1.1 2015/11/20 14:47:20 adam Exp $ + +BUILDLINK_TREE+= liblinear + +.if !defined(LIBLINEAR_BUILDLINK3_MK) +LIBLINEAR_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.liblinear+= liblinear>=2.1 +BUILDLINK_PKGSRCDIR.liblinear?= ../../math/liblinear +.endif # LIBLINEAR_BUILDLINK3_MK + +BUILDLINK_TREE+= -liblinear diff --git a/math/liblinear/distinfo b/math/liblinear/distinfo index 43dfb5e1d01..2cef0ca7870 100644 --- a/math/liblinear/distinfo +++ b/math/liblinear/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 23:33:36 agc Exp $ +$NetBSD: distinfo,v 1.3 2015/11/20 14:47:20 adam Exp $ -SHA1 (liblinear-1.94.tar.gz) = 19678355e6c933b7ec133e07fef77796e50df0d5 -RMD160 (liblinear-1.94.tar.gz) = 56cc112d3e4397804d67eea4e266b363c822307b -SHA512 (liblinear-1.94.tar.gz) = 97a90c8c11a30e31869adefd834816a20a587cdefc0c2eb5d23f405d2b45029e194a5f60a9e8c392e46cfb9786746b3682566f75b950f45b1d9286b272c2e02f -Size (liblinear-1.94.tar.gz) = 335400 bytes +SHA1 (liblinear-2.1.tar.gz) = 071e1c86c400bfa3605b1a5e45dace250c6a4574 +RMD160 (liblinear-2.1.tar.gz) = bb325a017a0044039c3ad2a058d56af7dc063ade +SHA512 (liblinear-2.1.tar.gz) = e70d96c8119682258066433e0e79bcc55e20a8f6cb229da555b225a4677e19b17961b32e3502d8f85e5638dff56314aa83e0fdcda059df6d0cb056bb2a2b0495 +Size (liblinear-2.1.tar.gz) = 382326 bytes +SHA1 (patch-Makefile) = 023e282c4f89293256c7ef9b3129df4c3a1e21fa diff --git a/math/liblinear/patches/patch-Makefile b/math/liblinear/patches/patch-Makefile new file mode 100644 index 00000000000..b8d17738bf8 --- /dev/null +++ b/math/liblinear/patches/patch-Makefile @@ -0,0 +1,50 @@ +$NetBSD: patch-Makefile,v 1.1 2015/11/20 14:47:20 adam Exp $ + +Use LIBTOOL. + +--- Makefile.orig 2015-11-20 13:39:37.000000000 +0000 ++++ Makefile +@@ -1,32 +1,25 @@ + CXX ?= g++ + CC ?= gcc +-CFLAGS = -Wall -Wconversion -O3 -fPIC + LIBS = blas/blas.a + SHVER = 3 +-OS = $(shell uname) + #LIBS = -lblas + + all: train predict + +-lib: linear.o tron.o blas/blas.a +- if [ "$(OS)" = "Darwin" ]; then \ +- SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,liblinear.so.$(SHVER)"; \ +- else \ +- SHARED_LIB_FLAG="-shared -Wl,-soname,liblinear.so.$(SHVER)"; \ +- fi; \ +- $(CXX) $${SHARED_LIB_FLAG} linear.o tron.o blas/blas.a -o liblinear.so.$(SHVER) +- +-train: tron.o linear.o train.c blas/blas.a +- $(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS) ++lib: linear.lo tron.lo blas/blas.a ++ ${LIBTOOL} --mode=link $(CXX) -o liblinear.la $> -rpath ${PREFIX}/lib -version-info ${SHVER}:0 + +-predict: tron.o linear.o predict.c blas/blas.a +- $(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS) ++train: tron.lo linear.lo train.c blas/blas.a ++ ${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o train $> + +-tron.o: tron.cpp tron.h +- $(CXX) $(CFLAGS) -c -o tron.o tron.cpp ++predict: tron.lo linear.lo predict.c blas/blas.a ++ ${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o predict $> + +-linear.o: linear.cpp linear.h +- $(CXX) $(CFLAGS) -c -o linear.o linear.cpp ++tron.lo: tron.cpp tron.h ++ ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -c -o tron.o tron.cpp ++ ++linear.lo: linear.cpp linear.h ++ ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -c -o linear.o linear.cpp + + blas/blas.a: blas/*.c blas/*.h + make -C blas OPTFLAGS='$(CFLAGS)' CC='$(CC)'; |