This still seems overkill. You can build minizip from inside the zlib recipe
by fixing the minizip Makefile (fix posted to
https://github.com/madler/zlib/pull/681) and then adding one line to do_compile:
oe_runmake -C contrib/minizip CC="${CC}" CFLAGS="${CFLAGS}"
LDFLAGS="${LDFLAGS}"
A corresponding manual do_install too, obviously.
Ross
> On 15 Jul 2022, at 12:55, Sean Nyekjaer via lists.openembedded.org
> <[email protected]> wrote:
>
> This is done in preparation for adding packages from the zlib contrib
> directory.
> Unfortunatly it's not possible to add these via pkgconfig.
>
> Signed-off-by: Sean Nyekjaer <[email protected]>
> ---
> With this we are maintaining the same verison number for both zlib and
> minizip in the recipe name. Would it be better to have it in the inc
> file?
>
> PV = "1.2.12" ?
>
> meta/recipes-core/zlib/zlib.inc | 4 ++++
> meta/recipes-core/zlib/zlib_1.2.12.bb | 18 +++++++++---------
> 2 files changed, 13 insertions(+), 9 deletions(-)
> create mode 100644 meta/recipes-core/zlib/zlib.inc
>
> diff --git a/meta/recipes-core/zlib/zlib.inc b/meta/recipes-core/zlib/zlib.inc
> new file mode 100644
> index 0000000000..b607a82312
> --- /dev/null
> +++ b/meta/recipes-core/zlib/zlib.inc
> @@ -0,0 +1,4 @@
> +SRC_URI = "https://zlib.net/zlib-${PV}.tar.xz";
> +UPSTREAM_CHECK_URI = "http://zlib.net/";
> +
> +SRC_URI[sha256sum] =
> "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
> diff --git a/meta/recipes-core/zlib/zlib_1.2.12.bb
> b/meta/recipes-core/zlib/zlib_1.2.12.bb
> index e921703137..ba986d8cf2 100644
> --- a/meta/recipes-core/zlib/zlib_1.2.12.bb
> +++ b/meta/recipes-core/zlib/zlib_1.2.12.bb
> @@ -6,16 +6,16 @@ SECTION = "libs"
> LICENSE = "Zlib"
> LIC_FILES_CHKSUM =
> "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0"
>
> -SRC_URI = "https://zlib.net/${BP}.tar.xz \
> - file://cc.patch \
> - file://ldflags-tests.patch \
> - file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \
> - file://run-ptest \
> -
> file://0001-Correct-incorrect-inputs-provided-to-the-CRC-functio.patch \
> - "
> -UPSTREAM_CHECK_URI = "http://zlib.net/";
> +include zlib.inc
> +
> +SRC_URI += "file://cc.patch \
> + file://ldflags-tests.patch \
> + file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \
> + file://run-ptest \
> +
> file://0001-Correct-incorrect-inputs-provided-to-the-CRC-functio.patch \
> +"
>
> -SRC_URI[sha256sum] =
> "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
> +UPSTREAM_CHECK_URI = "http://zlib.net/";
>
> CFLAGS += "-D_REENTRANT"
>
> --
> 2.37.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#168240):
https://lists.openembedded.org/g/openembedded-core/message/168240
Mute This Topic: https://lists.openembedded.org/mt/92398812/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
