devel/py-bullet3: Use system zlib instead of a bundled one to fix SEGV due to a conflict
Reported by: Henrik Gulbrandsen <henrik@gulbra.net> (via e-mail)
This commit is contained in:
parent
841e4d3a8a
commit
3029f1e97c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=566272
2 changed files with 36 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= bullet3
|
||||
DISTVERSION= 3.08
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= devel
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
||||
|
|
35
devel/py-bullet3/files/patch-setup.py
Normal file
35
devel/py-bullet3/files/patch-setup.py
Normal file
|
@ -0,0 +1,35 @@
|
|||
- use system zlib because of SEGV: https://github.com/bulletphysics/bullet3/issues/3280
|
||||
|
||||
--- setup.py.orig 2021-02-22 06:17:11 UTC
|
||||
+++ setup.py
|
||||
@@ -160,21 +160,6 @@ sources = ["examples/pybullet/pybullet.c"]\
|
||||
+["examples/ThirdPartyLibs/minizip/ioapi.c"]\
|
||||
+["examples/ThirdPartyLibs/minizip/unzip.c"]\
|
||||
+["examples/ThirdPartyLibs/minizip/zip.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/adler32.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/compress.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/crc32.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/deflate.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/gzclose.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/gzlib.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/gzread.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/gzwrite.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/infback.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/inffast.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/inflate.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/inftrees.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/trees.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/uncompr.c"]\
|
||||
-+["examples/ThirdPartyLibs/zlib/zutil.c"]\
|
||||
+["examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp"]\
|
||||
+["examples/Importers/ImportObjDemo/LoadMeshFromObj.cpp"]\
|
||||
+["examples/Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp"]\
|
||||
@@ -438,7 +423,7 @@ elif _platform == "darwin":
|
||||
+["examples/OpenGLWindow/MacOpenGLWindowObjC.m"]
|
||||
else:
|
||||
print("bsd!")
|
||||
- libraries = ['GL', 'GLEW', 'pthread']
|
||||
+ libraries = ['GL', 'GLEW', 'pthread', 'z']
|
||||
os.environ['LDFLAGS'] = '-L/usr/X11R6/lib'
|
||||
CXX_FLAGS += '-D_BSD '
|
||||
CXX_FLAGS += '-I/usr/X11R6/include '
|
Loading…
Reference in a new issue