| Message ID | 20220711083309.1749253-1-sean@geanix.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] zlib: split src_uri into inc file | expand |
We are in process of merging the inc files can you cite reasons why we want to split it On Mon, Jul 11, 2022 at 9:33 AM Sean Nyekjaer <sean@geanix.com> wrote: > Signed-off-by: Sean Nyekjaer <sean@geanix.com> > --- > 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..2bcc32071a > --- /dev/null > +++ b/meta/recipes-core/zlib/zlib.inc > @@ -0,0 +1,4 @@ > +SRC_URI = "https://zlib.net/${BP}.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.36.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#167861): > https://lists.openembedded.org/g/openembedded-core/message/167861 > Mute This Topic: https://lists.openembedded.org/mt/92305639/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On Mon, Jul 11, 2022 at 07:07:38PM +0100, Khem Raj wrote: > We are in process of merging the inc files can you cite reasons why we want > to split it > @Khem: Inside the zlib artifact resides a contrib directory that contains more libs, one of them minizip are we using in our project. /Sean
On Mon, Jul 11, 2022 at 8:27 PM Sean Nyekjaer <sean@geanix.com> wrote: > On Mon, Jul 11, 2022 at 07:07:38PM +0100, Khem Raj wrote: > > We are in process of merging the inc files can you cite reasons why we > want > > to split it > > > > @Khem: > Inside the zlib artifact resides a contrib directory that contains more > libs, one of them minizip are we using in our project. > Is it possible to use packageconfig for enabling this > /Sean >
On Mon, Jul 11, 2022 at 08:29:24PM +0100, Khem Raj wrote: > On Mon, Jul 11, 2022 at 8:27 PM Sean Nyekjaer <sean@geanix.com> wrote: > > > On Mon, Jul 11, 2022 at 07:07:38PM +0100, Khem Raj wrote: > > > We are in process of merging the inc files can you cite reasons why we > > want > > > to split it > > > > > > > @Khem: > > Inside the zlib artifact resides a contrib directory that contains more > > libs, one of them minizip are we using in our project. > > > > Is it possible to use packageconfig for enabling this > > No it doesn't look like it :(
diff --git a/meta/recipes-core/zlib/zlib.inc b/meta/recipes-core/zlib/zlib.inc new file mode 100644 index 0000000000..2bcc32071a --- /dev/null +++ b/meta/recipes-core/zlib/zlib.inc @@ -0,0 +1,4 @@ +SRC_URI = "https://zlib.net/${BP}.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"
Signed-off-by: Sean Nyekjaer <sean@geanix.com> --- 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