SOURCES: fann-python.patch - updated to 2.0.0

megabajt megabajt at pld-linux.org
Sun Jan 8 00:33:44 CET 2006


Author: megabajt                     Date: Sat Jan  7 23:33:44 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 2.0.0

---- Files affected:
SOURCES:
   fann-python.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/fann-python.patch
diff -u SOURCES/fann-python.patch:1.5 SOURCES/fann-python.patch:1.6
--- SOURCES/fann-python.patch:1.5	Sun Nov 13 21:00:56 2005
+++ SOURCES/fann-python.patch	Sun Jan  8 00:33:39 2006
@@ -1,28 +1,18 @@
-diff -urN fann-1.2.0/python/makefile.gnu fann-1.2.0.new/python/makefile.gnu
---- fann-1.2.0/python/makefile.gnu	2004-10-09 13:56:57.000000000 +0200
-+++ fann-1.2.0.new/python/makefile.gnu	2005-11-13 20:10:45.000000000 +0100
-@@ -1,18 +1,18 @@
- # This makefile was written to compile a distribution of pyfann for
- # GNU platforms (cygwin included.)
- 
--TARGETS = _libfann.dll
-+TARGETS = _libfann.so
- 
--PYTHON=python2.3
--LIBS=-L. -L/usr/local/lib -L/usr/bin -l$(PYTHON) ../src/fann*.o
-+PYTHON=python2.4
-+LIBS=-L. -L/usr/lib -L/usr/bin -l$(PYTHON) ../src/fann*.o
+diff -urN fann-2.0.0/python/pyfann/Makefile fann-2.0.0.new/python/pyfann/Makefile
+--- fann-2.0.0/python/pyfann/Makefile	2005-12-03 02:22:43.000000000 +0100
++++ fann-2.0.0.new/python/pyfann/Makefile	2006-01-07 20:18:27.000000000 +0100
+@@ -5,12 +5,12 @@
+ 
+ PYTHON=python2.4
+ FANN_DIR="../.."
+-LIBS=-L. -L/usr/local/lib -L/usr/bin -l$(PYTHON) $(FANN_DIR)/src/fann*.o
++LIBS=-L. -L/usr/lib -L/usr/bin -l$(PYTHON) $(FANN_DIR)/src/fann*.o
  
  all: $(TARGETS)
- 
--_%.dll: %_wrap.o fann_helper.o
+ 	
+ _%.so: pyfann_wrap.o fann_helper.o
 -	gcc $(LIBS) -shared -dll $^ -o $@
-+_%.so: %_wrap.o fann_helper.o
 +	gcc $(LIBS) -shared $^ -o $@
  
  %.o: %.c 
--	gcc -c $< -I/usr/include/$(PYTHON)/
-+	gcc -c $< -I/usr/include/$(PYTHON)/ -I../src/include/
- 
- %_wrap.c: %.i 
- 	swig -python $<
+ 	gcc -c $< -I/usr/include/$(PYTHON)/ -I$(FANN_DIR)/src/include/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/fann-python.patch?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list