From 37f0e16ff077f94d6e4de1f5481af94d5ca0ce36 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 13 Jan 2021 17:20:32 -0500 Subject: dev-libs/miniz: don't set visibility to hidden Needed by prusaslicer and symbols such as mz_zip_zero_struct Bug: https://bugs.gentoo.org/761541 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Ionen Wolkens Signed-off-by: Sam James --- .../miniz-2.1.0-export-cmake-build-targets.patch | 4 +-- dev-libs/miniz/miniz-2.1.0-r1.ebuild | 38 ---------------------- dev-libs/miniz/miniz-2.1.0-r2.ebuild | 38 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 41 deletions(-) delete mode 100644 dev-libs/miniz/miniz-2.1.0-r1.ebuild create mode 100644 dev-libs/miniz/miniz-2.1.0-r2.ebuild diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch index 6f8429222700..c1fb1a52215d 100644 --- a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch +++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch @@ -18,7 +18,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "") # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up # differentiation between debug and release builds. -@@ -8,45 +18,122 @@ +@@ -8,45 +18,120 @@ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) endif () @@ -39,8 +39,6 @@ +string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER) +set_target_properties(${PROJECT_NAME} + PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE) -+else() -+set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden) +endif() + +set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION}) diff --git a/dev-libs/miniz/miniz-2.1.0-r1.ebuild b/dev-libs/miniz/miniz-2.1.0-r1.ebuild deleted file mode 100644 index cc26fba366c0..000000000000 --- a/dev-libs/miniz/miniz-2.1.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A lossless, high performance data compression library" -HOMEPAGE="https://github.com/richgel999/miniz" -SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DOCS=( ChangeLog.md LICENSE readme.md ) - -PATCHES=( - "${FILESDIR}/${P}-export-cmake-build-targets.patch" -) - -src_prepare() { - cp "${FILESDIR}/Config.cmake.in" . - cp "${FILESDIR}/miniz.pc.in" . - - cmake_src_prepare -} - -src_configure() { - CMAKE_BUILD_TYPE=Release - - local mycmakeargs=( - -DBUILD_EXAMPLES=OFF - ) - - cmake_src_configure -} diff --git a/dev-libs/miniz/miniz-2.1.0-r2.ebuild b/dev-libs/miniz/miniz-2.1.0-r2.ebuild new file mode 100644 index 000000000000..cc26fba366c0 --- /dev/null +++ b/dev-libs/miniz/miniz-2.1.0-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A lossless, high performance data compression library" +HOMEPAGE="https://github.com/richgel999/miniz" +SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DOCS=( ChangeLog.md LICENSE readme.md ) + +PATCHES=( + "${FILESDIR}/${P}-export-cmake-build-targets.patch" +) + +src_prepare() { + cp "${FILESDIR}/Config.cmake.in" . + cp "${FILESDIR}/miniz.pc.in" . + + cmake_src_prepare +} + +src_configure() { + CMAKE_BUILD_TYPE=Release + + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF + ) + + cmake_src_configure +} -- cgit v1.2.3-65-gdbad