Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 66439 Details for
Bug 103149
imagemagick: fix for #69705 not amd64 friendly
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
imagemagick-libtool-amd64.diff
imagemagick-libtool-amd64.diff (text/plain), 5.85 KB, created by
Marcelo Goes (RETIRED)
on 2005-08-20 15:58:23 UTC
(
hide
)
Description:
imagemagick-libtool-amd64.diff
Filename:
MIME Type:
Creator:
Marcelo Goes (RETIRED)
Created:
2005-08-20 15:58:23 UTC
Size:
5.85 KB
patch
obsolete
>Index: imagemagick-6.1.8.8.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild,v >retrieving revision 1.14 >diff -u -b -B -r1.14 imagemagick-6.1.8.8.ebuild >--- imagemagick-6.1.8.8.ebuild 21 Feb 2005 16:50:33 -0000 1.14 >+++ imagemagick-6.1.8.8.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -76,11 +76,13 @@ > emake || die "compile problem" > } > >-src_install() { >- make DESTDIR=${D} install >- >+pkg_preinst() { > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.0.4.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.0.4.ebuild,v >retrieving revision 1.11 >diff -u -b -B -r1.11 imagemagick-6.2.0.4.ebuild >--- imagemagick-6.2.0.4.ebuild 1 Apr 2005 05:02:51 -0000 1.11 >+++ imagemagick-6.2.0.4.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -75,11 +75,13 @@ > emake || die "compile problem" > } > >-src_install() { >- make DESTDIR=${D} install >- >+pkg_preinst() { > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.0.6.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.0.6.ebuild,v >retrieving revision 1.1 >diff -u -b -B -r1.1 imagemagick-6.2.0.6.ebuild >--- imagemagick-6.2.0.6.ebuild 10 Mar 2005 21:33:30 -0000 1.1 >+++ imagemagick-6.2.0.6.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -75,11 +75,13 @@ > emake || die "compile problem" > } > >-src_install() { >- make DESTDIR=${D} install >- >+pkg_preinst() { > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.1.5.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.1.5.ebuild,v >retrieving revision 1.2 >diff -u -b -B -r1.2 imagemagick-6.2.1.5.ebuild >--- imagemagick-6.2.1.5.ebuild 9 May 2005 22:21:59 -0000 1.2 >+++ imagemagick-6.2.1.5.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -97,7 +96,11 @@ > fi > > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.1.5-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.1.5-r1.ebuild,v >retrieving revision 1.1 >diff -u -b -B -r1.1 imagemagick-6.2.1.5-r1.ebuild >--- imagemagick-6.2.1.5-r1.ebuild 18 May 2005 18:24:31 -0000 1.1 >+++ imagemagick-6.2.1.5-r1.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -98,7 +98,11 @@ > fi > > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.2.0.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.0.ebuild,v >retrieving revision 1.9 >diff -u -b -B -r1.9 imagemagick-6.2.2.0.ebuild >--- imagemagick-6.2.2.0.ebuild 9 May 2005 22:21:59 -0000 1.9 >+++ imagemagick-6.2.2.0.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -97,7 +97,11 @@ > fi > > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.2.0-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.0-r1.ebuild,v >retrieving revision 1.1 >diff -u -b -B -r1.1 imagemagick-6.2.2.0-r1.ebuild >--- imagemagick-6.2.2.0-r1.ebuild 18 May 2005 18:24:31 -0000 1.1 >+++ imagemagick-6.2.2.0-r1.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -98,7 +98,11 @@ > fi > > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.2.3.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.3.ebuild,v >retrieving revision 1.8 >diff -u -b -B -r1.8 imagemagick-6.2.2.3.ebuild >--- imagemagick-6.2.2.3.ebuild 16 May 2005 12:03:35 -0000 1.8 >+++ imagemagick-6.2.2.3.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -97,7 +97,11 @@ > fi > > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod >Index: imagemagick-6.2.2.3-r1.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild,v >retrieving revision 1.5 >diff -u -b -B -r1.5 imagemagick-6.2.2.3-r1.ebuild >--- imagemagick-6.2.2.3-r1.ebuild 5 Aug 2005 01:41:25 -0000 1.5 >+++ imagemagick-6.2.2.3-r1.ebuild 20 Aug 2005 22:12:41 -0000 >@@ -99,7 +99,11 @@ > fi > > #bug 69705 >- rm -f ${D}/usr/lib/libltdl* >+ if ! use amd64; then >+ rm -f ${D}/usr/lib/libltdl.{la,a} >+ else >+ rm -f ${D}/usr/lib64/libltdl.{la,a} >+ fi > > #bug 73464 and 78740 > rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 103149
: 66439