[PATCH] fix up segfaulting binaries with new klibc

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 7684a4030ef9fcfb69f4c968a73b6666ffc4db95..ac60ade52a9b6ca32e28dc44717f67b5f16e332b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ SENDER =      udevsend
 INFO =         udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
-VERSION =      052
+VERSION =      054
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -129,7 +129,6 @@ HEADERS = \
        list.h
 
 SYSFS_OBJS = \
-       libsysfs/sysfs_bus.o    \
        libsysfs/sysfs_class.o  \
        libsysfs/sysfs_device.o \
        libsysfs/sysfs_dir.o    \
@@ -189,7 +188,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
        CRT0 = $(KLIBC_DIR)/crt0.o
        LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
        CFLAGS += $(WARNINGS) -nostdinc                         \
-               $(OPTFLAGS)                                     \
+               $(OPTFLAGS) $(REQFLAGS)                         \
                -D__KLIBC__ -fno-builtin-printf                 \
                -I$(KLIBC_FIXUPS_DIR)                           \
                -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h     \
@@ -203,7 +202,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
 
        HEADERS += \
                klibc_fixups/klibc_fixups.h     \
-               klibc_fixups/mntent.h           \
                klibc_fixups/pwd.h
 
        KLIBC_FIXUP_OBJS = \