summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2009-11-23 16:00:46 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2009-11-23 16:00:46 +0100
commit250b18f89a3cc64c82c5e7e4c8e8ead04a6a4f35 (patch)
tree7dc9efb2af9a51f923f1d16f1711cb18ee723dd7
parent792ab0e93ade4d4beae141f05ef37d7ba633ad6e (diff)
downloadptxdist-250b18f89a3cc64c82c5e7e4c8e8ead04a6a4f35.tar.gz
ptxdist-250b18f89a3cc64c82c5e7e4c8e8ead04a6a4f35.tar.xz
[libmqueue] remove it. It is not needed with any recent glibc
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/libmqueue-4.41/fix_const_warnings.diff36
-rw-r--r--patches/libmqueue-4.41/fix_malloc_free_warnings.diff25
-rw-r--r--patches/libmqueue-4.41/series3
-rw-r--r--rules/libmqueue.in10
-rw-r--r--rules/libmqueue.make84
-rw-r--r--rules/libpv.in11
6 files changed, 0 insertions, 169 deletions
diff --git a/patches/libmqueue-4.41/fix_const_warnings.diff b/patches/libmqueue-4.41/fix_const_warnings.diff
deleted file mode 100644
index 032ec6924..000000000
--- a/patches/libmqueue-4.41/fix_const_warnings.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch fixes the warning:
-
-mqueue.c: In function 'mq_notify':
-mqueue.c:446: warning: passing argument 2 of 'mq_notify_sigevthread' discards qualifiers from pointer target type
-
----
- include/mqueue.h | 2 +-
- src/mqueue.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: src/mqueue.c
-===================================================================
---- src/mqueue.c.orig
-+++ src/mqueue.c
-@@ -440,7 +440,7 @@ static int mq_notify_sigevthread(mqd_t m
- #endif
-
-
--int mq_notify(mqd_t mqdes, const struct sigevent *notification)
-+int mq_notify(mqd_t mqdes, struct sigevent *notification)
- {
- if (notification && (notification->sigev_notify == SIGEV_THREAD)) {
- #ifdef SIGEVTHREAD_SUPPORT
-Index: include/mqueue.h
-===================================================================
---- include/mqueue.h.orig
-+++ include/mqueue.h
-@@ -41,7 +41,7 @@ int mq_send(mqd_t mqdes, const char *msg
- int mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec *abs_timeout);
- ssize_t mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned int *msg_prio);
- ssize_t mq_timedreceive(mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len, unsigned int *__restrict msg_prio, const struct timespec *__restrict abs_timeout);
--int mq_notify(mqd_t mqdes, const struct sigevent *notification);
-+int mq_notify(mqd_t mqdes, struct sigevent *notification);
- int mq_getattr(mqd_t mqdes, struct mq_attr *mqstat);
- int mq_setattr(mqd_t mqdes, const struct mq_attr *__restrict mqstat, struct mq_attr *__restrict omqstat);
-
diff --git a/patches/libmqueue-4.41/fix_malloc_free_warnings.diff b/patches/libmqueue-4.41/fix_malloc_free_warnings.diff
deleted file mode 100644
index bb7ef2c7b..000000000
--- a/patches/libmqueue-4.41/fix_malloc_free_warnings.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-This patch fixes the warnings:
-
-mqueue.c: In function 'service_request':
-mqueue.c:270: warning: incompatible implicit declaration of built-in function 'malloc'
-mqueue.c: In function 'launch':
-mqueue.c:305: warning: incompatible implicit declaration of built-in function 'free'
-mqueue.c: In function 'scan_events':
-mqueue.c:321: warning: incompatible implicit declaration of built-in function 'free'
-
----
- src/mqueue.c | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: src/mqueue.c
-===================================================================
---- src/mqueue.c.orig
-+++ src/mqueue.c
-@@ -26,6 +26,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <limits.h>
- #include <stdarg.h>
- #include <errno.h>
diff --git a/patches/libmqueue-4.41/series b/patches/libmqueue-4.41/series
deleted file mode 100644
index 17bb30ea3..000000000
--- a/patches/libmqueue-4.41/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fix_malloc_free_warnings.diff -p0
-fix_const_warnings.diff -p0
-
diff --git a/rules/libmqueue.in b/rules/libmqueue.in
deleted file mode 100644
index ad2225bd5..000000000
--- a/rules/libmqueue.in
+++ /dev/null
@@ -1,10 +0,0 @@
-## SECTION=system_libraries
-config LIBMQUEUE
- tristate
- prompt "libmqueue"
- help
- Libmqueue offers an implementation of POSIX Message Queues
- which work on systems whith older glibc versions.
-
- http://www.geocities.com/wronski12/posix_ipc/
-
diff --git a/rules/libmqueue.make b/rules/libmqueue.make
deleted file mode 100644
index 18c7f524f..000000000
--- a/rules/libmqueue.make
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*-makefile-*-
-# $Id: template 3691 2006-01-02 15:52:13Z rsc $
-#
-# Copyright (C) 2006 by Robert Schwebel
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_LIBMQUEUE) += libmqueue
-
-#
-# Paths and names
-#
-LIBMQUEUE_VERSION := 4.41
-LIBMQUEUE := libmqueue-$(LIBMQUEUE_VERSION)
-LIBMQUEUE_SUFFIX := tar.gz
-LIBMQUEUE_URL := http://www.geocities.com/wronski12/posix_ipc/$(LIBMQUEUE).$(LIBMQUEUE_SUFFIX)
-LIBMQUEUE_SOURCE := $(SRCDIR)/$(LIBMQUEUE).$(LIBMQUEUE_SUFFIX)
-LIBMQUEUE_DIR := $(BUILDDIR)/$(LIBMQUEUE)
-
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(LIBMQUEUE_SOURCE):
- @$(call targetinfo)
- @$(call get, LIBMQUEUE)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-LIBMQUEUE_PATH := PATH=$(CROSS_PATH)
-LIBMQUEUE_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-LIBMQUEUE_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/libmqueue.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, libmqueue)
- @$(call install_fixup, libmqueue,PACKAGE,libmqueue)
- @$(call install_fixup, libmqueue,PRIORITY,optional)
- @$(call install_fixup, libmqueue,VERSION,$(LIBMQUEUE_VERSION))
- @$(call install_fixup, libmqueue,SECTION,base)
- @$(call install_fixup, libmqueue,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
- @$(call install_fixup, libmqueue,DEPENDS,)
- @$(call install_fixup, libmqueue,DESCRIPTION,missing)
-
- @$(call install_copy, libmqueue, 0, 0, 0644, \
- $(LIBMQUEUE_DIR)/src/.libs/libmqueue.so.4.0.41, \
- /usr/lib/libmqueue.so.4.0.41)
-
- @$(call install_link, libmqueue, libmqueue.so.4.0.41, /usr/lib/libmqueue.so.4)
- @$(call install_link, libmqueue, libmqueue.so.4.0.41, /usr/lib/libmqueue.so)
-
- @$(call install_finish, libmqueue)
-
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-libmqueue_clean:
- rm -rf $(STATEDIR)/libmqueue.*
- rm -rf $(PKGDIR)/libmqueue_*
- rm -rf $(LIBMQUEUE_DIR)
-
-# vim: syntax=make
diff --git a/rules/libpv.in b/rules/libpv.in
index 8af1bb82e..3c551dafe 100644
--- a/rules/libpv.in
+++ b/rules/libpv.in
@@ -8,7 +8,6 @@ menuconfig LIBPV
select LIBXMLCONFIG if !LIBPV_XML_EXPAT
select EXPAT if LIBPV_XML_EXPAT
select PYTHON if LIBPV_PYTHON
- select LIBMQUEUE if LIBPV_NEEDS_LIBMQUEUE
help
libpv.so is a library that implements a user space shared memory for
automation applications. The shared memory is being described by an
@@ -27,16 +26,6 @@ config LIBPV_EVENT
enabled it is possible to be notified when process variables have
changed.
-config LIBPV_NEEDS_LIBMQUEUE
- bool
- prompt "Posix Message Queue support for kernel 2.6"
- depends on LIBPV_EVENT
- help
- Enable this switch if your glibc doesn't yet support the new Posix
- Message Queues the kernel 2.6 already supports. This is
- mostly the case on older glibc revisions prior 2.3.5. Newer
- glibc revisions supports this feature natively.
-
config LIBPV_PYTHON
bool
prompt "Python bindings"