[PATCH] dump latest klibc into the udev build tree
KLIBC is used as an internal makefile variable, it expands to either true or false right now. udev should use something else than KLIBC to allow build against the latest and greatest klibc version.
This commit is contained in:
parent
3c54f73e84
commit
6662694809
12
Makefile
12
Makefile
|
@ -22,7 +22,7 @@ DEBUG = false
|
||||||
|
|
||||||
# Set the following to `true' to make udev emit a D-BUS signal when a
|
# Set the following to `true' to make udev emit a D-BUS signal when a
|
||||||
# new node is created.
|
# new node is created.
|
||||||
DBUS = false
|
USE_DBUS = false
|
||||||
|
|
||||||
|
|
||||||
ROOT = udev
|
ROOT = udev
|
||||||
|
@ -57,7 +57,7 @@ udevdir = ${prefix}/udev
|
||||||
|
|
||||||
# Comment out this line to build with something other
|
# Comment out this line to build with something other
|
||||||
# than the local version of klibc
|
# than the local version of klibc
|
||||||
#KLIBC = true
|
#USE_KLIBC = true
|
||||||
|
|
||||||
# If you are running a cross compiler, you may want to set this
|
# If you are running a cross compiler, you may want to set this
|
||||||
# to something more interesting, like "arm-linux-". I you want
|
# to something more interesting, like "arm-linux-". I you want
|
||||||
|
@ -116,7 +116,7 @@ endif
|
||||||
|
|
||||||
# If we are using our version of klibc, then we need to build and link it.
|
# If we are using our version of klibc, then we need to build and link it.
|
||||||
# Otherwise, use glibc and link statically.
|
# Otherwise, use glibc and link statically.
|
||||||
ifeq ($(strip $(KLIBC)),true)
|
ifeq ($(strip $(USE_KLIBC)),true)
|
||||||
KLIBC_BASE = $(PWD)/klibc
|
KLIBC_BASE = $(PWD)/klibc
|
||||||
KLIBC_DIR = $(KLIBC_BASE)/klibc
|
KLIBC_DIR = $(KLIBC_BASE)/klibc
|
||||||
INCLUDE_DIR := $(KLIBC_DIR)/include
|
INCLUDE_DIR := $(KLIBC_DIR)/include
|
||||||
|
@ -180,11 +180,11 @@ OBJS = udev.o \
|
||||||
$(SYSFS) \
|
$(SYSFS) \
|
||||||
$(TDB)
|
$(TDB)
|
||||||
|
|
||||||
ifeq ($(strip $(KLIBC)),true)
|
ifeq ($(strip $(USE_KLIBC)),true)
|
||||||
OBJS += klibc_fixups.o
|
OBJS += klibc_fixups.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(DBUS), true)
|
ifeq ($(USE_DBUS), true)
|
||||||
CFLAGS += -DUSE_DBUS
|
CFLAGS += -DUSE_DBUS
|
||||||
CFLAGS += $(shell pkg-config --cflags dbus-1)
|
CFLAGS += $(shell pkg-config --cflags dbus-1)
|
||||||
LDFLAGS += $(shell pkg-config --libs dbus-1)
|
LDFLAGS += $(shell pkg-config --libs dbus-1)
|
||||||
|
@ -261,7 +261,7 @@ small_release: $(DISTFILES) clean
|
||||||
@echo "Built $(RELEASE_NAME).tar.gz"
|
@echo "Built $(RELEASE_NAME).tar.gz"
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(DBUS), true)
|
ifeq ($(USE_DBUS), true)
|
||||||
install-dbus-policy:
|
install-dbus-policy:
|
||||||
$(INSTALL) -d $(DESTDIR)$(dbusdir)
|
$(INSTALL) -d $(DESTDIR)$(dbusdir)
|
||||||
$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
|
$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
|
||||||
|
|
6
README
6
README
|
@ -32,18 +32,18 @@ To use:
|
||||||
installed into. This works just like the 'configure --prefix'
|
installed into. This works just like the 'configure --prefix'
|
||||||
script does. Default value is ''. Only override this if you
|
script does. Default value is ''. Only override this if you
|
||||||
really know what you are doing.
|
really know what you are doing.
|
||||||
KLIBC - if set to 'true', udev is built and linked against the included
|
USE_KLIBC - if set to 'true', udev is built and linked against the included
|
||||||
version of klibc. Default value is 'false'.
|
version of klibc. Default value is 'false'.
|
||||||
DEBUG - if set to 'true', debugging messages will be sent to the syslog
|
DEBUG - if set to 'true', debugging messages will be sent to the syslog
|
||||||
as udev is run. Default value is 'false'.
|
as udev is run. Default value is 'false'.
|
||||||
DBUS - if set to 'true', DBUS messages will be sent everytime udev
|
USE_DBUS - if set to 'true', DBUS messages will be sent everytime udev
|
||||||
creates or removes a device node. This requires that DBUS
|
creates or removes a device node. This requires that DBUS
|
||||||
development headers and libraries be present on your system to
|
development headers and libraries be present on your system to
|
||||||
build properly. Default value is 'false'.
|
build properly. Default value is 'false'.
|
||||||
|
|
||||||
So, if you want to build udev using klibc with debugging messages, you
|
So, if you want to build udev using klibc with debugging messages, you
|
||||||
would do:
|
would do:
|
||||||
make KLIBC=true DEBUG=true
|
make USE_KLIBC=true DEBUG=true
|
||||||
|
|
||||||
|
|
||||||
- Install the project:
|
- Install the project:
|
||||||
|
|
Loading…
Reference in New Issue