chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fee6f41
)
[PATCH] klibc makefile fixes
author
arnd@arndb.de
<arnd@arndb.de>
Tue, 25 Nov 2003 06:10:23 +0000
(22:10 -0800)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 04:13:02 +0000
(21:13 -0700)
Makefile
patch
|
blob
|
history
tdb/tdb.h
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index af181fe24ad520e4421e923b61571a896879b936..d0c00aa88c935db8597088af7f7017b8616135c5 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-55,6
+55,7
@@
udevdir = ${prefix}/udev/
# to compile vs uClibc, that can be done here as well.
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
CC = $(CROSS)gcc
# to compile vs uClibc, that can be done here as well.
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
CC = $(CROSS)gcc
+LD = $(CROSS)gcc
AR = $(CROSS)ar
STRIP = $(CROSS)strip
RANLIB = $(CROSS)ranlib
AR = $(CROSS)ar
STRIP = $(CROSS)strip
RANLIB = $(CROSS)ranlib
@@
-109,6
+110,7
@@
endif
ifeq ($(strip $(KLIBC)),true)
KLIBC_DIR = klibc/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
ifeq ($(strip $(KLIBC)),true)
KLIBC_DIR = klibc/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
+ include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
# arch specific objects
LIBGCC = $(shell $(CC) --print-libgcc)
ARCH_LIB_OBJS = \
# arch specific objects
LIBGCC = $(shell $(CC) --print-libgcc)
ARCH_LIB_OBJS = \
@@
-117,8
+119,10
@@
ifeq ($(strip $(KLIBC)),true)
CRT0 = $(KLIBC_DIR)/crt0.o
CRT0 = $(KLIBC_DIR)/crt0.o
- LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS)
- CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+ LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
+ CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(KLIBC_DIR)/arch/$(ARCH)/include \
+ -I$(INCLUDE_DIR)/bits$(BITSIZE) -I$(GCCINCDIR) -Iklibc/linux/include \
+ -D__KLIBC__
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles
else
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles
else
@@
-169,7
+173,7
@@
udev_version.h:
$(ROOT): $(GEN_HEADERS) $(OBJS)
$(ROOT): $(GEN_HEADERS) $(OBJS)
- $(
CC
) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(
LD
) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $(ROOT)
clean:
$(STRIPCMD) $(ROOT)
clean:
diff --git
a/tdb/tdb.h
b/tdb/tdb.h
index 6f3b1ff7562786e90a7f4715d1a8349206f32710..e236b31af516c08dd0464c609b96744934d869f9 100644
(file)
--- a/
tdb/tdb.h
+++ b/
tdb/tdb.h
@@
-25,6
+25,7
@@
extern "C" {
#endif
extern "C" {
#endif
+#include <signal.h>
/* flags to tdb_store() */
#define TDB_REPLACE 1
/* flags to tdb_store() */
#define TDB_REPLACE 1