summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2011-10-29 19:16:53 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-11-01 12:00:55 +0100
commit73bdaaa15eb447b6111c06a5728c10015d53c92f (patch)
tree0520271ec4f6c08a8e675859b9d06db4274654b9 /patches
parent07276cd2da8a1b087d08596a0971003bc0e14a30 (diff)
downloadptxdist-73bdaaa15eb447b6111c06a5728c10015d53c92f.tar.gz
ptxdist-73bdaaa15eb447b6111c06a5728c10015d53c92f.tar.xz
elektra: remove orphaned package
Elektra is upstream-dead and was most probably never used by anyone than myself. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
l---------patches/elektra-0.7.0-r1618/autogen.sh1
-rw-r--r--patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff29
-rw-r--r--patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff26
-rw-r--r--patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff40
-rw-r--r--patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff105
-rw-r--r--patches/elektra-0.7.0-r1618/series4
6 files changed, 0 insertions, 205 deletions
diff --git a/patches/elektra-0.7.0-r1618/autogen.sh b/patches/elektra-0.7.0-r1618/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/elektra-0.7.0-r1618/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh \ No newline at end of file
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff
deleted file mode 100644
index 954a21daf..000000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0-r1618-ini-debug.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: ini backend: fix DEBUG handling
-
-When compiled without "--enable-debug", the ini backend nevertheless
-defines DEBUG and thus we get output.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- src/backends/ini/Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-Index: elektra-0.7.0-r1618/src/backends/ini/Makefile.am
-===================================================================
---- elektra-0.7.0-r1618.orig/src/backends/ini/Makefile.am
-+++ elektra-0.7.0-r1618/src/backends/ini/Makefile.am
-@@ -1,7 +1,11 @@
- # $Id: Makefile.am 1618 2008-10-17 16:03:11Z registry@markus-raab.org $
-
-+if DEBUG
-+INI_DEBUG=-DDEBUG
-+endif
-+
- #testdir = $(develdocdir)/src/backends/ini/
--AM_CPPFLAGS = -I$(top_srcdir)/src/include -DDEBUG -D_POSIX_SOURCE -D_BSD_SOURCE
-+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(INI_DEBUG) -D_POSIX_SOURCE -D_BSD_SOURCE
-
- ini_sources = ini.c helpers.c parser.c ini.h ../../include/kdb.h ../../include/kdbbackend.h
- noinst_LIBRARIES = libelektra-ini.a
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff
deleted file mode 100644
index b6bb3cbb7..000000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-file-existence.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: don't break build while cross compiling
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-When cross compiling it may not really matter if we have the docbook xsl
-stuff (only needed for documentation). So disable the check in that
-case.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: elektra-0.7.0-r1618/configure.ac
-===================================================================
---- elektra-0.7.0-r1618.orig/configure.ac
-+++ elektra-0.7.0-r1618/configure.ac
-@@ -301,7 +301,7 @@ PKG_PROG_PKG_CONFIG
- # xsltproc
- AC_PATH_PROG(xsltproc, xsltproc, "no")
- # Check if have style-sheet too
--if test "x$default_docbook" != "xno"; then
-+if test "x$default_docbook" != "xno" && test "x$cross_compiling" = "xno"; then
- AC_CHECK_FILE([$default_docbook/manpages/docbook.xsl],
- [dbroot=$default_docbook],
- [dbroot="no"])
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff
deleted file mode 100644
index b5b3c615b..000000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-libxml2.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Subject: [PATCH] use pkg-config for libxml2 detection
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-When cross compiling, the current test incorrectly picks up the libxml2
-from the development host. Use pkg-config in order to do it right.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-Index: elektra-0.7.0-r1618/configure.ac
-===================================================================
---- elektra-0.7.0-r1618.orig/configure.ac
-+++ elektra-0.7.0-r1618/configure.ac
-@@ -435,11 +435,19 @@ fi
- privatelibs=""
-
- # Check for libxml (Allow compilation of libelektratools)
--AM_PATH_XML2(, [elektra_have_xml="yes"], [elektra_have_xml="no"])
--AM_CONDITIONAL(HAVE_XML, [test x$elektra_have_xml = xyes])
--if test "x$elektra_have_xml" = "xyes"; then
-+REQUIRES_LIBXML2="libxml2 >= 2.6.0"
-+AC_SUBST(REQUIRES_LIBXML2)
-+PKG_CHECK_MODULES([libxml2],
-+ [${REQUIRES_LIBXML2}],
-+ [HAVE_XML=yes],
-+ [HAVE_XML=no]
-+)
-+AC_SUBST(libxml2_CFLAGS)
-+AC_SUBST(libxml2_LIBS)
-+AM_CONDITIONAL([HAVE_XML],[test "$HAVE_XML" = "yes"])
-+if test $HAVE_XML; then
- elektratools=libelektratools
-- privatelibs=$privatelibs" -lxml2"
-+ privatelibs=$privatelibs"$libxml2_LIBS"
- fi
-
- AC_SUBST(elektratools)
diff --git a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff b/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff
deleted file mode 100644
index 9a6b7b38a..000000000
--- a/patches/elektra-0.7.0-r1618/elektra-0.7.0rc5-static-libs.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-Subject: [PATCH] fix --enable-static
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-Build static libs only when --enable-static was given.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- configure.ac | 12 +++++++-----
- src/kdb/Makefile.am | 10 +++++++++-
- src/preload/Makefile.am | 10 +++++++++-
- 3 files changed, 25 insertions(+), 7 deletions(-)
-
-Index: elektra-0.7.0-r1618/configure.ac
-===================================================================
---- elektra-0.7.0-r1618.orig/configure.ac
-+++ elektra-0.7.0-r1618/configure.ac
-@@ -59,7 +59,7 @@ esac
- # Disable libtool static lib
- #AC_DISABLE_STATIC
-
--
-+AM_CONDITIONAL([ENABLE_STATIC],[test x$enable_static = xyes])
-
-
-
-@@ -560,10 +560,12 @@ ALLOW_BACKEND(daemon, [test x$elektra_uc
-
- AC_SUBST(BACKENDS)
-
--backend_static_libs=
--for backend in $BACKENDS; do
-- backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a"
--done
-+if test x$enable_static = xyes; then
-+ backend_static_libs=
-+ for backend in $BACKENDS; do
-+ backend_static_libs="$backend_static_libs ../backends/${backend}/libelektra-${backend}.a"
-+ done
-+fi
-
- AC_SUBST(privatelibs)
- AC_SUBST(backend_static_libs)
-Index: elektra-0.7.0-r1618/src/kdb/Makefile.am
-===================================================================
---- elektra-0.7.0-r1618.orig/src/kdb/Makefile.am
-+++ elektra-0.7.0-r1618/src/kdb/Makefile.am
-@@ -5,17 +5,25 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/includ
-
- kdb_source = kdb-tool.c kdb-tool.h help.c BSDgetopt.c BSDgetopt.h ../include/kdb.h ../include/kdbloader.h ../include/kdbtools.h
-
--bin_PROGRAMS = kdb kdb_static
-+if ENABLE_STATIC
-+KDB_STATIC=kdb_static
-+else
-+KDB_STATIC=
-+endif
-+
-+bin_PROGRAMS = kdb $(KDB_STATIC)
- kdb_SOURCES = $(kdb_source)
- kdb_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV)
- kdb_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS)
-
-+if ENABLE_STATIC
- kdb_static_SOURCES = $(kdb_source)
- kdb_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV)
- kdb_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS)
-
- ../libelektra/libelektra.a:
- cd ../libelektra && $(MAKE) libelektra.a
-+endif
-
- clean-local:
- rm -f *.gcno *.gcda *.gcno
-Index: elektra-0.7.0-r1618/src/preload/Makefile.am
-===================================================================
---- elektra-0.7.0-r1618.orig/src/preload/Makefile.am
-+++ elektra-0.7.0-r1618/src/preload/Makefile.am
-@@ -3,17 +3,25 @@ AM_CPPFLAGS = -DDATADIR=\"$(datadir)\"
-
- preload_source = preload.c ../include/kdb.h
-
--bin_PROGRAMS = preload preload_static
-+if ENABLE_STATIC
-+PRELOAD_STATIC=preload_static
-+else
-+PRELOAD_STATIC=
-+endif
-+
-+bin_PROGRAMS = preload $(PRELOAD_STATIC)
- preload_SOURCES = $(preload_source)
- preload_LDADD = ../libelektra/libelektra.la $(LIBLTDL) $(LIBICONV)
- preload_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS)
-
-+if ENABLE_STATIC
- preload_static_SOURCES = $(preload_source)
- preload_static_LDADD = $(privatelibs) ../libelektra/libelektra.a $(LIBICONV)
- preload_static_CFLAGS = -DELEKTRA_STATIC $(COPTFLAGS) $(CDBGFLAGS)
-
- ../libelektra/libelektra.a:
- cd ../libelektra && $(MAKE) libelektra.a
-+endif
-
- clean-local:
- rm -f *.gcno *.gcda *.gcno
diff --git a/patches/elektra-0.7.0-r1618/series b/patches/elektra-0.7.0-r1618/series
deleted file mode 100644
index e8f3fb160..000000000
--- a/patches/elektra-0.7.0-r1618/series
+++ /dev/null
@@ -1,4 +0,0 @@
-elektra-0.7.0rc5-file-existence.diff
-elektra-0.7.0rc5-libxml2.diff
-elektra-0.7.0rc5-static-libs.diff
-elektra-0.7.0-r1618-ini-debug.diff