diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-03-23 14:51:28 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-03-23 14:51:28 +0000 |
| commit | 3524b860ef2f608497a266509ae6683c838287dd (patch) | |
| tree | d3e25743221b9a5bf67da76d7b5d72a6755677ca /media-libs/freetype | |
| parent | Taking over maintenance (diff) | |
| download | gentoo-2-3524b860ef2f608497a266509ae6683c838287dd.tar.gz gentoo-2-3524b860ef2f608497a266509ae6683c838287dd.tar.bz2 gentoo-2-3524b860ef2f608497a266509ae6683c838287dd.zip | |
Respect LDFLAGS, bug #263131 thank Davide Pesavento for report.
(Portage version: 2.2_rc26/cvs/Linux i686)
Diffstat (limited to 'media-libs/freetype')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/freetype/files/freetype-1.4_pre20080316-LDLFAGS.patch | 39 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-1.4_pre20080316-r1.ebuild | 20 |
3 files changed, 58 insertions, 8 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 0c782b769ab0..9fbbddf6092e 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.223 2009/03/18 14:56:50 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.224 2009/03/23 14:51:28 pva Exp $ + + 23 Mar 2009; Peter Volkov <pva@gentoo.org> + +files/freetype-1.4_pre20080316-LDLFAGS.patch, + freetype-1.4_pre20080316-r1.ebuild: + Respect LDFLAGS, bug #263131 thank Davide Pesavento for report. 18 Mar 2009; Brent Baude <ranger@gentoo.org> freetype-2.3.8.ebuild: Marking freetype-2.3.8 ppc for bug 260288 diff --git a/media-libs/freetype/files/freetype-1.4_pre20080316-LDLFAGS.patch b/media-libs/freetype/files/freetype-1.4_pre20080316-LDLFAGS.patch new file mode 100644 index 000000000000..ae15e95e55b6 --- /dev/null +++ b/media-libs/freetype/files/freetype-1.4_pre20080316-LDLFAGS.patch @@ -0,0 +1,39 @@ +=== modified file 'configure.in' +--- configure.in 2009-03-23 12:17:31 +0000 ++++ configure.in 2009-03-23 14:15:09 +0000 +@@ -66,7 +66,7 @@ + dnl NLS/gettext nightmare^H^H^H^H^H^H^H^H^H^H support... + + if test "$USE_NLS" = "yes"; then +- AC_REQUIRE([AC_PROG_MAKE_SET]) ++ AC_PROG_MAKE_SET + AC_CHECK_HEADERS(locale.h) + AC_CHECK_FUNCS(setlocale) + AC_SUBST(HAVE_LOCALE_H) + +=== modified file 'freetype1-contrib/ttf2bdf/Makefile.in' +--- freetype1-contrib/ttf2bdf/Makefile.in 2009-03-23 12:17:31 +0000 ++++ freetype1-contrib/ttf2bdf/Makefile.in 2009-03-23 12:25:17 +0000 +@@ -52,7 +52,7 @@ + all: ttf2bdf + + ttf2bdf: $(OBJS) +- $(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o ttf2bdf $(OBJS) $(LIBS) ++ $(PURIFY) $(CC) $(LDFLAGS) $(STATIC) $(CFLAGS) -o ttf2bdf $(OBJS) $(LIBS) + + clean: + $(RM) -f *.o *BAK *CKP *~ a.out core + +=== modified file 'lib/arch/unix/Makefile.in' +--- lib/arch/unix/Makefile.in 2009-03-23 12:17:31 +0000 ++++ lib/arch/unix/Makefile.in 2009-03-23 12:26:37 +0000 +@@ -205,7 +205,7 @@ + $(SRC_S) + + libttf.la: $(LIB_FILES) +- $(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \ ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libttf.la $(LIB_FILES) \ + -rpath $(libdir) \ + -version-info $(version_info) $(FT_LIBS) + + diff --git a/media-libs/freetype/freetype-1.4_pre20080316-r1.ebuild b/media-libs/freetype/freetype-1.4_pre20080316-r1.ebuild index 3e269dc9764c..875158938bde 100644 --- a/media-libs/freetype/freetype-1.4_pre20080316-r1.ebuild +++ b/media-libs/freetype/freetype-1.4_pre20080316-r1.ebuild @@ -1,8 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r1.ebuild,v 1.7 2008/08/20 17:26:51 vapier Exp $ - -WANT_AUTOCONF="2.1" +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r1.ebuild,v 1.8 2009/03/23 14:51:28 pva Exp $ inherit autotools eutils libtool multilib @@ -42,13 +40,21 @@ src_unpack() { # add DESTDIR support to contrib Makefiles epatch "${FILESDIR}"/freetype-1.4_pre-contrib-destdir.patch - # Fix for CVE 2008-1808, bug 225851 - epatch "${FILESDIR}"/${P}-CVE-2008-1808.patch + epatch "${FILESDIR}"/${P}-CVE-2008-1808.patch #225851 + epatch "${FILESDIR}"/${P}-LDLFAGS.patch #263131 # disable tests (they don't compile) sed -i -e "/^all:/ s:tttest ::" Makefile.in - eautoreconf + rm aclocal.m4 # Force recreation + # Copying this code from autotools.eclass but avoid autoheader call... + eaclocal + if ${LIBTOOLIZE:-libtoolize} -n --install >& /dev/null ; then + _elibtoolize --copy --force --install + else + _elibtoolize --copy --force + fi + eautoconf elibtoolize # contrib isn't compatible with autoconf-2.13 |