update to ode-0.16.2

This commit is contained in:
kirby 2020-09-17 04:58:25 +00:00
parent 6ec208b5ed
commit fab41d3ec3
3 changed files with 7 additions and 42 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.22 2020/09/13 12:11:30 kirby Exp $
# $OpenBSD: Makefile,v 1.23 2020/09/17 04:58:25 kirby Exp $
COMMENT = high performance library for simulating rigid body dynamics
SHARED_LIBS += ode 4.0 # 8.0
DISTNAME = ode-0.16
DISTNAME = ode-0.16.2
CATEGORIES = devel
REVISION = 0
HOMEPAGE = https://www.ode.org/
@ -32,6 +31,9 @@ AUTOMAKE_VERSION = 1.11
CXXFLAGS += -Wno-c++11-narrowing
post-extract:
rm ${WRKSRC}/include/ode/precision.h
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ode/
${INSTALL_PROGRAM} ${WRKBUILD}/ode/demo/.libs/demo_* \

View File

@ -1,2 +1,2 @@
SHA256 (ode-0.16.tar.gz) = S6O3b5wTFBYN5IOz25KwVpJCoHRSy7JbNo513rPKvyc=
SIZE (ode-0.16.tar.gz) = 2626240
SHA256 (ode-0.16.2.tar.gz) = smrr3LAV4tiXIO9I4MsuijyneRX4nYU4k+fMhh+BDyI=
SIZE (ode-0.16.2.tar.gz) = 2627992

View File

@ -1,37 +0,0 @@
$OpenBSD: patch-include_ode_odeconfig_h,v 1.1 2020/09/13 12:11:30 kirby Exp $
Upstream commit:
https://bitbucket.org/odedevs/ode/commits/d52580dbb52f9177940541f45be9fc84a688f612
Index: include/ode/odeconfig.h
--- include/ode/odeconfig.h.orig
+++ include/ode/odeconfig.h
@@ -80,8 +80,10 @@
#endif // #if !defined(__GNUC__)
-/* Well-defined common data types...need to define for 64 bit systems */
-#if defined(__aarch64__)
+/* Well-defined common data types...need to be defined for 64 bit systems */
+#if defined(__aarch64__) || defined(__alpha__) || defined(__ppc64__) \
+ || defined(__s390__) || defined(__s390x__) || defined(__zarch__) \
+ || defined(__mips__) || defined(__powerpc64__) || defined(__riscv) || defined(__sparc64__) || defined(__sparc__)
#include <stdint.h>
typedef int64_t dint64;
typedef uint64_t duint64;
@@ -97,13 +99,13 @@
typedef ptrdiff_t ddiffint;
typedef size_t dsizeint;
-#elif defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
+#elif (defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)) && !defined(__ILP32__) && !defined(_ILP32)
#define X86_64_SYSTEM 1
#if defined(_MSC_VER)
typedef __int64 dint64;
typedef unsigned __int64 duint64;
#else
-#if defined(_LP64)
+#if defined(_LP64) || defined(__LP64__)
typedef long dint64;
typedef unsigned long duint64;
#else