From b9619a666a409315c0a77bb7ade13e310746c889 Mon Sep 17 00:00:00 2001 From: Mamoru Komachi Date: Sun, 10 Oct 2004 17:30:48 +0000 Subject: [PATCH] Fixed shared libraries compilation on macos. This closes bug #60580. --- dev-libs/glib/ChangeLog | 5 ++++- dev-libs/glib/Manifest | 30 +++++++++++++++++++---------- dev-libs/glib/glib-1.2.10-r5.ebuild | 18 +++++++---------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 223664daa4a9..299b9db14dc1 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/glib # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.99 2004/10/10 15:47:33 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.100 2004/10/10 17:30:48 usata Exp $ + + 11 Oct 2004; Mamoru KOMACHI glib-1.2.10-r5.ebuild: + Fixed shared libraries compilation on macos. This closes bug #60580. 10 Oct 2004; Bryan Østergaard glib-2.4.6.ebuild: Stable on alpha. diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index e84bf695469a..7508ff2051b9 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,17 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 207495fe01eb3a9fc3da487d435539e3 ChangeLog 12416 +MD5 8da022659cfa1be83f1374f218688b16 glib-1.2.10-r5.ebuild 2209 MD5 fd2f66a83b030b479ef059a02996017c glib-2.4.1.ebuild 997 -MD5 5d838e6c24b33f545fc2f507243b5ad4 glib-1.2.10-r5.ebuild 2284 -MD5 763fbfdd5ff1caf6ebe56f211473e930 glib-2.4.7.ebuild 1381 +MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046 MD5 cba6ad1f65d64c20d4e206ad643efd56 glib-2.4.4.ebuild 1388 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 945ef481360b0a5be38b5208ed1be611 glib-2.4.6.ebuild 1379 MD5 3021290a955dbc4d4a88418cf4ee7194 glib-2.4.5.ebuild 1370 -MD5 65815c21c18faab5663c2ccd2c478171 ChangeLog 12272 -MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046 +MD5 945ef481360b0a5be38b5208ed1be611 glib-2.4.6.ebuild 1379 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 763fbfdd5ff1caf6ebe56f211473e930 glib-2.4.7.ebuild 1381 +MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63 MD5 9409a054bd000d556e84987a855b10f0 files/digest-glib-2.4.1 64 -MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64 +MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64 MD5 524c2c1cfb5ab43d0b402cefb8da4a9a files/digest-glib-2.4.4 64 -MD5 c2049695996219f5b8c81ad1b89f40f0 files/digest-glib-2.4.7 64 MD5 4f50760a1f3a23a715d8c07ff936bcf6 files/digest-glib-2.4.5 64 -MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63 +MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64 MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008 -MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64 +MD5 c2049695996219f5b8c81ad1b89f40f0 files/digest-glib-2.4.7 64 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.4 (Darwin) + +iD8DBQFBaXHiVWNWqTUmv+0RAkaHAJwNM163NERmFy247nPzBqljONCiUgCgtfKL +JoEPcGRuicD1JjUtL1Uya9A= +=TAT9 +-----END PGP SIGNATURE----- diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild index db9fa7796d27..081d37af3090 100644 --- a/dev-libs/glib/glib-1.2.10-r5.ebuild +++ b/dev-libs/glib/glib-1.2.10-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.32 2004/09/17 01:56:05 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.33 2004/10/10 17:30:48 usata Exp $ inherit libtool gnuconfig flag-o-matic eutils @@ -25,15 +25,7 @@ src_unpack() { } src_compile() { - # Fixes some strange sed-, libtool- and ranlib-errors on - # Mac OS X - if use macos; then - glibtoolize - elif use ppc-macos; then - glibtoolize - else - elibtoolize - fi + elibtoolize # elibtoolize breaks (see brad's comments below, left here for # historical purposes) but libtoolize won't work either because @@ -75,5 +67,9 @@ src_install() { dohtml -r docs cd ${D}/usr/$(get_libdir) || die - chmod 755 libgmodule-1.2.so.* + if use ppc-macos || use macos ; then + chmod 755 libgmodule-1.2.*.dylib + else + chmod 755 libgmodule-1.2.so.* + fi } -- 2.26.2