diff options
author | Harald van Dijk <truedfx@gentoo.org> | 2005-09-19 21:28:28 +0000 |
---|---|---|
committer | Harald van Dijk <truedfx@gentoo.org> | 2005-09-19 21:28:28 +0000 |
commit | 5e43a00e49d314defa0a4088d4eab5ac958263b5 (patch) | |
tree | 2f4c5f785c389b9d920806b39ebf9d48ecc9fbed /dev-libs | |
parent | Fix librep libtool mess instead of continuing to try to work around it (diff) | |
download | historical-5e43a00e49d314defa0a4088d4eab5ac958263b5.tar.gz historical-5e43a00e49d314defa0a4088d4eab5ac958263b5.tar.bz2 historical-5e43a00e49d314defa0a4088d4eab5ac958263b5.zip |
Fix librep libtool mess instead of continuing to try to work around it
Package-Manager: portage-1.589-cvs
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/librep/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/librep/Manifest | 11 | ||||
-rw-r--r-- | dev-libs/librep/files/libtool.patch | 86 | ||||
-rw-r--r-- | dev-libs/librep/librep-0.17-r2.ebuild | 5 |
4 files changed, 99 insertions, 9 deletions
diff --git a/dev-libs/librep/ChangeLog b/dev-libs/librep/ChangeLog index d55431acc465..77786398c505 100644 --- a/dev-libs/librep/ChangeLog +++ b/dev-libs/librep/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/librep # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/ChangeLog,v 1.33 2005/09/15 12:48:24 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/ChangeLog,v 1.34 2005/09/19 21:28:28 truedfx Exp $ + + 19 Sep 2005; Harald van Dijk <truedfx@gentoo.org> +files/libtool.patch, + librep-0.17-r2.ebuild: + Fix librep libtool mess instead of continuing to try to work around it 15 Sep 2005; Harald van Dijk <truedfx@gentoo.org> +files/rep_file_fdopen.patch, librep-0.17-r1.ebuild, diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest index b16d61c689d2..55cb295d0dc1 100644 --- a/dev-libs/librep/Manifest +++ b/dev-libs/librep/Manifest @@ -1,12 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 39a3ca32061fd3e5b60ca798870eb4e1 ChangeLog 4718 +MD5 758445e270ba95a3f5b8c40beb15b26c ChangeLog 4891 MD5 cb0797d43ae9e4509e2103ffa7426a7d librep-0.16.2.ebuild 1224 MD5 2b12c87768b0043836c8726d237f1881 librep-0.17-r1.ebuild 1385 -MD5 5d155c409a7cb138de6c7b9189b2a129 librep-0.17-r2.ebuild 1385 +MD5 886a431c62f6a8149b34adf8dbebaabf librep-0.17-r2.ebuild 1294 MD5 480474336414d1a7f92e33f628fb9a8e librep-0.17.ebuild 1281 MD5 aabaa608acb879f04a961ad9e6d8e19c metadata.xml 233 +MD5 4d33f5e870cd659d295eaa8c1a8948da files/libtool.patch 3037 MD5 f3efabdde310e7d8da74859ea2af221c files/digest-librep-0.16.2 65 MD5 07a234e62724c3d45a1b69f1c04cd0a9 files/digest-librep-0.17 64 MD5 07a234e62724c3d45a1b69f1c04cd0a9 files/digest-librep-0.17-r1 64 @@ -16,7 +17,7 @@ MD5 ad28e56472f07a05a704ecfc7cf58434 files/rep_file_fdopen.patch 219 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDKW2GwnQyISwouHwRAp/7AJ9GXWnUAJz52LBtnha3EkedFrM+aACgvI/U -LxccLH2dh8XpjpU8pB7IxEQ= -=KPo1 +iD8DBQFDLy1VwnQyISwouHwRAp78AKCP+XnszF8kRCQLyrv6wLgMyqisMQCguSjX +2pkzh/UDI00diNejG80wFsg= +=lYU2 -----END PGP SIGNATURE----- diff --git a/dev-libs/librep/files/libtool.patch b/dev-libs/librep/files/libtool.patch new file mode 100644 index 000000000000..06f8ae834338 --- /dev/null +++ b/dev-libs/librep/files/libtool.patch @@ -0,0 +1,86 @@ +--- librep-0.17.orig/intl/Makefile.in ++++ librep-0.17/intl/Makefile.in +@@ -77,7 +77,7 @@ + .c.o: + $(COMPILE) $< + .c.lo: +- $(LIBTOOL) --mode=compile $(COMPILE) $< ++ $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) $< + + INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib + +@@ -92,7 +92,7 @@ + $(RANLIB) $@ + + libintl.la: $(OBJECTS) +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ + -version-info 1:0 -rpath $(libdir) + + ../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot +--- librep-0.17.orig/Makedefs.in ++++ librep-0.17/Makedefs.in +@@ -96,11 +96,11 @@ + + # Rule for libtool controlled C objects + %.lo : %.c +- $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $< ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) $< + + # Rule for dlopen'able C objects + %.la : %.c +- $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $< ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) $< + $(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $*.lo + + # Build dependancy files from C source files. +--- librep-0.17.orig/rules.mk.sh ++++ librep-0.17/rules.mk.sh +@@ -19,7 +19,7 @@ + # foo.la : foo.lo bar.lo + # \$(rep_DL_LD) link-opts... + +-rep_DL_LD=\$(rep_LIBTOOL) --mode=link \$(CC) -avoid-version -module \ ++rep_DL_LD=\$(rep_LIBTOOL) --mode=link --tag=CC \$(CC) -avoid-version -module \ + -rpath \$(rpath_repcommonexecdir) + + rep_DL_INSTALL=\$(rep_LIBTOOL) --mode=install \$(INSTALL) +@@ -27,6 +27,6 @@ + + # Rule for libtool controlled C objects + %.lo : %.c +- \$(rep_LIBTOOL) --mode=compile \$(CC) -c \$(CPPFLAGS) \$(CFLAGS) \$< ++ \$(rep_LIBTOOL) --mode=compile --tag=CC \$(CC) -c \$(CPPFLAGS) \$(CFLAGS) \$< + + EOF +--- librep-0.17.orig/src/Makefile.in ++++ librep-0.17/src/Makefile.in +@@ -56,16 +56,16 @@ + all : librep.la $(DL_OBJS) check-dl rep rep-config rep-remote rep-xgettext .libexec + + librep.la : $(OBJS) $(LIBOBJS) $(ALLOCA) +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) \ + -version-info $(libversion) -export-symbols librep.sym \ + -o $@ $^ -rpath $(libdir) $(LIBS) $(GMP_LIBS) + + rep : $(REP_OBJS) $(EXTRA_LIBOBJS) librep.la +- $(LIBTOOL) --mode=link $(CC) -export-dynamic $(CPPFLAGS) $(CFLAGS) -o $@ \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -export-dynamic $(CPPFLAGS) $(CFLAGS) -o $@ \ + $(REP_OBJS) librep.la $(EXTRA_LIBOBJS) $(LIBS) $(GMP_LIBS) + + srep : $(REP_OBJS) $(EXTRA_LIBOBJS) librep.la +- $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(CPPFLAGS) $(CFLAGS) -o $@ \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -static -export-dynamic $(CPPFLAGS) $(CFLAGS) -o $@ \ + $(REP_OBJS) librep.la $(EXTRA_LIBOBJS) $(LIBS) $(GMP_LIBS) + + rep-remote : rep-remote.c +@@ -132,7 +132,7 @@ + chmod +x $@ + + repdoc : repdoc.o +- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $^ $(GDBM_LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $^ $(GDBM_LIBS) + + sdbm.la : $(SDBM_LOBJS) repsdbm.lo + $(rep_DL_LD) $(LDFLAGS) -o $@ $^ diff --git a/dev-libs/librep/librep-0.17-r2.ebuild b/dev-libs/librep/librep-0.17-r2.ebuild index 9645ca2a6b7c..85165dbf52cd 100644 --- a/dev-libs/librep/librep-0.17-r2.ebuild +++ b/dev-libs/librep/librep-0.17-r2.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/dev-libs/librep/librep-0.17-r2.ebuild,v 1.2 2005/09/15 12:48:24 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/librep-0.17-r2.ebuild,v 1.3 2005/09/19 21:28:28 truedfx Exp $ inherit eutils libtool toolchain-funcs multilib @@ -22,6 +22,7 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/libtool.patch" epatch "${FILESDIR}/rep_file_fdopen.patch" sed -i -e '7s/AM_PATH_REP/[&]/' rep.m4 || die "sed failed" elibtoolize || die "elibtoolize failed" @@ -42,8 +43,6 @@ src_compile() { src_install() { make DESTDIR="${D}" install || die "make install failed" - dosym ../../../bin/libtool /usr/$(get_libdir)/rep/${CHOST}/libtool - fowners -h root:0 /usr/$(get_libdir)/rep/${CHOST}/libtool dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO TREE docinto doc dodoc doc/* |