CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

emacs: fix dso build

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2012-07-31 01:31:24 +02:00
parent ac717c387a
commit b980ffb862
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meta-oe/recipes-support/emacs/emacs-23.1/fix.dso.build.patch Normal file
View File

@ -0,0 +1,39 @@
Upstream-Status: Backport
from bzr changeset 99307
=== modified file 'ChangeLog'
--- ChangeLog 2010-01-12 05:11:05 +0000
+++ ChangeLog 2010-01-12 16:25:08 +0000
@@ -1,3 +1,7 @@
+2010-01-12 Chong Yidong <cyd@stupidchicken.com>
+
+ * configure.in: Explicitly check for and link to -lXrender.
+
2010-01-12 Glenn Morris <rgm@gnu.org>
* INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
=== modified file 'configure.in'
--- configure.in 2010-01-04 05:35:18 +0000
+++ configure.in 2010-01-12 16:25:08 +0000
@@ -1984,12 +1984,17 @@
if test "x${with_xft}" != "xno"; then
PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
- if test "$HAVE_XFT" != no; then
+ ## Because xftfont.c uses XRenderQueryExtension, we also
+ ## need to link to -lXrender.
+ HAVE_XRENDER=no
+ AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
+ if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
OLD_CPPFLAGS="$CPPFLAGS"
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
CFLAGS="$CFLAGS $XFT_CFLAGS"
+ XFT_LIBS="-lXrender $XFT_LIBS"
LIBS="$XFT_LIBS $LIBS"
AC_CHECK_HEADER(X11/Xft/Xft.h,
AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))

4
meta-oe/recipes-support/emacs/emacs_23.1.bb
View File

@ -3,6 +3,8 @@ require emacs.inc
SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \
file://use-qemu.patch \
file://nostdlib-unwind.patch \
file://configure.in.lost.backslashes.patch"
file://configure.in.lost.backslashes.patch \
file://fix.dso.build.patch \
"
SRC_URI[tarball.md5sum] = "a620d4452769d04ad8864d662f34f8dd"
SRC_URI[tarball.sha256sum] = "a94cd46301f000d2d1dcd3fd7ef08ad952846d01ca5d4168b4ec3e38e857da47"