Fix svm-toy-gt build error

epel8
Ding-Yi Chen 17 years ago
parent 95d9efdf40
commit fe7c948b65

@ -240,8 +240,8 @@ diff -up ./tools/grid.py.orig ./tools/grid.py
assert os.path.exists(dataset_pathname),"dataset not found" assert os.path.exists(dataset_pathname),"dataset not found"
diff -up ./Makefile.orig ./Makefile diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig 2007-11-06 23:32:49.000000000 +1000 --- ./Makefile.orig 2007-11-06 23:32:49.000000000 +1000
+++ ./Makefile 2008-02-04 17:22:47.000000000 +1000 +++ ./Makefile 2008-02-05 11:00:21.000000000 +1000
@@ -1,8 +1,46 @@ @@ -1,8 +1,41 @@
CXX? = g++ CXX? = g++
CFLAGS = -Wall -O3 CFLAGS = -Wall -O3
+MAKE = make +MAKE = make
@ -259,21 +259,16 @@ diff -up ./Makefile.orig ./Makefile
+export INSTDIR +export INSTDIR
+ +
+PROCESSOR=$(shell /bin/uname -p) +IS_64=$(shell /bin/uname -i | awk '/64/ {print 64}')
+ifeq "${PROCESSOR}" "x86_64"
+X86_64=64
+else
+X86_64=
+endif
+ +
+ifndef LIBDIR +ifndef LIBDIR
+LIB_INSTDIR=${INSTDIR}/lib${X86_64} +LIB_INSTDIR=${INSTDIR}/lib${IS_64}
+else +else
+LIB_INSTDIR=${INSTDIR}/..${LIBDIR} +LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
+endif +endif
+ +
+ifndef LIBDIR +ifndef LIBDIR
+LIBDIR=/usr/lib${X86_64} +LIBDIR=/usr/lib${IS_64}
+endif +endif
+ +
+export LIBDIR +export LIBDIR
@ -289,7 +284,7 @@ diff -up ./Makefile.orig ./Makefile
svm-predict: svm-predict.c svm.o svm-predict: svm-predict.c svm.o
$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
svm-train: svm-train.c svm.o svm-train: svm-train.c svm.o
@@ -12,4 +50,61 @@ svm-scale: svm-scale.c @@ -12,4 +45,61 @@ svm-scale: svm-scale.c
svm.o: svm.cpp svm.h svm.o: svm.cpp svm.h
$(CXX) $(CFLAGS) -c svm.cpp $(CXX) $(CFLAGS) -c svm.cpp
clean: clean:

@ -1,6 +1,6 @@
Name: libsvm Name: libsvm
Version: 2.85 Version: 2.85
Release: 1%{?dist} Release: 2%{?dist}
Summary: A Library for Support Vector Machines Summary: A Library for Support Vector Machines
Group: Development/Libraries Group: Development/Libraries
@ -31,7 +31,7 @@ estimation (one-class SVM ). It supports multi-class classification.
%package devel %package devel
Summary: Header file, object file, and source files of libsvm in C, C++ and Java Summary: Header file, object file, and source files of libsvm in C, C++ and Java
Group: Development/Libraries Group: Development/Libraries
BuildRequires: glibc-devel BuildRequires: glibc-devel gawk
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description devel %description devel
@ -94,7 +94,7 @@ cp ../../SOURCES/guide.pdf .
%build %build
make all CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" make all CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR=%{_libdir}
%{__sed} -i 's/\r//' FAQ.html %{__sed} -i 's/\r//' FAQ.html
%{__sed} -i 's/\r//' ChangeLog %{__sed} -i 's/\r//' ChangeLog
mv python/README python/README-Python mv python/README python/README-Python
@ -163,8 +163,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Feb 04 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-1 * Tue Feb 05 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-2
- Fix build error - Fix svm-toy-qt build error
* Tue Feb 05 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-1
- Fix svm-toy-gtk build error
* Mon Feb 04 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-0 * Mon Feb 04 2008 Ding-Yi Chen <dchen@redhat.com> - 2.85-0
- Upgrade to 2.85 - Upgrade to 2.85

Loading…
Cancel
Save