From: Harald van Dijk Date: Mon, 19 Sep 2005 21:27:30 +0000 (+0000) Subject: Fix librep libtool mess instead of continuing to try to work around it X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ee8d2cdeb128a9704cf4c54fd828b706efba903;p=gentoo.git Fix librep libtool mess instead of continuing to try to work around it Package-Manager: portage-1.589-cvs --- diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog index 3baf5fd8ddbb..ac4389baab03 100644 --- a/x11-wm/sawfish/ChangeLog +++ b/x11-wm/sawfish/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/sawfish # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.59 2005/09/04 13:31:53 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.60 2005/09/19 21:27:30 truedfx Exp $ + + 19 Sep 2005; Harald van Dijk +files/libtool.patch, + sawfish-1.3.20050816.ebuild: + Fix librep libtool mess instead of continuing to try to work around it 04 Sep 2005; Harald van Dijk sawfish-1.3.20050816.ebuild: diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest index 8850d597f548..80120b74f0fa 100644 --- a/x11-wm/sawfish/Manifest +++ b/x11-wm/sawfish/Manifest @@ -5,8 +5,9 @@ MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252 MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017 MD5 38a41c33b244c5704ca3dec0a903ba61 sawfish-1.3.20040120-r1.ebuild 2560 MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700 -MD5 63438a5a5306ff41c1ff2d7fe1dde94c sawfish-1.3.20050816.ebuild 2772 -MD5 25e0172afad1cc90d6d01d1cfe3afa34 ChangeLog 9622 +MD5 348d700931fbea63760cc0b0a6efa744 sawfish-1.3.20050816.ebuild 2808 +MD5 78baadecf42f0ea46231f6cdca62d1fb ChangeLog 9801 +MD5 e1a647c4cdb92365506d533ac36c7f57 files/libtool.patch 798 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449 MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556 MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66 @@ -19,7 +20,7 @@ MD5 228430d4af4d182eca480e98af059875 files/digest-sawfish-1.3.20050816 74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDGvgXwnQyISwouHwRAsACAJ42D+JAyAGcnG2rUPTqAVR7D8yB9QCgiZzs -sz2RBm6D1wUZvgzN9NX4iAY= -=lfq0 +iD4DBQFDLy0cwnQyISwouHwRAh9UAKDE584QOCxn4YFuR5V6FEXjDNvKaQCY1hsQ +0QBWmdF9GJlyWkhp7G/hIA== +=xhVl -----END PGP SIGNATURE----- diff --git a/x11-wm/sawfish/files/libtool.patch b/x11-wm/sawfish/files/libtool.patch new file mode 100644 index 000000000000..ac2ea55d50ea --- /dev/null +++ b/x11-wm/sawfish/files/libtool.patch @@ -0,0 +1,20 @@ +--- sawfish.orig/src/Makefile.in ++++ sawfish/src/Makefile.in +@@ -43,7 +43,7 @@ + all : sawfish libclient.o $(DL_OBJS) .libexec gtk-style + + sawfish : $(OBJS) $(LIBOBJS) +- $(rep_LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) \ ++ $(rep_LIBTOOL) --mode=link --tag=CC $(CC) -export-dynamic $(LDFLAGS) \ + -o sawfish $(OBJS) $(LIBOBJS) $(REP_LIBS) $(PANGO_LIBS) \ + $(IMAGE_LIBS) $(X11_LIBS) $(EXTRA_X11_LIBS) $(LIBS) + +@@ -54,7 +54,7 @@ + $(rep_DL_LD) $(LDFLAGS) -o $@ $< $(ESD_LIBS) $(AUDIOFILE_LIBS) + + libclient_.lo : libclient.c +- $(rep_LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< ++ $(rep_LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< + + client.la : client.lo libclient_.lo + $(rep_DL_LD) $(LDFLAGS) -o $@ $^ $(X11_LIBS) $(REP_LIBS) $(LIBS) diff --git a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild index 3a5bbd4ae7a4..75ddd4c85cda 100644 --- a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild +++ b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.4 2005/09/04 13:31:53 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.5 2005/09/19 21:27:30 truedfx Exp $ # detect cvs snapshots; fex. 1.3.20040120 [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]] @@ -40,6 +40,7 @@ fi src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/libtool.patch" # This is for alpha, but there's no reason to restrict it gnuconfig_update }