summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2006-08-05 00:35:05 +0200
committerKay Sievers <kay.sievers@suse.de>2006-08-05 00:35:05 +0200
commit05ec6e7507d159e5a02a82927c6571b7e516c52e (patch)
treeee3f5f19ba6e4e0adcd7bb99a9bfbf4a73ed7066
parenteb82b76dedc1482b6434c46fee84d3ef13cb9648 (diff)
switch ifdef __KLIBC__ to ifndef __GLIBC__
-rw-r--r--Makefile9
-rw-r--r--README4
-rw-r--r--extras/scsi_id/scsi_id.c3
-rwxr-xr-xtest/simple-build-check.sh8
-rw-r--r--udev_libc_wrapper.c2
-rw-r--r--udev_libc_wrapper.h4
6 files changed, 4 insertions, 26 deletions
diff --git a/Makefile b/Makefile
index 75789b9996..bab1732da4 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,6 @@ USE_GCOV = false
# include Security-Enhanced Linux support
USE_SELINUX = false
-# comile with klibc instead of glibc
-USE_KLIBC = false
-
# set this to create statically linked binaries
USE_STATIC = false
@@ -142,12 +139,6 @@ ifeq ($(strip $(USE_GCOV)),true)
LDFLAGS += -fprofile-arcs
endif
-ifeq ($(strip $(USE_KLIBC)),true)
- KLCC = /usr/bin/$(CROSS_COMPILE)klcc
- CC = $(KLCC)
- LD = $(KLCC)
-endif
-
ifeq ($(strip $(USE_SELINUX)),true)
UDEV_OBJS += udev_selinux.o
LIB_OBJS += -lselinux -lsepol
diff --git a/README b/README
index 7ac1d4509c..92088ac6f5 100644
--- a/README
+++ b/README
@@ -69,10 +69,6 @@ Compile Options:
USE_SELINUX
If set to 'true', udev will be built with SELinux support
enabled. This is disabled by default.
- USE_KLIBC
- If set to 'true', udev is built and linked against klibc.
- Default value is 'false'. KLCC specifies the klibc compiler
- wrapper, usually located at /usr/bin/klcc.
EXTRAS
list of helper programs in extras/ to build.
make EXTRAS="extras/cdrom_id extras/scsi_id extras/volume_id"
diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 2ffc95fbfe..446df70949 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -402,8 +402,7 @@ static int set_options(int argc, char **argv, const char *short_opts,
/*
* optind is a global extern used by getopt. Since we can call
* set_options twice (once for command line, and once for config
- * file) we have to reset this back to 1. [Note glibc handles
- * setting this to 0, but klibc does not.]
+ * file) we have to reset this back to 1.
*/
optind = 1;
while (1) {
diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
index 6d7272f80e..6a03608477 100755
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -23,14 +23,6 @@ make clean EXTRAS="$EXTRAS" >/dev/null
make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS" || exit
echo -e "\n\n"
-# klibc build
-if [ -n "$KLCC" -a -e "$KLCC" ]; then
- echo KLCC: "$KLCC"
- make clean EXTRAS="$EXTRAS" >/dev/null
- make all -j4 $MAKEOPTS USE_KLIBC=true DEBUG=true EXTRAS="$EXTRAS" KLCC="$KLCC" || exit
- echo -e "\n\n"
-fi
-
# install in temporary dir and show it
TEMPDIR="`pwd`/.tmp"
rm -rf $TEMPDIR
diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c
index 1711811e83..48a893cfb1 100644
--- a/udev_libc_wrapper.c
+++ b/udev_libc_wrapper.c
@@ -30,7 +30,7 @@
#include "udev.h"
-#ifdef __KLIBC__
+#ifndef __GLIBC__
#define __OWN_USERDB_PARSER__
#endif
diff --git a/udev_libc_wrapper.h b/udev_libc_wrapper.h
index 6755aa1c74..21dbce6474 100644
--- a/udev_libc_wrapper.h
+++ b/udev_libc_wrapper.h
@@ -105,7 +105,7 @@ static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
}
#else
/* needed until /usr/include/sys/inotify.h is working */
-#ifdef __KLIBC__
+#ifndef __GLIBC__
#include <sys/inotify.h>
#else
static inline int inotify_init(void)
@@ -117,7 +117,7 @@ static inline int inotify_add_watch(int fd, const char *name, uint32_t mask)
{
return syscall(__NR_inotify_add_watch, fd, name, mask);
}
-#endif /* __KLIBC__ */
+#endif /* __GLIBC__ */
#endif /* __NR_inotify_init */
#ifndef IN_CREATE