diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-12-12 22:26:20 +0100 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-12-12 22:30:22 +0100 |
commit | 12fa826a7ffaa408d31e89c3e686e1c363f4b3bd (patch) | |
tree | d740457683a4bd310e221ff0883056338ea4668a /patches/eggdbus-0.6 | |
parent | 50c0e9376a564040fd3e8c7b949741fb90ce65cc (diff) | |
download | ptxdist-12fa826a7ffaa408d31e89c3e686e1c363f4b3bd.tar.gz ptxdist-12fa826a7ffaa408d31e89c3e686e1c363f4b3bd.tar.xz |
[eggdbus] added packet
Added eggdbus, which is a prerequisite for updating policy kit. While
being there, fixed cross compiling issues.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/eggdbus-0.6')
l--------- | patches/eggdbus-0.6/autogen.sh | 1 | ||||
-rw-r--r-- | patches/eggdbus-0.6/eggdbus-0.6-autotools.diff | 169 | ||||
-rw-r--r-- | patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff | 51 | ||||
-rw-r--r-- | patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff | 44 | ||||
-rw-r--r-- | patches/eggdbus-0.6/series | 3 |
5 files changed, 268 insertions, 0 deletions
diff --git a/patches/eggdbus-0.6/autogen.sh b/patches/eggdbus-0.6/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/eggdbus-0.6/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff b/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff new file mode 100644 index 000000000..e16eb1ca3 --- /dev/null +++ b/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff @@ -0,0 +1,169 @@ +--- + Makefile.am | 2 ++ + configure.ac | 17 ++++++++++------- + docs/eggdbus/Makefile.am | 2 +- + docs/tests/Makefile.am | 2 +- + m4/gtk-doc.m4 | 39 +++++++++++++++++++++++++++++++++++++++ + src/eggdbus/Makefile.am | 2 +- + src/tests/Makefile.am | 2 +- + 7 files changed, 55 insertions(+), 11 deletions(-) + +Index: eggdbus-0.6/configure.ac +=================================================================== +--- eggdbus-0.6.orig/configure.ac ++++ eggdbus-0.6/configure.ac +@@ -1,21 +1,23 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_PREREQ(2.59c) +-AC_INIT(eggdbus, 0.6, davidz@redhat.com) ++AC_PREREQ(2.64) ++AC_INIT([eggdbus],[0.6],[davidz@redhat.com]) + AM_INIT_AUTOMAKE(eggdbus, 0.6) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_MAINTAINER_MODE + +-AC_ISC_POSIX + AC_PROG_CC +-AM_PROG_CC_STDC ++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ++ + AC_HEADER_STDC +-AM_PROG_LIBTOOL ++LT_INIT + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_SYS_LARGEFILE + AM_PROG_CC_C_O + ++AC_CONFIG_MACRO_DIR([m4]) ++ + # Taken from dbus + AC_ARG_ENABLE(ansi, [ --enable-ansi enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no) + AC_ARG_ENABLE(verbose-mode, [ --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE) +@@ -135,7 +137,7 @@ if test "x$GCC" = "xyes"; then + LDFLAGS="-Wl,--as-needed $LDFLAGS" + fi + +-AC_OUTPUT([ ++AC_CONFIG_FILES([ + Makefile + eggdbus-1.pc + src/Makefile +@@ -147,6 +149,7 @@ docs/man/Makefile + docs/tests/Makefile + docs/eggdbus/Makefile + ]) ++AC_OUTPUT + + dnl ========================================================================== + echo " +Index: eggdbus-0.6/docs/eggdbus/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/docs/eggdbus/Makefile.am ++++ eggdbus-0.6/docs/eggdbus/Makefile.am +@@ -34,7 +34,7 @@ IGNORE_HFILES= \ + + # CFLAGS and LDFLAGS for compiling scan program. Only needed + # if $(DOC_MODULE).types is non-empty. +-INCLUDES = \ ++AM_CPPFLAGS = \ + $(DBUS_GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ +Index: eggdbus-0.6/docs/tests/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/docs/tests/Makefile.am ++++ eggdbus-0.6/docs/tests/Makefile.am +@@ -29,7 +29,7 @@ IGNORE_HFILES= \ + + # CFLAGS and LDFLAGS for compiling scan program. Only needed + # if $(DOC_MODULE).types is non-empty. +-INCLUDES = \ ++AM_CPPFLAGS = \ + $(DBUS_GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ +Index: eggdbus-0.6/src/eggdbus/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/src/eggdbus/Makefile.am ++++ eggdbus-0.6/src/eggdbus/Makefile.am +@@ -1,7 +1,7 @@ + + NULL = + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src \ + -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ +Index: eggdbus-0.6/src/tests/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/src/tests/Makefile.am ++++ eggdbus-0.6/src/tests/Makefile.am +@@ -1,7 +1,7 @@ + + NULL = + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src \ + -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ +Index: eggdbus-0.6/m4/gtk-doc.m4 +=================================================================== +--- /dev/null ++++ eggdbus-0.6/m4/gtk-doc.m4 +@@ -0,0 +1,39 @@ ++dnl -*- mode: autoconf -*- ++ ++# serial 1 ++ ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ AC_ARG_WITH([html-dir], ++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ++ [with_html_dir='${datadir}/gtk-doc/html']) ++ HTML_DIR="$with_html_dir" ++ AC_SUBST([HTML_DIR]) ++ ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) ++ ++ if test x$enable_gtk_doc = xyes; then ++ ifelse([$1],[], ++ [PKG_CHECK_EXISTS([gtk-doc],, ++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], ++ [PKG_CHECK_EXISTS([gtk-doc >= $1],, ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) ++ fi ++ ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) ++ ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++]) +Index: eggdbus-0.6/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/Makefile.am ++++ eggdbus-0.6/Makefile.am +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++ACLOCAL_AMFLAGS = -I m4 ++ + SUBDIRS = src docs + + NULL = diff --git a/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff b/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff new file mode 100644 index 000000000..615af6be1 --- /dev/null +++ b/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff @@ -0,0 +1,51 @@ +Subject: [patch] make eggdbus crosscompile aware +From: Robert Schwebel <r.schwebel@pengutronix.de> + +The build system compiles tools like eggdbus-glib-genmarshal and +eggdbus-binding-tool; if you cross compile the package, these fines are +built for the "host" architecture, not for the "build" one, but the +Makefile tries to run the cross compiled binaries then. + +Make it possible to overwrite them from the configure command line. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + configure.ac | 10 ++++++++++ + src/eggdbus/Makefile.am | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +Index: eggdbus-0.6/configure.ac +=================================================================== +--- eggdbus-0.6.orig/configure.ac ++++ eggdbus-0.6/configure.ac +@@ -34,6 +34,16 @@ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x + + GTK_DOC_CHECK([1.3]) + ++EGGDBUS_TOOLS="" ++AC_ARG_WITH(eggdbus-tools, ++ AS_HELP_STRING([--with-eggdbus-tools],[path to eggdbus-binding-tool (for cross compilation)]), ++[ ++ EGGDBUS_TOOLS="$withval" ++],[ ++ EGGDBUS_TOOLS="\$(top_builddir)/src/eggdbus" ++]) ++AC_SUBST(EGGDBUS_TOOLS) ++ + #### gcc warning flags + + if test "x$GCC" = "xyes"; then +Index: eggdbus-0.6/src/eggdbus/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/src/eggdbus/Makefile.am ++++ eggdbus-0.6/src/eggdbus/Makefile.am +@@ -130,7 +130,7 @@ BUILT_SOURCES = \ + $(NULL) + + eggdbus-built-sources.stamp : eggdbus-binding-tool Makefile.am org.freedesktop.DBus.xml org.freedesktop.DBus.Peer.xml org.freedesktop.DBus.Properties.xml org.freedesktop.DBus.Introspectable.xml eggdbus-glib-genmarshal +- EGG_DBUS_GENMARSHAL=$(top_builddir)/src/eggdbus/eggdbus-glib-genmarshal $(top_builddir)/src/eggdbus/eggdbus-binding-tool \ ++ EGG_DBUS_GENMARSHAL=$(EGGDBUS_TOOLS)/eggdbus-glib-genmarshal $(EGGDBUS_TOOLS)/eggdbus-binding-tool \ + --namespace EggDBus \ + --dbus-namespace org.freedesktop.DBus \ + --interfaces-only \ diff --git a/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff b/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff new file mode 100644 index 000000000..a6702d468 --- /dev/null +++ b/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff @@ -0,0 +1,44 @@ +Subject: [patch] build tests only when not cross compiling +From: Robert Schwebel <r.schwebel@pengutronix.de> + +When building the tests, the makefiles try to run +eggdbus-glib-genmarshal and eggdbus-binding-tool, but this doesn't +really make any sense when cross compiling. + +The patch below disables the tests completely when cross compiling. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + configure.ac | 2 ++ + src/Makefile.am | 6 +++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +Index: eggdbus-0.6/configure.ac +=================================================================== +--- eggdbus-0.6.orig/configure.ac ++++ eggdbus-0.6/configure.ac +@@ -44,6 +44,8 @@ AC_ARG_WITH(eggdbus-tools, + ]) + AC_SUBST(EGGDBUS_TOOLS) + ++AM_CONDITIONAL([CROSS_COMPILE], [test "$(cross_compiling)" = "yes"]) ++ + #### gcc warning flags + + if test "x$GCC" = "xyes"; then +Index: eggdbus-0.6/src/Makefile.am +=================================================================== +--- eggdbus-0.6.orig/src/Makefile.am ++++ eggdbus-0.6/src/Makefile.am +@@ -1,5 +1,9 @@ + +-SUBDIRS = eggdbus tests ++if CROSS_COMPILE ++TESTDIR=tests ++endif ++ ++SUBDIRS = eggdbus $(TESTDIR) + + clean-local : + rm -f *~ diff --git a/patches/eggdbus-0.6/series b/patches/eggdbus-0.6/series new file mode 100644 index 000000000..81c19ebc6 --- /dev/null +++ b/patches/eggdbus-0.6/series @@ -0,0 +1,3 @@ +eggdbus-0.6-host-tools.diff +eggdbus-0.6-no-tests.diff +eggdbus-0.6-autotools.diff |