[libdispatch-dev] minor libkqueue fix

Mario Schwalbe schwalbe at inf.tu-dresden.de
Thu Nov 5 04:46:07 PST 2009


Hi Mark,

while working with libdispatch and libkqueue on Linux, I discovered
some minor issues. Could you please commit the attached patch for
those who like to:
(a) reconfigure libkqueue sometimes
(b) do not have test.o around
(c) install to a non-standard prefix

thanks & ciao,
Mario Schwalbe

diff -urp foo/src/libkqueue/configure diplom/src/libkqueue/configure
--- foo/src/libkqueue/configure	2009-11-05 13:43:37.695235346 +0100
+++ diplom/src/libkqueue/configure	2009-11-03 18:12:21.581371724 +0100
@@ -65,15 +65,15 @@ finalize mandir     "${prefix}/share/man
 echo "Checking operating system type... $target"
 rm -f socket.c vnode.c signal.c timer.c user.c
 if [ $target = "linux" ] ; then
-   check_header sys/epoll.h && ln -s os/linux/socket.c    \
-       || ln -s os/posix/socket.c
-   check_header sys/inotify.h && ln -s os/linux/vnode.c   \
-       || ln -s os/posix/vnode.c
-   check_header sys/signalfd.h && ln -s os/linux/signal.c \
-       || ln -s os/posix/signal.c
-   check_header sys/timerfd.h && ln -s os/linux/timer.c   \
-       || ln -s os/posix/timer.c
-   ln -s os/posix/user.c
+   check_header sys/epoll.h && ln -sf os/linux/socket.c    \
+       || ln -sf os/posix/socket.c
+   check_header sys/inotify.h && ln -sf os/linux/vnode.c   \
+       || ln -sf os/posix/vnode.c
+   check_header sys/signalfd.h && ln -sf os/linux/signal.c \
+       || ln -sf os/posix/signal.c
+   check_header sys/timerfd.h && ln -sf os/linux/timer.c   \
+       || ln -sf os/posix/timer.c
+   ln -sf os/posix/user.c
 fi
 echo "Creating config.h"

diff -urp foo/src/libkqueue/Makefile diplom/src/libkqueue/Makefile
--- foo/src/libkqueue/Makefile	2009-11-05 13:43:37.705236408 +0100
+++ diplom/src/libkqueue/Makefile	2009-11-05 13:23:21.312802794 +0100
@@ -24,13 +24,14 @@ include config.mk

 build:
 	gcc $(CFLAGS) -c *.c
-	rm test.o
+	-rm test.o
 	ar rcs libkqueue.a *.o
 	gcc -shared -Wl,-soname,libkqueue.so -o libkqueue.so *.o

 install:
 	$(INSTALL) -d -m 755 $(INCLUDEDIR)/kqueue
 	$(INSTALL) -d -m 755 $(INCLUDEDIR)/kqueue/sys
+	$(INSTALL) -d -m 755 $(LIBDIR)/pkgconfig
 	$(INSTALL) -d -m 755 $(MANDIR)/man2
 	$(INSTALL) -m 644 sys/event.h $(INCLUDEDIR)/kqueue/sys/event.h
 	$(INSTALL) -m 644 libkqueue.so $(LIBDIR)/libkqueue.so



More information about the libdispatch-dev mailing list