[oe-commits] org.oe.dev packages/gnome/gnome-vfs_2.16.3.bb : remove kerberos detection to avoid host includes
philippe commit
openembedded-commits at lists.openembedded.org
Fri Jan 5 18:29:28 UTC 2007
packages/gnome/gnome-vfs_2.16.3.bb : remove kerberos detection to avoid host includes
* added patch gnome-vfs-no-kerberos.patch that removes the test from configure.in
* bumped to r1
Author: philippe at openembedded.org
Branch: org.openembedded.dev
Revision: 00349fdb43ae1a7befdd9ed46ef8b8906eb2ad90
ViewMTN: http://monotone.openembedded.org/revision.psp?id=00349fdb43ae1a7befdd9ed46ef8b8906eb2ad90
Files:
1
packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch
packages/gnome/gnome-vfs_2.16.3.bb
Diffs:
#
# mt diff -r74b62afa9d9b5f127553b347e236dccae5e5f546 -r00349fdb43ae1a7befdd9ed46ef8b8906eb2ad90
#
#
#
# add_file "packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch"
# content [860446c945edbfcc96fafaaca0498b642e6a22dc]
#
# patch "packages/gnome/gnome-vfs_2.16.3.bb"
# from [958de1edff4ff091c64baed98af5409038a4d534]
# to [c07ee5629af998561689aab9fc73d1e5eaada032]
#
============================================================
--- packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch 860446c945edbfcc96fafaaca0498b642e6a22dc
+++ packages/gnome/gnome-vfs-2.16.3/gnome-vfs-no-kerberos.patch 860446c945edbfcc96fafaaca0498b642e6a22dc
@@ -0,0 +1,51 @@
+removes kerberos completely to avoid conflicts with installed kerberos
+--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
++++ configure.in 2007-01-05 19:42:56.604261797 +0200
+@@ -436,47 +436,6 @@
+ ])
+ AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
+ AC_SUBST(CDDA_LIBS)
+-
+-dnl GSSAPI
+-dnl Check for Kerberos installation
+-have_gssapi=no
+-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-
+-if test "x$KRB5_CONFIG" != "xnone"; then
+- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-
+- saved_CPPFLAGS="$CPPFLAGS"
+- saved_LIBS="$LIBS"
+- LIBS="$LIBS $GSSAPI_LIBS"
+- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+- # MIT and Heimdal put gssapi.h in different places
+- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
+- AC_CHECK_FUNCS(gss_init_sec_context, [
+- AC_MSG_NOTICE([GSSAPI authentication support enabled])
+- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
+- AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
+- have_gssapi=yes
+-
+- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
+- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
+- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name,
+- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
+- ], [
+- #ifdef HAVE_GSSAPI_GSSAPI_H
+- #include <gssapi/gssapi.h>
+- #else
+- #include <gssapi.h>
+- #endif
+- ])
+- ])
+- break
+- ])
+- LIBS="$saved_LIBS"
+- CPPFLAGS="$saved_CPPFLAGS"
+-fi
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPI_CFLAGS)
+
+ dnl ******************************
+ dnl http-method (neon checks)
============================================================
--- packages/gnome/gnome-vfs_2.16.3.bb 958de1edff4ff091c64baed98af5409038a4d534
+++ packages/gnome/gnome-vfs_2.16.3.bb c07ee5629af998561689aab9fc73d1e5eaada032
@@ -1,8 +1,8 @@ RRECOMMENDS = "gnome-vfs-plugin-file gno
LICENSE = "GPL"
DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
-PR = "r0"
+PR = "r1"
inherit gnome
@@ -10,7 +10,8 @@ RRPEPLACES = "gnome-vfs-dbus"
PROVIDES = "gnome-vfs-plugin-dbus"
RRPEPLACES = "gnome-vfs-dbus"
-SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+ file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
EXTRA_OECONF = " \
--disable-openssl \
More information about the Openembedded-commits
mailing list