Archives
Archives
| From: | "Justin Lecher (jlec)" <jlec@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sci-libs/libsvm/files: 2.90-ldflags.patch 2.90-fpic.patch |
| Date: | Wed, 10 Feb 2010 21:21:09 |
| Message-Id: | E1NfJzf-0000ty-34@stork.gentoo.org |
| 1 | jlec 10/02/10 21:21:07 |
| 2 | |
| 3 | Added: 2.90-ldflags.patch 2.90-fpic.patch |
| 4 | Log: |
| 5 | Version bump per bug 304329 |
| 6 | (Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 sci-libs/libsvm/files/2.90-ldflags.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/libsvm/files/2.90-ldflags.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/libsvm/files/2.90-ldflags.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: 2.90-ldflags.patch |
| 15 | =================================================================== |
| 16 | diff --git a/Makefile b/Makefile |
| 17 | index 3781264..ce53201 100644 |
| 18 | --- a/Makefile |
| 19 | +++ b/Makefile |
| 20 | @@ -8,11 +8,11 @@ lib: svm.o |
| 21 | $(CXX) -shared svm.o -o libsvm.so.$(SHVER) |
| 22 | |
| 23 | svm-predict: svm-predict.c svm.o |
| 24 | - $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm |
| 25 | + $(CXX) $(CFLAGS) $(LDFLAGS) svm-predict.c svm.o -o svm-predict -lm |
| 26 | svm-train: svm-train.c svm.o |
| 27 | - $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm |
| 28 | + $(CXX) $(CFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm |
| 29 | svm-scale: svm-scale.c |
| 30 | - $(CXX) $(CFLAGS) svm-scale.c -o svm-scale |
| 31 | + $(CXX) $(CFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale |
| 32 | svm.o: svm.cpp svm.h |
| 33 | $(CXX) $(CFLAGS) -c svm.cpp |
| 34 | clean: |
| 35 | |
| 36 | |
| 37 | |
| 38 | 1.1 sci-libs/libsvm/files/2.90-fpic.patch |
| 39 | |
| 40 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/libsvm/files/2.90-fpic.patch?rev=1.1&view=markup |
| 41 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/libsvm/files/2.90-fpic.patch?rev=1.1&content-type=text/plain |
| 42 | |
| 43 | Index: 2.90-fpic.patch |
| 44 | =================================================================== |
| 45 | diff --git a/python/Makefile b/python/Makefile |
| 46 | index 32268e7..dbc128f 100644 |
| 47 | --- a/python/Makefile |
| 48 | +++ b/python/Makefile |
| 49 | @@ -11,8 +11,8 @@ LDFLAGS = -shared |
| 50 | |
| 51 | all: svmc.so |
| 52 | |
| 53 | -svmc.so: svmc_wrap.o ../svm.o |
| 54 | - $(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o ../svm.o |
| 55 | +svmc.so: svmc_wrap.o svm.o |
| 56 | + $(CXX) $(LDFLAGS) -o svmc.so svmc_wrap.o svm.o |
| 57 | |
| 58 | svmc_wrap.o: svmc_wrap.c ../svm.h |
| 59 | $(CXX) $(CFLAGS) -fPIC -c svmc_wrap.c |
| 60 | @@ -20,8 +20,8 @@ svmc_wrap.o: svmc_wrap.c ../svm.h |
| 61 | svmc_wrap.c: svmc.i |
| 62 | $(SWIG) -python -noproxy svmc.i |
| 63 | |
| 64 | -../svm.o: ../svm.cpp ../svm.h |
| 65 | - cd ..; $(CXX) $(CFLAGS) -fPIC -c svm.cpp |
| 66 | +svm.o: ../svm.cpp ../svm.h |
| 67 | + $(CXX) $(CFLAGS) -fPIC -c ../svm.cpp -o svm.o |
| 68 | |
| 69 | clean: |
| 70 | rm -f *~ *.o *.so *.pyc *.pyo |