package/assimp: fix musl zlib/zip related compile failure
PATCH 1/1 package/assimp: fix musl zlib/zip related compile failure
As assimp fails to use system provided zlib/zip (and is picky about the provided versions) use assimp contributed one and backport one part of upstream patch to fix musl compile.
Fixes:
http://autobuild.buildroot.net/results/4b373ae7d8fd40efe3e2592f94f2d769d6a77669
In file included from .../assimp-5.0.1/code/3MF/D3MFExporter.cpp:61:
.../assimp-5.0.1/contrib/zip/src/zip.h:30:15: error: conflicting declaration 'typedef long int ssize_t'
typedef long ssize_t; /* byte count or error */
^~~~~~~
--- ...ssize_t-typedef-mismatch-for-musl-co.patch | 50 +++++++++++++++++++ package/assimp/Config.in | 1 - package/assimp/assimp.mk | 3 +- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch
package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch new file +50 -0
@@ -0,0 +1,50 @@ +From 3fef857a570d1ef2c96401358fe8e239625b48c9 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Fri, 10 Apr 2020 18:11:50 +0200 +Subject: [PATCH] contrib/zip: fix ssize_t typedef mismatch for musl compile + +Musl uses defines __DEFINED_ssize_t to indicate ssize_t +availability. So backport this part of upstream commit [1] +to fixl musl compile. + +https://github.com/assimp/assimp/commit/f78446b14aff46db2ef27d062a275b6a01fd68b1 + +Signed-off-by: Peter Seiderer <[email protected]> +--- + contrib/zip/src/zip.h | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/contrib/zip/src/zip.h b/contrib/zip/src/zip.h +index 5f39df50..4672eb3e 100644 +--- a/contrib/zip/src/zip.h ++++ b/contrib/zip/src/zip.h +@@ -20,8 +20,9 @@ extern "C" { + #endif + + #if !defined(_SSIZE_T_DEFINED) && !defined(_SSIZE_T_DEFINED_) && \ +- !defined(_SSIZE_T) && !defined(_SSIZE_T_) && !defined(__ssize_t_defined) +-#define _SSIZE_T ++ !defined(__DEFINED_ssize_t) && !defined(__ssize_t_defined) && \ ++ !defined(_SSIZE_T) && !defined(_SSIZE_T_) ++ + // 64-bit Windows is the only mainstream platform + // where sizeof(long) != sizeof(void*) + #ifdef _WIN64 +@@ -29,6 +30,14 @@ typedef long long ssize_t; /* byte count or error */ + #else + typedef long ssize_t; /* byte count or error */ + #endif ++ ++#define _SSIZE_T_DEFINED ++#define _SSIZE_T_DEFINED_ ++#define __DEFINED_ssize_t ++#define __ssize_t_defined ++#define _SSIZE_T ++#define _SSIZE_T_ ++ + #endif + + #ifndef MAX_PATH +-- +2.26.0 +
package/assimp/Config.in +0 -1
@@ -2,7 +2,6 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - select BR2_PACKAGE_ZLIB help Open Asset Import Library (assimp) is a portable Open Source library to import various well-known 3D model formats in a
package/assimp/assimp.mk +1 -2
@@ -8,7 +8,6 @@ ASSIMP_VERSION = 5.0.1 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE -ASSIMP_DEPENDENCIES = zlib ASSIMP_INSTALL_STAGING = YES # relocation truncated to fit: R_68K_GOT16O
@@ -28,7 +27,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) ASSIMP_CXXFLAGS += -O0 endif -ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ +ASSIMP_CONF_OPTS += -DASSIMP_BUILD_ZLIB=ON -DASSIMP_BUILD_TESTS=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" $(eval $(cmake-package))
Signature · 1 line
2.26.0
Thomas Petazzoni
AppliedPATCH 1/1 package/assimp: fix musl zlib/zip related compile failure
Quoted 13 lines · On Fri, 10 Apr 2020 18:32:37 +0200 Peter Seiderer <[email protected]> wrote:
As assimp fails to use system provided zlib/zip (and is picky about the provided versions) use assimp contributed one and backport one part of upstream patch to fix musl compile.
Fixes:
http://autobuild.buildroot.net/results/4b373ae7d8fd40efe3e2592f94f2d769d6a77669
In file included from .../assimp-5.0.1/code/3MF/D3MFExporter.cpp:61:
.../assimp-5.0.1/contrib/zip/src/zip.h:30:15: error: conflicting declaration 'typedef long intssize_t'
typedef longssize_t; /* byte count or error */^~~~~~~
Quoted 7 lines
Signed-off-by Peter Seiderer <[email protected]>--- ...ssize_t-typedef-mismatch-for-musl-co.patch | 50 +++++++++++++++++++ package/assimp/Config.in | 1 - package/assimp/assimp.mk | 3 +- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch
I've applied, but it's not really great to be forced to use the internal zlib. Could you try to work this out with upstream?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/assimp: fix musl zlib/zip related compile failure
Hello Thomas,
Quoted 24 lines · Thomas Petazzoni
Quoted 13 lines · On Fri, 10 Apr 2020 18:32:37 +0200 Peter Seiderer <[email protected]> wrote:
As assimp fails to use system provided zlib/zip (and is picky about the provided versions) use assimp contributed one and backport one part of upstream patch to fix musl compile.
Fixes:
http://autobuild.buildroot.net/results/4b373ae7d8fd40efe3e2592f94f2d769d6a77669
In file included from .../assimp-5.0.1/code/3MF/D3MFExporter.cpp:61:
.../assimp-5.0.1/contrib/zip/src/zip.h:30:15: error: conflicting declaration 'typedef long intssize_t'
typedef longssize_t; /* byte count or error */^~~~~~~Quoted 7 lines
Signed-off-by Peter Seiderer <[email protected]>--- ...ssize_t-typedef-mismatch-for-musl-co.patch | 50 +++++++++++++++++++ package/assimp/Config.in | 1 - package/assimp/assimp.mk | 3 +- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 package/assimp/0002-contrib-zip-fix-ssize_t-typedef-mismatch-for-musl-co.patch
Quoted 2 lines
I've applied, but it's not really great to be forced to use the internal zlib. Could you try to work this out with upstream?
Tried already to get something working...but stumbled over some pitfalls
- assimp references ZLIB_FILEFUNC_MODE_READWRITEFILTER, not present (or not found be me) in the various buildroot provided packages...
- maybe assimp uses kuba/zip as internal version ([1], [2]) (not yet a buildroot package?)
- at some location assimp uses ASSIMP_USE_HUNTER (and the internal zlib include path) instead of ASSIMP_BUILD_ZLIB, but even with this fixed assimp is not compatible with the buldroot provided packages
I would wait for the next assimp major release to give it another try...
Regards,
Peter
[1] https://github.com/kuba--/zip/
[2] https://github.com/kuba--/zip/issues/110
Quoted 4 lines
Thanks!
Thomas