Added ode fix patch
This commit is contained in:
commit
c86e1864dc
|
@ -0,0 +1,34 @@
|
||||||
|
diff -up simspark-0.2.2/cmake/FindODE.cmake.odefix simspark-0.2.2/cmake/FindODE.cmake
|
||||||
|
--- simspark-0.2.2/cmake/FindODE.cmake.odefix 2011-04-26 16:10:46.000000000 +0430
|
||||||
|
+++ simspark-0.2.2/cmake/FindODE.cmake 2011-04-27 22:40:12.761590987 +0430
|
||||||
|
@@ -60,7 +60,20 @@ IF (NOT ODE_FOUND)
|
||||||
|
ENDFOREACH(flag)
|
||||||
|
|
||||||
|
SET(ODE_EXTRA_LDFLAGS ${ODE_CONFIG_LIBS})
|
||||||
|
- ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
|
||||||
|
+
|
||||||
|
+ # Convert the linker flags to a CMake list.
|
||||||
|
+ STRING(REGEX REPLACE " +" ";"
|
||||||
|
+ ODE_CONFIG_LIBS "${ODE_CONFIG_LIBS}")
|
||||||
|
+
|
||||||
|
+ # Look for -l options.
|
||||||
|
+ FOREACH(flag ${ODE_CONFIG_LIBS})
|
||||||
|
+ IF("${flag}" MATCHES "^-l.*ode.*")
|
||||||
|
+ STRING(REGEX REPLACE "^-l" ""
|
||||||
|
+ ODE_LIB_NAME "${flag}")
|
||||||
|
+ ENDIF("${flag}" MATCHES "^-l.*ode.*")
|
||||||
|
+ ENDFOREACH(flag)
|
||||||
|
+
|
||||||
|
+ ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
|
||||||
|
MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
|
||||||
|
ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
|
||||||
|
|
||||||
|
@@ -79,7 +92,7 @@ IF (NOT ODE_FOUND)
|
||||||
|
NO_DEFAULT_PATH
|
||||||
|
)
|
||||||
|
FIND_LIBRARY(ODE_LIBRARY
|
||||||
|
- NAMES ode ode_double ode_single
|
||||||
|
+ NAMES ${ODE_LIB_NAME} ode ode_double ode_single
|
||||||
|
PATHS
|
||||||
|
${ODE_CONFIG_PREFIX}/lib
|
||||||
|
/usr/lib
|
|
@ -1,6 +1,6 @@
|
||||||
Name: simspark
|
Name: simspark
|
||||||
Version: 0.2.2
|
Version: 0.2.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Spark physical simulation system
|
Summary: Spark physical simulation system
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
|
@ -8,6 +8,8 @@ License: GPLv2
|
||||||
URL: http://simspark.sourceforge.net
|
URL: http://simspark.sourceforge.net
|
||||||
Source0: http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/simspark/%{name}-%{version}.tar.gz
|
||||||
Patch0: %{name}-confscript-mlibfix.patch
|
Patch0: %{name}-confscript-mlibfix.patch
|
||||||
|
# Applied upstream
|
||||||
|
Patch1: %{name}-odefix.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
|
BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
|
||||||
|
@ -36,6 +38,7 @@ developing applications that use %{name}.
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .mlibfix
|
%patch0 -p1 -b .mlibfix
|
||||||
|
%patch1 -p1 -b .odefix
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir build
|
mkdir build
|
||||||
|
@ -80,6 +83,9 @@ rm -rf %{buildroot}
|
||||||
%doc doc/devel/howtos doc/devel/manual.pdf
|
%doc doc/devel/howtos doc/devel/manual.pdf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 27 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.2-2
|
||||||
|
- Link against the correct ode library
|
||||||
|
|
||||||
* Wed Apr 27 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.2-1
|
* Wed Apr 27 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 0.2.2-1
|
||||||
- Updated to latest release 0.2.2
|
- Updated to latest release 0.2.2
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue