| Submitter | Andrei Dinu |
|---|---|
| Date | Feb. 19, 2013, 11:32 a.m. |
| Message ID | <1361273568-30066-1-git-send-email-andrei.adrianx.dinu@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/44837/ |
| State | New |
| Headers | show |
Comments
While this is a straight forward patch, it causes some problems with depender's of libpng, since the library name changes from libpng15 -> libpng16 a lot of both -native and target packages fail to compile. I know in the past we would do a load of PR bumps to all these packages to address this issue. This is because many packages encode the libpng15 information into libtool (.la) files, when the sysroot is populated with an older build or sstate cache, the libpng15 info remains. There already is a link from libpng.la, why does this not get used by libtool and stored in the .la file? I am sure there is some strange magical history around this issue. Thanks Sau! On 02/19/2013 03:32 AM, Andrei Dinu wrote: > Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> > --- > .../libpng/{libpng_1.5.14.bb => libpng_1.6.0.bb} | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > rename meta/recipes-multimedia/libpng/{libpng_1.5.14.bb => libpng_1.6.0.bb} (50%) > > diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.14.bb b/meta/recipes-multimedia/libpng/libpng_1.6.0.bb > similarity index 50% > rename from meta/recipes-multimedia/libpng/libpng_1.5.14.bb > rename to meta/recipes-multimedia/libpng/libpng_1.6.0.bb > index b2b82d3..951e34a 100644 > --- a/meta/recipes-multimedia/libpng/libpng_1.5.14.bb > +++ b/meta/recipes-multimedia/libpng/libpng_1.6.0.bb > @@ -3,17 +3,17 @@ DESCRIPTION = "PNG Library" > HOMEPAGE = "http://www.libpng.org/" > SECTION = "libs" > LICENSE = "Libpng" > -LIC_FILES_CHKSUM = "file://LICENSE;md5=58c8238139ee86082f8d29eb89304241 \ > - file://png.h;beginline=207;endline=321;md5=4f17771edaee8bb3c17a95d7faaa3681" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=03b8ec701cb796c0ec84af22f884edef \ > + file://png.h;beginline=207;endline=321;md5=e829cebefd08488ba5142ea5faea6821" > DEPENDS = "zlib" > PR = "r0" > -LIBV = "15" > +LIBV = "16" > > SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ > " > > -SRC_URI[md5sum] = "94284b01d62ca43c5eb3f6702db08ed8" > -SRC_URI[sha256sum] = "1459488e1b58d3be1c798453cf40c522c05bd66b61156cd51f469f17dff87b54" > +SRC_URI[md5sum] = "3ee623b9a4d33bda7310a5124080b14d" > +SRC_URI[sha256sum] = "5e13c31321083b03956b5ff298bacffab7a7ad35c34c122acef314593944b97b" > > inherit autotools binconfig pkgconfig > >
On Sat, Mar 02, 2013 at 11:25:21AM -0800, Saul Wold wrote: > > While this is a straight forward patch, it causes some problems with > depender's of libpng, since the library name changes from libpng15 -> > libpng16 a lot of both -native and target packages fail to compile. > > I know in the past we would do a load of PR bumps to all these packages > to address this issue. > > This is because many packages encode the libpng15 information into > libtool (.la) files, when the sysroot is populated with an older build > or sstate cache, the libpng15 info remains. > > There already is a link from libpng.la, why does this not get used by > libtool and stored in the .la file? > > I am sure there is some strange magical history around this issue. Last upgrade to 1.5 had the same problem, I still have magical "cleanup" oneliner from that: for MACHINE in nokia900 om-gta04 tuna qemux86-64 om-gta02 spitz; do export MACHINE; bitbake -c cleansstate vlc vte qt4-x11-free qt4-embedded python-pygtk pidgin poppler pango packagekit nautilus mplayer2 metacity matchbox-keyboard matchbox-panel-2 librsvg libwmf libsdl-image libunique gst-plugins-bad gst-plugins-good avahi-ui cheese libass glade3 evolution-data-server gtk+3 gnome-disk-utility gnome-panel gnome-desktop directfb cups gnome-keyring evince webkit-efl libcanberra cairo libglade libgweather libwnck polkit-gnome libgpewidget libgnomekbd gmtk numptyphysics; done; But this list is only to fix binary feed I care about, not all packages available in layers. > On 02/19/2013 03:32 AM, Andrei Dinu wrote: > > Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> > > --- > > .../libpng/{libpng_1.5.14.bb => libpng_1.6.0.bb} | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > rename meta/recipes-multimedia/libpng/{libpng_1.5.14.bb => libpng_1.6.0.bb} (50%) > > > > diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.14.bb b/meta/recipes-multimedia/libpng/libpng_1.6.0.bb > > similarity index 50% > > rename from meta/recipes-multimedia/libpng/libpng_1.5.14.bb > > rename to meta/recipes-multimedia/libpng/libpng_1.6.0.bb > > index b2b82d3..951e34a 100644 > > --- a/meta/recipes-multimedia/libpng/libpng_1.5.14.bb > > +++ b/meta/recipes-multimedia/libpng/libpng_1.6.0.bb > > @@ -3,17 +3,17 @@ DESCRIPTION = "PNG Library" > > HOMEPAGE = "http://www.libpng.org/" > > SECTION = "libs" > > LICENSE = "Libpng" > > -LIC_FILES_CHKSUM = "file://LICENSE;md5=58c8238139ee86082f8d29eb89304241 \ > > - file://png.h;beginline=207;endline=321;md5=4f17771edaee8bb3c17a95d7faaa3681" > > +LIC_FILES_CHKSUM = "file://LICENSE;md5=03b8ec701cb796c0ec84af22f884edef \ > > + file://png.h;beginline=207;endline=321;md5=e829cebefd08488ba5142ea5faea6821" > > DEPENDS = "zlib" > > PR = "r0" > > -LIBV = "15" > > +LIBV = "16" > > > > SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ > > " > > > > -SRC_URI[md5sum] = "94284b01d62ca43c5eb3f6702db08ed8" > > -SRC_URI[sha256sum] = "1459488e1b58d3be1c798453cf40c522c05bd66b61156cd51f469f17dff87b54" > > +SRC_URI[md5sum] = "3ee623b9a4d33bda7310a5124080b14d" > > +SRC_URI[sha256sum] = "5e13c31321083b03956b5ff298bacffab7a7ad35c34c122acef314593944b97b" > > > > inherit autotools binconfig pkgconfig > > > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On 2 March 2013 19:25, Saul Wold <sgw@linux.intel.com> wrote: > This is because many packages encode the libpng15 information into libtool > (.la) files, when the sysroot is populated with an older build or sstate > cache, the libpng15 info remains. Sounds like another good reason to erase ${libdir}/*.la automatically... Ross
Patch
diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.14.bb b/meta/recipes-multimedia/libpng/libpng_1.6.0.bb similarity index 50% rename from meta/recipes-multimedia/libpng/libpng_1.5.14.bb rename to meta/recipes-multimedia/libpng/libpng_1.6.0.bb index b2b82d3..951e34a 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.5.14.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.0.bb @@ -3,17 +3,17 @@ DESCRIPTION = "PNG Library" HOMEPAGE = "http://www.libpng.org/" SECTION = "libs" LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=58c8238139ee86082f8d29eb89304241 \ - file://png.h;beginline=207;endline=321;md5=4f17771edaee8bb3c17a95d7faaa3681" +LIC_FILES_CHKSUM = "file://LICENSE;md5=03b8ec701cb796c0ec84af22f884edef \ + file://png.h;beginline=207;endline=321;md5=e829cebefd08488ba5142ea5faea6821" DEPENDS = "zlib" PR = "r0" -LIBV = "15" +LIBV = "16" SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ " -SRC_URI[md5sum] = "94284b01d62ca43c5eb3f6702db08ed8" -SRC_URI[sha256sum] = "1459488e1b58d3be1c798453cf40c522c05bd66b61156cd51f469f17dff87b54" +SRC_URI[md5sum] = "3ee623b9a4d33bda7310a5124080b14d" +SRC_URI[sha256sum] = "5e13c31321083b03956b5ff298bacffab7a7ad35c34c122acef314593944b97b" inherit autotools binconfig pkgconfig
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> --- .../libpng/{libpng_1.5.14.bb => libpng_1.6.0.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-multimedia/libpng/{libpng_1.5.14.bb => libpng_1.6.0.bb} (50%)