rpms/ode/devel ode-0.6-configure.patch, NONE, 1.1 ode-0.6-lib64.patch, NONE, 1.1 ode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Jul 5 20:42:02 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/ode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20918/devel
Modified Files:
.cvsignore sources
Added Files:
ode-0.6-configure.patch ode-0.6-lib64.patch ode.spec
Log Message:
auto-import ode-0.6-2 on branch devel from ode-0.6-2.src.rpm
ode-0.6-configure.patch:
--- NEW FILE ode-0.6-configure.patch ---
--- ode-0.6/configure.configure 2006-06-09 16:54:52.000000000 +0200
+++ ode-0.6/configure 2006-07-01 15:42:13.000000000 +0200
@@ -3532,7 +3532,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3540,7 +3540,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3567,7 +3567,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -3581,18 +3581,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -6309,11 +6309,6 @@
case "$arch" in
pentium3 | pentium4 | athlon* )
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SSE
-_ACEOF
-
;;
esac
@@ -7121,7 +7116,7 @@
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-if test "x$pentium" == xyes
+if test "x$pentium" == xgarbage
then
cat >>confdefs.h <<\_ACEOF
@@ -7181,7 +7176,7 @@
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-if test "x$cpu64" == xyes
+if test "x$cpu64" == xgarbage
then
cat >>confdefs.h <<\_ACEOF
@@ -7193,7 +7188,7 @@
echo "${ECHO_T}$cpu64" >&6
-if test x$cpu64 = xyes; then
+if test x$cpu64 = xgarbage; then
X86_64_SYSTEM_TRUE=
X86_64_SYSTEM_FALSE='#'
else
@@ -7202,6 +7197,7 @@
fi
+if false; then
echo "$as_me:$LINENO: checking if building a release library" >&5
echo $ECHO_N "checking if building a release library... $ECHO_C" >&6
# Check whether --enable-release or --disable-release was given.
@@ -7228,6 +7224,7 @@
fi
echo "$as_me:$LINENO: result: $release" >&5
echo "${ECHO_T}$release" >&6
+fi
echo "$as_me:$LINENO: checking for char" >&5
echo $ECHO_N "checking for char... $ECHO_C" >&6
@@ -9317,9 +9314,9 @@
;;
*)
drawstuff="X11" # if anything else default to X11
- so_ext=".so"
+ so_ext=".so.0"
DLLDEFINE=""
- SHARED_LDFLAGS="-shared"
+ SHARED_LDFLAGS="-shared -Wl,-soname,\\\$@"
;;
esac
@@ -12081,10 +12078,9 @@
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
- # will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ # 2. Add them.
+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -13502,8 +13498,5 @@
echo " Use double precision: $precision"
echo " Use OPCODE: $opcode"
echo " Use gyroscopic term: $gyroscopic"
-echo " Is this a Pentium: $pentium"
-echo " Is the CPU x86-64: $cpu64"
-echo " Is this a release build: $release"
echo " Headers will be installed in $prefix/include/ode"
echo " Libraries will be installed in $prefix/lib"
--- ode-0.6/configure.in.configure 2006-05-23 19:43:32.000000000 +0200
+++ ode-0.6/configure.in 2006-07-01 15:42:08.000000000 +0200
@@ -49,7 +49,9 @@
dnl so allow users to compile programs for their target machine.
case "$arch" in
pentium3 | pentium4 | athlon* )
- AC_DEFINE(HAVE_SSE,,[Use SSE Optimizations])
+dnl This isn't used anywhere in the source, still commented out for safety. The
+dnl x86_64 buildsys will have SSE, but the host on which the result runs not!
+dnl AC_DEFINE(HAVE_SSE,,[Use SSE Optimizations])
;;
dnl this space available for other architectures specific extensions and/or
dnl other Intel based extensions such as 3DNow, SSE2, MMX, etc.
@@ -205,7 +207,9 @@
return 0;
};
],pentium=yes,pentium=no,)
-if test "x$pentium" == xyes
+dnl Check modified to always fail. The buildsys may be a pentium (and thus have
+dnl an RDTSC), but the host on which the result runs may not!
+if test "x$pentium" == xgarbage
then
AC_DEFINE(PENTIUM,1,[is this a pentium on a gcc-based platform?])
fi
@@ -224,13 +228,18 @@
return 0;
};
],cpu64=yes,cpu64=no,)
-if test "x$cpu64" == xyes
+dnl Checks modified to always fail. The FE buildsys is a x86_64, but the host
+dnl on which the result runs could also be an i386!
+if test "x$cpu64" == xgarbage
then
AC_DEFINE(X86_64_SYSTEM,1,[is this a X86_64 system on a gcc-based platform?])
fi
AC_MSG_RESULT($cpu64)
-AM_CONDITIONAL(X86_64_SYSTEM, test x$cpu64 = xyes)
+AM_CONDITIONAL(X86_64_SYSTEM, test x$cpu64 = xgarbage)
+dnl completely disable this, because we don't want configure to override our
+dnl default rpmbuild CFLAGS!
+if false; then
AC_MSG_CHECKING(if building a release library)
AC_ARG_ENABLE(release,AC_HELP_STRING([--enable-release],
[build a release library with -fomit-frame-pointer and -ffast-math]),
@@ -247,6 +256,7 @@
CXXFLAGS="-g"
fi
AC_MSG_RESULT($release)
+fi
dnl Check variable type sizes
AC_CHECK_SIZEOF(char)
@@ -275,9 +285,9 @@
;;
*)
drawstuff="X11" # if anything else default to X11
- so_ext=".so"
+ so_ext=".so.0"
DLLDEFINE=""
- SHARED_LDFLAGS="-shared"
+ SHARED_LDFLAGS="-shared -Wl,-soname,\\\$@"
;;
esac
dnl Set Conditionals
@@ -474,8 +484,8 @@
echo " Use double precision: $precision"
echo " Use OPCODE: $opcode"
echo " Use gyroscopic term: $gyroscopic"
-echo " Is this a Pentium: $pentium"
-echo " Is the CPU x86-64: $cpu64"
-echo " Is this a release build: $release"
+dnl echo " Is this a Pentium: $pentium"
+dnl echo " Is the CPU x86-64: $cpu64"
+dnl echo " Is this a release build: $release"
echo " Headers will be installed in $prefix/include/ode"
echo " Libraries will be installed in $prefix/lib"
ode-0.6-lib64.patch:
--- NEW FILE ode-0.6-lib64.patch ---
--- ode-0.6/ode-config.in.lib64 2005-12-02 18:25:32.000000000 +0100
+++ ode-0.6/ode-config.in 2006-07-01 15:52:52.000000000 +0200
@@ -42,10 +42,8 @@
echo -I at includedir@/ode
;;
--libs)
- echo -L at libdir@ -lode
- ;;
--shared-libs)
- echo -L at prefix@/lib -lode at so_ext@
+ echo -lode
;;
*)
echo "${usage}" 1>&2
--- ode-0.6/ode/src/Makefile.in.lib64 2006-06-09 16:54:49.000000000 +0200
+++ ode-0.6/ode/src/Makefile.in 2006-07-01 15:58:37.000000000 +0200
@@ -438,7 +438,7 @@
# Fake an executable in order to get a shared library
# Note the elegant and cunning way to trick Autotools to install a program
# in a lib directory. --Rodrigo
-traplibdir = $(prefix)/lib
+traplibdir = $(libdir)
libode_SOURCES =
libode_DEPENDENCIES = libfast.a libode.a $(am__append_2)
libode_LDFLAGS = @SHARED_LDFLAGS@
--- ode-0.6/ode/src/Makefile.am.lib64 2006-07-01 15:57:23.000000000 +0200
+++ ode-0.6/ode/src/Makefile.am 2006-07-01 15:57:25.000000000 +0200
@@ -11,7 +11,7 @@
# Fake an executable in order to get a shared library
# Note the elegant and cunning way to trick Autotools to install a program
# in a lib directory. --Rodrigo
-traplibdir=$(prefix)/lib
+traplibdir=$(libdir)
EXEEXT=@so_ext@
traplib_PROGRAMS=libode
libode_SOURCES=
--- NEW FILE ode.spec ---
Name: ode
Version: 0.6
Release: 2%{?dist}
Summary: High performance library for simulating rigid body dynamics
Group: System Environment/Libraries
License: BSD LGPL
URL: http://www.ode.org
Source0: http://dl.sourceforge.net/sourceforge/opende/ode-src-%{version}.zip
Patch0: ode-0.6-configure.patch
Patch1: ode-0.6-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libGL-devel
%description
ODE is an open source, high performance library for simulating rigid body
dynamics. It is fully featured, stable, mature and platform independent with
an easy to use C/C++ API. It has advanced joint types and integrated collision
detection with friction. ODE is useful for simulating vehicles, objects in
virtual reality environments and virtual creatures. It is currently used in
many computer games, 3D authoring tools and simulation tools.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -z .configure
%patch1 -p1 -z .lib64
# sigh stop autoxxx from rerunning because of our patches above.
touch aclocal.m4
touch configure
touch Makefile.in
touch include/ode/config.h.in
touch ode/src/Makefile.in
# stop rpmlint from complaining about executable files in the debug package
chmod -x include/*/*.h ode/src/*.cpp
%build
export CFLAGS="%{optflags} -ffast-math -fPIC"
export CXXFLAGS="%{optflags} -ffast-math -fPIC"
%configure --enable-shared
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libode.a
ln -s libode.so.0 $RPM_BUILD_ROOT%{_libdir}/libode.so
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt LICENSE*.TXT README.txt
%{_libdir}/libode.so.0
%files devel
%defattr(-,root,root,-)
%{_bindir}/%{name}-config
%{_includedir}/%{name}
%{_libdir}/libode.so
%changelog
* Wed Jul 5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6-2
- Change name from libode to ode
- Fix soname & /usr/lib64 usage
- Patch configure to accept our CFLAGS instead of always using its own
- Patch configure to never activate the generation of asm-code which is then
used unconditionally, the build CPU may be very different from the CPU on
which the package gets run.
* Sun Jun 18 2006 Hugo Cisneiros <hugo at devin.com.br> 0.6-1
- Initial RPM release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Jul 2006 20:40:14 -0000 1.1
+++ .cvsignore 5 Jul 2006 20:42:01 -0000 1.2
@@ -0,0 +1 @@
+ode-src-0.6.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Jul 2006 20:40:14 -0000 1.1
+++ sources 5 Jul 2006 20:42:01 -0000 1.2
@@ -0,0 +1 @@
+7afdb1d434a1e2cc2d701fdf8d1f2fad ode-src-0.6.zip
More information about the scm-commits
mailing list