Message ID | 1329724469-2002-1-git-send-email-eric@eukrea.com |
---|---|
State | New, archived |
Headers | show |
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch deleted file mode 100644 index f8ad0af..0000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200 -+++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200 -@@ -87,6 +87,8 @@ - - # Use same compiler as ImageMagick - 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', -+ 'AR' => '@AR@', -+ 'LD' => '@PERLMAINCC@', - - # Set Perl installation prefix to ImageMagick installation prefix - # 'PREFIX' => '@prefix@', diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch new file mode 100644 index 0000000..f8ad0af --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200 ++++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200 +@@ -87,6 +87,8 @@ + + # Use same compiler as ImageMagick + 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', ++ 'AR' => '@AR@', ++ 'LD' => '@PERLMAINCC@', + + # Set Perl installation prefix to ImageMagick installation prefix + # 'PREFIX' => '@prefix@', diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb deleted file mode 100644 index d5f95c9..0000000 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "ImageMagick is an image convertion tools" -SECTION = "console/utils" -LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e1ebcc1358b9f81eba64255fc5da6892" -# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. -DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib" - -PR = "r10" - -PATCHSET = "1" -SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ - file://PerlMagic_MakePatch.patch \ - " -SRC_URI[md5sum] = "882ff241f6ad39655541d5055596f93b" -SRC_URI[sha256sum] = "5a5b2779707bfd9816cf17d8f53d242c05005092da192a898ac10961b3b19dda" - -S = "${WORKDIR}/ImageMagick-${PV}" - -inherit autotools binconfig pkgconfig - -EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp" - -FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ - ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ - ${libdir}/ImageMagick-${PV}/config/ \ - ${datadir}/ImageMagick-${PV}" - -FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a" - -FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" - -BBCLASSEXTEND = "native" - -LEAD_SONAME = "libMagickCore.so.*" - -do_configure_prepend() { - export ac_cv_sys_file_offset_bits=yes -} diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb new file mode 100644 index 0000000..9b8b799 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "ImageMagick is an image convertion tools" +SECTION = "console/utils" +LICENSE = "ImageMagick" +LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b" +# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. +DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib" + +PATCHSET = "6" +SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ + file://PerlMagic_MakePatch.patch \ + " +SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a" +SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80" + +S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" + +inherit autotools binconfig pkgconfig + +EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp" + +FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ + ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ + ${libdir}/ImageMagick-${PV}/config/ \ + ${datadir}/ImageMagick-${PV}" + +FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a" + +FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" + +BBCLASSEXTEND = "native" + +LEAD_SONAME = "libMagickCore.so.*" + +do_configure_prepend() { + export ac_cv_sys_file_offset_bits=yes + sed -i -e s:dist-lzip::g ${S}/configure.ac +}
On Mon, Feb 20, 2012 at 08:54:28AM +0100, Eric Bénard wrote: > - 6.4.4 doesn't compile following zlib upgrade to 1.26 > - hack configure.ac to remove lzip requirement for autoconf (which > is not present in OE and not needed for compiling imagemagick) can you compare with http://patchwork.openembedded.org/patch/21285/ ? Cheers, > > Signed-off-by: Eric Bénard <eric@eukrea.com> > --- > .../imagemagick-6.4.4/PerlMagic_MakePatch.patch | 11 ------ > .../imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 ++++++ > .../imagemagick/imagemagick_6.4.4.bb | 38 -------------------- > .../imagemagick/imagemagick_6.7.5.bb | 37 +++++++++++++++++++ > 4 files changed, 48 insertions(+), 49 deletions(-) > delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch > create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch > delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb > create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb > > diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch > deleted file mode 100644 > index f8ad0af..0000000 > --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch > +++ /dev/null > @@ -1,11 +0,0 @@ > ---- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200 > -+++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200 > -@@ -87,6 +87,8 @@ > - > - # Use same compiler as ImageMagick > - 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', > -+ 'AR' => '@AR@', > -+ 'LD' => '@PERLMAINCC@', > - > - # Set Perl installation prefix to ImageMagick installation prefix > - # 'PREFIX' => '@prefix@', > diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch > new file mode 100644 > index 0000000..f8ad0af > --- /dev/null > +++ b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch > @@ -0,0 +1,11 @@ > +--- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200 > ++++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200 > +@@ -87,6 +87,8 @@ > + > + # Use same compiler as ImageMagick > + 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@', > ++ 'AR' => '@AR@', > ++ 'LD' => '@PERLMAINCC@', > + > + # Set Perl installation prefix to ImageMagick installation prefix > + # 'PREFIX' => '@prefix@', > diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb > deleted file mode 100644 > index d5f95c9..0000000 > --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb > +++ /dev/null > @@ -1,38 +0,0 @@ > -DESCRIPTION = "ImageMagick is an image convertion tools" > -SECTION = "console/utils" > -LICENSE = "ImageMagick" > -LIC_FILES_CHKSUM = "file://LICENSE;md5=e1ebcc1358b9f81eba64255fc5da6892" > -# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. > -DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib" > - > -PR = "r10" > - > -PATCHSET = "1" > -SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ > - file://PerlMagic_MakePatch.patch \ > - " > -SRC_URI[md5sum] = "882ff241f6ad39655541d5055596f93b" > -SRC_URI[sha256sum] = "5a5b2779707bfd9816cf17d8f53d242c05005092da192a898ac10961b3b19dda" > - > -S = "${WORKDIR}/ImageMagick-${PV}" > - > -inherit autotools binconfig pkgconfig > - > -EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp" > - > -FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ > - ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ > - ${libdir}/ImageMagick-${PV}/config/ \ > - ${datadir}/ImageMagick-${PV}" > - > -FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a" > - > -FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" > - > -BBCLASSEXTEND = "native" > - > -LEAD_SONAME = "libMagickCore.so.*" > - > -do_configure_prepend() { > - export ac_cv_sys_file_offset_bits=yes > -} > diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb > new file mode 100644 > index 0000000..9b8b799 > --- /dev/null > +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb > @@ -0,0 +1,37 @@ > +DESCRIPTION = "ImageMagick is an image convertion tools" > +SECTION = "console/utils" > +LICENSE = "ImageMagick" > +LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b" > +# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. > +DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib" > + > +PATCHSET = "6" > +SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ > + file://PerlMagic_MakePatch.patch \ > + " > +SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a" > +SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80" > + > +S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" > + > +inherit autotools binconfig pkgconfig > + > +EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp" > + > +FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ > + ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ > + ${libdir}/ImageMagick-${PV}/config/ \ > + ${datadir}/ImageMagick-${PV}" > + > +FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a" > + > +FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" > + > +BBCLASSEXTEND = "native" > + > +LEAD_SONAME = "libMagickCore.so.*" > + > +do_configure_prepend() { > + export ac_cv_sys_file_offset_bits=yes > + sed -i -e s:dist-lzip::g ${S}/configure.ac > +} > -- > 1.7.7.6 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Hi Martin, Le Mon, 20 Feb 2012 09:08:09 +0100, Martin Jansa <martin.jansa@gmail.com> a écrit : > On Mon, Feb 20, 2012 at 08:54:28AM +0100, Eric Bénard wrote: > > - 6.4.4 doesn't compile following zlib upgrade to 1.26 > > - hack configure.ac to remove lzip requirement for autoconf (which > > is not present in OE and not needed for compiling imagemagick) > > can you compare with > http://patchwork.openembedded.org/patch/21285/ > ? > as very often your patch is better;-) I still have to catchup with a few hundreds of mail on the ML (and I should have started by that ;-) Thanks ! Eric
- 6.4.4 doesn't compile following zlib upgrade to 1.26 - hack configure.ac to remove lzip requirement for autoconf (which is not present in OE and not needed for compiling imagemagick) Signed-off-by: Eric Bénard <eric@eukrea.com> --- .../imagemagick-6.4.4/PerlMagic_MakePatch.patch | 11 ------ .../imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 ++++++ .../imagemagick/imagemagick_6.4.4.bb | 38 -------------------- .../imagemagick/imagemagick_6.7.5.bb | 37 +++++++++++++++++++ 4 files changed, 48 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb