| 1 |
bicatali 12/11/29 19:04:49 |
| 2 |
|
| 3 |
Added: 3.14-makefile.patch |
| 4 |
Log: |
| 5 |
Version bump, update patch |
| 6 |
|
| 7 |
(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/libsvm/files/3.14-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libsvm/files/3.14-makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libsvm/files/3.14-makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 3.14-makefile.patch |
| 16 |
=================================================================== |
| 17 |
* respect CFLAGS and CXXFLAGS from user |
| 18 |
* compile with CC for C and CXX for C++ files |
| 19 |
* propagate and respect user's LDFLAGS |
| 20 |
* PIC only used for the library |
| 21 |
* link the shared version library |
| 22 |
nov 2012 - bicatali@g.o |
| 23 |
|
| 24 |
--- Makefile.orig 2012-11-29 10:39:07.149421728 -0800 |
| 25 |
+++ Makefile 2012-11-29 10:57:19.727766521 -0800 |
| 26 |
@@ -1,9 +1,12 @@ |
| 27 |
CXX ?= g++ |
| 28 |
-CFLAGS = -Wall -Wconversion -O3 -fPIC |
| 29 |
+CC ?= gcc |
| 30 |
+CFLAGS ?= -Wall -Wconversion -O3 |
| 31 |
+CXXFLAGS ?= $(CFLAGS) |
| 32 |
SHVER = 2 |
| 33 |
OS = $(shell uname) |
| 34 |
+PICFLAGS ?= -fPIC |
| 35 |
|
| 36 |
-all: svm-train svm-predict svm-scale |
| 37 |
+all: svm-train svm-predict svm-scale lib |
| 38 |
|
| 39 |
lib: svm.o |
| 40 |
if [ "$(OS)" = "Darwin" ]; then \ |
| 41 |
@@ -11,15 +14,20 @@ |
| 42 |
else \ |
| 43 |
SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \ |
| 44 |
fi; \ |
| 45 |
- $(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) |
| 46 |
+ $(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) ; \ |
| 47 |
+ ln -s libsvm.so.$(SHVER) libsvm.so |
| 48 |
|
| 49 |
svm-predict: svm-predict.c svm.o |
| 50 |
- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm |
| 51 |
+ $(CC) $(CFLAGS) -c $@.c -o $@.o |
| 52 |
+ $(CXX) $(LDFLAGS) $@.o svm.o -lm -o $@ |
| 53 |
svm-train: svm-train.c svm.o |
| 54 |
- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm |
| 55 |
+ $(CC) $(CFLAGS) -c $@.c -o $@.o |
| 56 |
+ $(CXX) $(LDFLAGS) $@.o svm.o -lm -o $@ |
| 57 |
svm-scale: svm-scale.c |
| 58 |
- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale |
| 59 |
+ $(CC) $(CFLAGS) -c $@.c -o $@.o |
| 60 |
+ $(CXX) $(LDFLAGS) $@.o svm.o -o $@ |
| 61 |
+ |
| 62 |
svm.o: svm.cpp svm.h |
| 63 |
- $(CXX) $(CFLAGS) -c svm.cpp |
| 64 |
+ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp |
| 65 |
clean: |
| 66 |
- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) |
| 67 |
+ rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so |
Archives