Re: 32-bit dependencies for Wine on Lion
Alexander Hansen <[email protected]>
| Newsgroups | gmane.os.apple.fink.core |
|---|---|
| Organization | Fink Gnome Core |
| Message-ID | <[email protected]> |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 2/5/12 2:48 PM, Alexander Hansen wrote: > I've taken the liberty of making some updates to libpng15-32bit > and freetype219-32bit. A common change to both was to use > %p/lib/i386 as the library directory--I think I had Linux on the > brain when I said "lib32". By doing this via the --libdir > configure parameter, the install_name automatically gets set > correctly, as does the library information encoded in the .la and > .pc files. > > I also removed the Conflicts/Replaces *x86 entries, since those > were never released into the distribution. > > Specific notes: > > libpng15-32bit: There's no reason to recycle the headers from > libpng15 for packages that use libpng15-32bit. In fact, since > there wasn't an explicit dependency, it would have been possible > for a build to use libpng14's or libpng3's, and that wouldn't work. > As I've mentioned, it's more standard and cleaner just to have > libpng15-32bit Conflict/Replace every other libpng*, and vice > versa. And if you do that, the libpng15-config script can stay in > the PATH, making it easier to use _this_ package. > > $ dpkg -L libpng15-32bit /. /sw /sw/bin /sw/bin/libpng15-config > /sw/include /sw/include/libpng15 /sw/include/libpng15/png.h > /sw/include/libpng15/pngconf.h /sw/include/libpng15/pnglibconf.h > /sw/lib /sw/lib/i386 /sw/lib/i386/libpng15.a > /sw/lib/i386/libpng15.la /sw/lib/i386/pkgconfig > /sw/lib/i386/pkgconfig/libpng15.pc /sw/share /sw/share/doc > /sw/share/doc/libpng15-32bit /sw/share/doc/libpng15-32bit/ANNOUNCE > /sw/share/doc/libpng15-32bit/CHANGES > /sw/share/doc/libpng15-32bit/INSTALL > /sw/share/doc/libpng15-32bit/LICENSE > /sw/share/doc/libpng15-32bit/README > /sw/share/doc/libpng15-32bit/TODO /sw/share/man /sw/share/man/man3 > /sw/share/man/man3/libpng.3 /sw/share/man/man3/libpngpf.3 > /sw/share/man/man5 /sw/share/man/man5/png.5 /sw/bin/libpng-config > /sw/include/png.h /sw/include/pngconf.h /sw/include/pnglibconf.h > /sw/lib/i386/libpng.a /sw/lib/i386/libpng.dylib > /sw/lib/i386/libpng.la /sw/lib/i386/libpng15.dylib > /sw/lib/i386/pkgconfig/libpng.pc > > $ dpkg -L libpng15-32bit-shlibs /. /sw /sw/lib /sw/lib/i386 > /sw/lib/i386/libpng15.15.dylib /sw/share /sw/share/doc > /sw/share/doc/libpng15-32bit-shlibs > /sw/share/doc/libpng15-32bit-shlibs/ANNOUNCE > /sw/share/doc/libpng15-32bit-shlibs/CHANGES > /sw/share/doc/libpng15-32bit-shlibs/INSTALL > /sw/share/doc/libpng15-32bit-shlibs/LICENSE > /sw/share/doc/libpng15-32bit-shlibs/README > /sw/share/doc/libpng15-32bit-shlibs/TODO > > > freetype219-32bit: As dmacks pointed out, freetype219 had a > complicated past. I've made some changes to allow > freetype219-32bit to start anew. :-) With Conflicts/Replaces > freetype219 (among others) we can leave freetype-config in the > PATH, for ease of use by other packages that may want this. > > $ dpkg -L freetype219-32bit /. /sw /sw/bin /sw/bin/freetype-config > /sw/include /sw/include/freetype2 /sw/include/freetype2/freetype > /sw/include/freetype2/freetype/config > /sw/include/freetype2/freetype/config/ftconfig.h > /sw/include/freetype2/freetype/config/ftheader.h > /sw/include/freetype2/freetype/config/ftmodule.h > /sw/include/freetype2/freetype/config/ftoption.h > /sw/include/freetype2/freetype/config/ftstdlib.h > /sw/include/freetype2/freetype/freetype.h > /sw/include/freetype2/freetype/ftadvanc.h > /sw/include/freetype2/freetype/ftbbox.h > /sw/include/freetype2/freetype/ftbdf.h > /sw/include/freetype2/freetype/ftbitmap.h > /sw/include/freetype2/freetype/ftcache.h > /sw/include/freetype2/freetype/ftchapters.h > /sw/include/freetype2/freetype/ftcid.h > /sw/include/freetype2/freetype/fterrdef.h > /sw/include/freetype2/freetype/fterrors.h > /sw/include/freetype2/freetype/ftgasp.h > /sw/include/freetype2/freetype/ftglyph.h > /sw/include/freetype2/freetype/ftgxval.h > /sw/include/freetype2/freetype/ftgzip.h > /sw/include/freetype2/freetype/ftimage.h > /sw/include/freetype2/freetype/ftincrem.h > /sw/include/freetype2/freetype/ftlcdfil.h > /sw/include/freetype2/freetype/ftlist.h > /sw/include/freetype2/freetype/ftlzw.h > /sw/include/freetype2/freetype/ftmac.h > /sw/include/freetype2/freetype/ftmm.h > /sw/include/freetype2/freetype/ftmodapi.h > /sw/include/freetype2/freetype/ftmoderr.h > /sw/include/freetype2/freetype/ftotval.h > /sw/include/freetype2/freetype/ftoutln.h > /sw/include/freetype2/freetype/ftpfr.h > /sw/include/freetype2/freetype/ftrender.h > /sw/include/freetype2/freetype/ftsizes.h > /sw/include/freetype2/freetype/ftsnames.h > /sw/include/freetype2/freetype/ftstroke.h > /sw/include/freetype2/freetype/ftsynth.h > /sw/include/freetype2/freetype/ftsystem.h > /sw/include/freetype2/freetype/fttrigon.h > /sw/include/freetype2/freetype/fttypes.h > /sw/include/freetype2/freetype/ftwinfnt.h > /sw/include/freetype2/freetype/ftxf86.h > /sw/include/freetype2/freetype/t1tables.h > /sw/include/freetype2/freetype/ttnameid.h > /sw/include/freetype2/freetype/tttables.h > /sw/include/freetype2/freetype/tttags.h > /sw/include/freetype2/freetype/ttunpat.h /sw/include/ft2build.h > /sw/lib /sw/lib/i386 /sw/lib/i386/libfreetype.la > /sw/lib/i386/pkgconfig /sw/lib/i386/pkgconfig/freetype2.pc > /sw/share /sw/share/aclocal /sw/share/aclocal/freetype2.m4 > /sw/share/doc /sw/share/doc/freetype219-32bit > /sw/share/doc/freetype219-32bit/ChangeLog > /sw/share/doc/freetype219-32bit/ChangeLog.20 > /sw/share/doc/freetype219-32bit/ChangeLog.21 > /sw/share/doc/freetype219-32bit/ChangeLog.22 > /sw/share/doc/freetype219-32bit/ChangeLog.23 > /sw/share/doc/freetype219-32bit/LICENSE.TXT > /sw/share/doc/freetype219-32bit/README > /sw/lib/i386/libfreetype.dylib > > $ dpkg -L freetype219-32bit-shlibs /. /sw /sw/lib /sw/lib/i386 > /sw/lib/i386/libfreetype.6.dylib /sw/share /sw/share/doc > /sw/share/doc/freetype219-32bit-shlibs > /sw/share/doc/freetype219-32bit-shlibs/ChangeLog > /sw/share/doc/freetype219-32bit-shlibs/ChangeLog.20 > /sw/share/doc/freetype219-32bit-shlibs/ChangeLog.21 > /sw/share/doc/freetype219-32bit-shlibs/ChangeLog.22 > /sw/share/doc/freetype219-32bit-shlibs/ChangeLog.23 > /sw/share/doc/freetype219-32bit-shlibs/LICENSE.TXT > /sw/share/doc/freetype219-32bit-shlibs/README > > > wine-32bit doesn't build here, due to the use of compilers that > are unavailable on Xcode 4.2.x (as is, it might well work on > 10.6/x86_64/Xcode 3.2.6, though, if the listed xcode dependency > were removed). > > I'm suggesting the following changes currently, though: > > diff -r1.1 wine-32bit.info 3c3 < Revision: 3 --- >> Revision: 4 > 32c32 < glib2-dev, xcode (>= 4.1-1), libpng15-32bit, libpng15 --- >> glib2-dev, xcode (= 4.1-1), libpng15-32bit (>=1.5.5-2) > 36c36 < freetype219-32bit-shlibs, giflib-shlibs | > libungif-shlibs, --- >> freetype219-32bit-shlibs (>=2.4.4-4), giflib-shlibs | >> libungif-shlibs, > 40c40 < glib2-shlibs, libpng15-32bit-shlibs --- >> glib2-shlibs, libpng15-32bit-shlibs (>=1.5.5-2) > 49c49 < wine-stable, libpng15-x86 --- >> wine-stable > 52c52 < wine-stable, libpng15-x86 --- >> wine-stable > 77c77 < export LDFLAGS="-L%p/lib32 -L/%p/lib/system-openssl/lib > -Wl,-no_pie" --- >> export LDFLAGS="-L%p/lib/i386 -L/%p/lib/system-openssl/lib >> -Wl,-no_pie" > > > Any objections to my making these changes? Wine-32bit is way broken with Xcode 4.3, by the way, since there's no /Developer folder. - -- Alexander Hansen, Ph.D. Fink User Liaison http://finkakh.wordpress.com/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk89yWAACgkQB8UpO3rKjQ8GwgCeMy15Z69HqMtdvoGoCFvA2SIU uIsAn0tVu7uVyW8CY0b4x1mDJXxwdWm1 =CvBk -----END PGP SIGNATURE----- ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ fink-core mailing list [email protected] List archive: http://news.gmane.org/gmane.os.apple.fink.core Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-core