diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-31 03:46:49 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-07-31 03:47:15 +0200 |
commit | d028be056c973b9235269a678d983ba6d244fd5d (patch) | |
tree | 99fe2b6a02f2583afe2a96bf5f493fb5248a5243 /meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch | |
parent | 72e02b4625dceb0cc72e1edfc28215786c7de63a (diff) | |
download | meta-openembedded-d028be056c973b9235269a678d983ba6d244fd5d.tar.gz |
emacs: drop older version 23.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch')
-rw-r--r-- | meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch b/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch deleted file mode 100644 index 0396c0ca4..000000000 --- a/meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | from bzr changeset 99307 | ||
4 | |||
5 | === modified file 'ChangeLog' | ||
6 | --- ChangeLog 2010-01-12 05:11:05 +0000 | ||
7 | +++ ChangeLog 2010-01-12 16:25:08 +0000 | ||
8 | @@ -1,3 +1,7 @@ | ||
9 | +2010-01-12 Chong Yidong <cyd@stupidchicken.com> | ||
10 | + | ||
11 | + * configure.in: Explicitly check for and link to -lXrender. | ||
12 | + | ||
13 | 2010-01-12 Glenn Morris <rgm@gnu.org> | ||
14 | |||
15 | * INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug | ||
16 | |||
17 | === modified file 'configure.in' | ||
18 | --- configure.in 2010-01-04 05:35:18 +0000 | ||
19 | +++ configure.in 2010-01-12 16:25:08 +0000 | ||
20 | @@ -1984,12 +1984,17 @@ | ||
21 | if test "x${with_xft}" != "xno"; then | ||
22 | |||
23 | PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no) | ||
24 | - if test "$HAVE_XFT" != no; then | ||
25 | + ## Because xftfont.c uses XRenderQueryExtension, we also | ||
26 | + ## need to link to -lXrender. | ||
27 | + HAVE_XRENDER=no | ||
28 | + AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes) | ||
29 | + if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then | ||
30 | OLD_CPPFLAGS="$CPPFLAGS" | ||
31 | OLD_CFLAGS="$CFLAGS" | ||
32 | OLD_LIBS="$LIBS" | ||
33 | CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" | ||
34 | CFLAGS="$CFLAGS $XFT_CFLAGS" | ||
35 | + XFT_LIBS="-lXrender $XFT_LIBS" | ||
36 | LIBS="$XFT_LIBS $LIBS" | ||
37 | AC_CHECK_HEADER(X11/Xft/Xft.h, | ||
38 | AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS)) | ||
39 | |||