From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 18/28] eggdbus: clean up patches
Date: Sun, 30 Oct 2011 23:00:49 +0100 [thread overview]
Message-ID: <1320012059-24971-18-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../0001-make-eggdbus-crosscompile-aware.patch | 55 +++++++++
...build-tests-only-when-not-cross-compiling.patch | 50 ++++++++
.../eggdbus-0.6/0003-update-autotoolization.patch | 128 ++++++++++++++++++++
patches/eggdbus-0.6/0004-fix-dependencies.patch | 28 +++++
patches/eggdbus-0.6/eggdbus-0.6-autotools.diff | 123 -------------------
patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff | 23 ----
patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff | 51 --------
patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff | 46 -------
patches/eggdbus-0.6/series | 4 -
9 files changed, 261 insertions(+), 247 deletions(-)
create mode 100644 patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
create mode 100644 patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
create mode 100644 patches/eggdbus-0.6/0003-update-autotoolization.patch
create mode 100644 patches/eggdbus-0.6/0004-fix-dependencies.patch
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-autotools.diff
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
delete mode 100644 patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff
delete mode 100644 patches/eggdbus-0.6/series
diff --git a/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch b/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
new file mode 100644
index 0000000..39131de
--- /dev/null
+++ b/patches/eggdbus-0.6/0001-make-eggdbus-crosscompile-aware.patch
@@ -0,0 +1,55 @@
+From 23dfa7c24cc1becc6e841cf8f803c4249c4944bb Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 1/4] make eggdbus crosscompile aware
+
+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 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 497cb7f..a4e792a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,6 +34,16 @@ AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
+
+ 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
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index aebb984..95615cd 100644
+--- a/src/eggdbus/Makefile.am
++++ b/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 \
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch b/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
new file mode 100644
index 0000000..7f6b643
--- /dev/null
+++ b/patches/eggdbus-0.6/0002-build-tests-only-when-not-cross-compiling.patch
@@ -0,0 +1,50 @@
+From 5b0b8a6846941919d6f1b87dbe1329cdafbcaa8c Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 2/4] build tests only when not cross compiling
+
+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 | 8 +++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a4e792a..0f31dea 100644
+--- a/configure.ac
++++ b/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
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 60fb584..cec7e43 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,11 @@
+
+-SUBDIRS = eggdbus tests
++if CROSS_COMPILE
++TESTDIR=
++else
++TESTDIR=tests
++endif
++
++SUBDIRS = eggdbus $(TESTDIR)
+
+ clean-local :
+ rm -f *~
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/0003-update-autotoolization.patch b/patches/eggdbus-0.6/0003-update-autotoolization.patch
new file mode 100644
index 0000000..8fdf33e
--- /dev/null
+++ b/patches/eggdbus-0.6/0003-update-autotoolization.patch
@@ -0,0 +1,128 @@
+From 0823435d4863aa94d0d47a672beaba462559b645 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 3/4] update autotoolization
+
+This patch updates the autotool-infrastructure for recent tools.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.am | 2 ++
+ configure.ac | 15 ++++++++-------
+ docs/eggdbus/Makefile.am | 2 +-
+ docs/tests/Makefile.am | 2 +-
+ src/eggdbus/Makefile.am | 2 +-
+ src/tests/Makefile.am | 2 +-
+ 6 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c1f1470..9ab8648 100644
+--- a/Makefile.am
++++ b/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/configure.ac b/configure.ac
+index 0f31dea..5ad85af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,16 +1,16 @@
+ 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
+@@ -135,7 +135,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 +147,7 @@ docs/man/Makefile
+ docs/tests/Makefile
+ docs/eggdbus/Makefile
+ ])
++AC_OUTPUT
+
+ dnl ==========================================================================
+ echo "
+diff --git a/docs/eggdbus/Makefile.am b/docs/eggdbus/Makefile.am
+index 94c00bf..e30e6c3 100644
+--- a/docs/eggdbus/Makefile.am
++++ b/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) \
+diff --git a/docs/tests/Makefile.am b/docs/tests/Makefile.am
+index 5f7940c..3ba5cba 100644
+--- a/docs/tests/Makefile.am
++++ b/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) \
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index 95615cd..0f96181 100644
+--- a/src/eggdbus/Makefile.am
++++ b/src/eggdbus/Makefile.am
+@@ -1,7 +1,7 @@
+
+ NULL =
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
+index 7bc1b24..71a3e82 100644
+--- a/src/tests/Makefile.am
++++ b/src/tests/Makefile.am
+@@ -1,7 +1,7 @@
+
+ NULL =
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_builddir)/src \
+ -I$(top_srcdir)/src \
+ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/0004-fix-dependencies.patch b/patches/eggdbus-0.6/0004-fix-dependencies.patch
new file mode 100644
index 0000000..afb1b56
--- /dev/null
+++ b/patches/eggdbus-0.6/0004-fix-dependencies.patch
@@ -0,0 +1,28 @@
+From 4a60935e13594350f9a58fc2e4ae8945b0e5af5b Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 29 Oct 2011 19:14:59 +0200
+Subject: [PATCH 4/4] fix dependencies
+
+sone source files of eggdbus-binding-tool need eggdbusenumtypes.h
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/eggdbus/Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/eggdbus/Makefile.am b/src/eggdbus/Makefile.am
+index 0f96181..ab0269d 100644
+--- a/src/eggdbus/Makefile.am
++++ b/src/eggdbus/Makefile.am
+@@ -81,6 +81,8 @@ eggdbus_binding_tool_SOURCES = \
+ completetype.c completetype.h \
+ $(NULL)
+
++$(eggdbus_binding_tool_SOURCES) $(libeggdbus_common_la_SOURCES): eggdbusenumtypes.h
++
+ eggdbus_binding_tool_CFLAGS = \
+ -D_EGG_DBUS_COMPILATION \
+ $(GLIB_CFLAGS) \
+--
+1.7.7
+
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff b/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff
deleted file mode 100644
index 2cc8997..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-autotools.diff
+++ /dev/null
@@ -1,123 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: update autotoolization
-
-This patch updates the autotool-infrastructure for recent tools.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.am | 2 ++
- configure.ac | 15 ++++++++-------
- docs/eggdbus/Makefile.am | 2 +-
- docs/tests/Makefile.am | 2 +-
- src/eggdbus/Makefile.am | 2 +-
- src/tests/Makefile.am | 2 +-
- 6 files changed, 14 insertions(+), 11 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,16 +1,16 @@
- 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
-@@ -135,7 +135,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 +147,7 @@ docs/man/Makefile
- docs/tests/Makefile
- docs/eggdbus/Makefile
- ])
-+AC_OUTPUT
-
- dnl ==========================================================================
- echo "
-Index: b/docs/eggdbus/Makefile.am
-===================================================================
---- a/docs/eggdbus/Makefile.am
-+++ b/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: b/docs/tests/Makefile.am
-===================================================================
---- a/docs/tests/Makefile.am
-+++ b/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: b/src/eggdbus/Makefile.am
-===================================================================
---- a/src/eggdbus/Makefile.am
-+++ b/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: b/src/tests/Makefile.am
-===================================================================
---- a/src/tests/Makefile.am
-+++ b/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: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/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-fix-deps.diff b/patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff
deleted file mode 100644
index dfd6998..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-fix-deps.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: fix dependencies
-
-sone source files of eggdbus-binding-tool need eggdbusenumtypes.h
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- src/eggdbus/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: b/src/eggdbus/Makefile.am
-===================================================================
---- a/src/eggdbus/Makefile.am
-+++ b/src/eggdbus/Makefile.am
-@@ -81,6 +81,8 @@ eggdbus_binding_tool_SOURCES = \
- completetype.c completetype.h \
- $(NULL)
-
-+$(eggdbus_binding_tool_SOURCES) $(libeggdbus_common_la_SOURCES): eggdbusenumtypes.h
-+
- eggdbus_binding_tool_CFLAGS = \
- -D_EGG_DBUS_COMPILATION \
- $(GLIB_CFLAGS) \
diff --git a/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff b/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
deleted file mode 100644
index 615af6b..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-host-tools.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-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
deleted file mode 100644
index 2ef52ba..0000000
--- a/patches/eggdbus-0.6/eggdbus-0.6-no-tests.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-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 | 8 +++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/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: b/src/Makefile.am
-===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,11 @@
-
--SUBDIRS = eggdbus tests
-+if CROSS_COMPILE
-+TESTDIR=
-+else
-+TESTDIR=tests
-+endif
-+
-+SUBDIRS = eggdbus $(TESTDIR)
-
- clean-local :
- rm -f *~
diff --git a/patches/eggdbus-0.6/series b/patches/eggdbus-0.6/series
deleted file mode 100644
index 7c07041..0000000
--- a/patches/eggdbus-0.6/series
+++ /dev/null
@@ -1,4 +0,0 @@
-eggdbus-0.6-host-tools.diff
-eggdbus-0.6-no-tests.diff
-eggdbus-0.6-autotools.diff
-eggdbus-0.6-fix-deps.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320012059-24971-18-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox