try something different

git-svn-id: svn://svn.code.sf.net/p/libkqueue/code/trunk@628 fb4e3144-bc1c-4b72-a658-5bcd248dd7f7
This commit is contained in:
mheily 2013-01-24 02:00:41 +00:00
parent 617dc2d953
commit a9575f667f
6 changed files with 12 additions and 4 deletions

View File

@ -162,6 +162,8 @@ install:
$(INSTALL) -m 644 libkqueue.pc $(DESTDIR)$(PKGCONFIGDIR)
rm -f $(DESTDIR)$(LIBDIR)/libkqueue.so
ln -s libkqueue.so.0.0 $(DESTDIR)$(LIBDIR)/libkqueue.so
rm -f $(DESTDIR)$(LIBDIR)/libkqueue.so.0
ln -s libkqueue.so.0.0 $(DESTDIR)$(LIBDIR)/libkqueue.so.0
ln -s kqueue.2 $(DESTDIR)$(MANDIR)/man2/kevent.2
kqtest: test/main.o test/kevent.o test/test.o test/proc.o test/read.o test/signal.o test/timer.o test/vnode.o test/user.o
@ -188,7 +190,7 @@ libkqueue.pc: config.h
@cat libkqueue.pc.in >> libkqueue.pc
libkqueue.so: src/common/filter.o src/common/knote.o src/common/map.o src/common/kevent.o src/common/kqueue.o src/posix/platform.o src/linux/platform.o src/linux/read.o src/linux/write.o src/linux/user.o src/linux/vnode.o src/linux/signal.o src/linux/timer.o
$(LD) -o libkqueue.so -shared -fPIC -L . $(LDFLAGS) src/common/filter.o src/common/knote.o src/common/map.o src/common/kevent.o src/common/kqueue.o src/posix/platform.o src/linux/platform.o src/linux/read.o src/linux/write.o src/linux/user.o src/linux/vnode.o src/linux/signal.o src/linux/timer.o -lpthread -lrt $(LDADD)
$(LD) -o libkqueue.so -shared -fPIC -L . -Wl,-soname,libkqueue.so.0 $(LDFLAGS) src/common/filter.o src/common/knote.o src/common/map.o src/common/kevent.o src/common/kqueue.o src/posix/platform.o src/linux/platform.o src/linux/read.o src/linux/write.o src/linux/user.o src/linux/vnode.o src/linux/signal.o src/linux/timer.o -lpthread -lrt $(LDADD)
package: clean libkqueue-2.0.tar.gz
rm -rf rpm *.rpm

3
configure vendored
View File

@ -92,6 +92,7 @@ do
# TODO: we should split this up, and override the other Makeconf
# variables like *_VENDOR, *_ARCH, *_CPU, *_KERNEL, *_SYSTEM
echo "$uc_key=$val" >> config.mk
eval "${key}_system_type=\"$val\""
;;
disable-option-checking)
# Not implemented, this behavior is the default (for now)
@ -107,7 +108,7 @@ do
done
printf "checking for a C compiler... "
for cmd in cc gcc gcc4 clang
for cmd in ${host_system_type}-cc cc gcc gcc4 clang
do
$cmd --version >/dev/null 2>&1
if [ $? -eq 0 ] ; then cc="$cmd" ; break ; fi

View File

@ -198,6 +198,7 @@ project.add(PkgConfig.new(
mc = Makeconf.new()
mc.configure(project)
throw Platform.is_windows?
__END__
#

View File

@ -36,7 +36,7 @@
#define intptr_t long
#else
#include <sys/types.h>
#if defined(_WIN32) && _MSC_VER < 1600
#if defined(_WIN32) && _MSC_VER < 1600 && !defined(__MINGW32__)
# include "../../src/windows/stdint.h"
#else
# include <stdint.h>

View File

@ -20,7 +20,7 @@
#include <assert.h>
#include <stdio.h>
#ifdef _WIN32
# include <Windows.h>
# include <windows.h>
#else
# include <unistd.h>
#endif

View File

@ -214,6 +214,8 @@ void *map_lookup(struct map *, int);
void *map_delete(struct map *, int);
void map_free(struct map *);
/* DEADWOOD: No longer needed due to the un-smerging of POSIX and Linux
int posix_evfilt_user_init(struct filter *);
void posix_evfilt_user_destroy(struct filter *);
int posix_evfilt_user_copyout(struct kevent *, struct knote *, void *ptr UNUSED);
@ -223,4 +225,6 @@ int posix_evfilt_user_knote_delete(struct filter *, struct knote *);
int posix_evfilt_user_knote_enable(struct filter *, struct knote *);
int posix_evfilt_user_knote_disable(struct filter *, struct knote *);
*/
#endif /* ! _KQUEUE_PRIVATE_H */