Compare commits
4
Commits
1_9_2
..
1_9_stable
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b30688a799 | ||
|
|
baa9a71fa0 | ||
|
|
21756c7d10 | ||
|
|
fd8494d114 |
No files matched your search
+33
-19
@@ -6,12 +6,42 @@ objtree := $(CURDIR)
|
||||
src := $(srctree)
|
||||
obj := $(objtree)
|
||||
|
||||
# Look for make include files relative to root of kernel src
|
||||
MAKEFLAGS += --include-dir=$(srctree)
|
||||
|
||||
default: busybox
|
||||
|
||||
ifndef HOSTCC
|
||||
HOSTCC = cc
|
||||
endif
|
||||
AS = $(CROSS_COMPILE)as
|
||||
CC = $(CROSS_COMPILE)gcc
|
||||
LD = $(CC) -nostdlib
|
||||
CPP = $(CC) -E
|
||||
AR = $(CROSS_COMPILE)ar
|
||||
NM = $(CROSS_COMPILE)nm
|
||||
STRIP = $(CROSS_COMPILE)strip
|
||||
OBJCOPY = $(CROSS_COMPILE)objcopy
|
||||
OBJDUMP = $(CROSS_COMPILE)objdump
|
||||
|
||||
CFLAGS := $(CFLAGS)
|
||||
CPPFLAGS+= -D"KBUILD_STR(s)=\#s" #-Q
|
||||
WHOLE_PROGRAM:=$(call cc-option,-fwhole-program,)
|
||||
|
||||
include .config
|
||||
# We need some generic definitions
|
||||
include $(srctree)/scripts/Kbuild.include
|
||||
|
||||
include Makefile.flags
|
||||
ifdef CONFIG_FEATURE_COMPRESS_USAGE
|
||||
usage_stuff = include/usage_compressed.h
|
||||
endif
|
||||
|
||||
ifndef BB_VER
|
||||
BB_VER:=""
|
||||
endif
|
||||
|
||||
|
||||
# pull in the config stuff
|
||||
lib-all-y := applets/applets.o
|
||||
lib-y:=
|
||||
@@ -96,6 +126,9 @@ lib-y:=
|
||||
include libpwdgrp/Kbuild
|
||||
lib-all-y += $(patsubst %,libpwdgrp/%,$(sort $(lib-y)))
|
||||
lib-y:=
|
||||
include ipsvd/Kbuild
|
||||
lib-all-y += $(patsubst %,ipsvd/%,$(sort $(lib-y)))
|
||||
lib-y:=
|
||||
include editors/Kbuild
|
||||
lib-all-y += $(patsubst %,editors/%,$(sort $(lib-y)))
|
||||
lib-y:=
|
||||
@@ -109,25 +142,6 @@ include libbb/Kbuild
|
||||
lib-all-y += $(patsubst %,libbb/%,$(sort $(lib-y)))
|
||||
lib-y:=
|
||||
|
||||
include Makefile.flags
|
||||
ifndef BB_VER
|
||||
BB_VER:=""
|
||||
endif
|
||||
|
||||
CPPFLAGS+= -D"KBUILD_STR(s)=\#s" #-Q
|
||||
|
||||
HOSTCC = gcc
|
||||
AS = $(CROSS_COMPILE)as
|
||||
CC = $(CROSS_COMPILE)gcc
|
||||
LD = $(CC) -nostdlib
|
||||
CPP = $(CC) -E
|
||||
AR = $(CROSS_COMPILE)ar
|
||||
NM = $(CROSS_COMPILE)nm
|
||||
STRIP = $(CROSS_COMPILE)strip
|
||||
OBJCOPY = $(CROSS_COMPILE)objcopy
|
||||
OBJDUMP = $(CROSS_COMPILE)objdump
|
||||
|
||||
WHOLE_PROGRAM:=$(call cc-option,-fwhole-program,)
|
||||
busybox: $(usage_stuff)
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) --combine $(WHOLE_PROGRAM) \
|
||||
-funit-at-a-time -Wno-error -std=gnu99 \
|
||||
|
||||
+23
-19
@@ -8,28 +8,32 @@
|
||||
*/
|
||||
|
||||
#include "libbb.h"
|
||||
|
||||
#if !defined CONFIG_SYSLOGD
|
||||
|
||||
/* SYSLOG_NAMES defined to pull prioritynames[] and facilitynames[]
|
||||
* from syslog.h. Grrrr - glibc puts those in _rwdata_! :( */
|
||||
#ifndef CONFIG_SYSLOGD
|
||||
#define SYSLOG_NAMES
|
||||
#define SYSLOG_NAMES_CONST /* uclibc is saner :) */
|
||||
#include <sys/syslog.h>
|
||||
|
||||
#define SYSLOG_NAMES_CONST
|
||||
#include <syslog.h>
|
||||
#else
|
||||
#include <sys/syslog.h>
|
||||
# ifndef __dietlibc__
|
||||
/* We have to do this since the header file defines static
|
||||
* structures. Argh.... bad libc, bad, bad...
|
||||
*/
|
||||
typedef struct _code {
|
||||
char *c_name;
|
||||
int c_val;
|
||||
} CODE;
|
||||
extern CODE prioritynames[];
|
||||
extern CODE facilitynames[];
|
||||
/* brokenness alert. Everybody except dietlibc get's this wrong by neither
|
||||
* providing a typedef nor an extern for facilitynames and prioritynames
|
||||
* in syslog.h.
|
||||
*/
|
||||
# include <syslog.h>
|
||||
# ifndef __dietlibc__
|
||||
/* We have to do this since the header file does neither provide a sane type
|
||||
* for this structure nor extern definitions. Argh.... bad libc, bad, bad...
|
||||
*/
|
||||
typedef struct _code {
|
||||
char *c_name; /* FIXME: this should be const char *const c_name ! */
|
||||
int c_val;
|
||||
} CODE;
|
||||
# ifdef __UCLIBC__
|
||||
extern const CODE prioritynames[];
|
||||
extern const CODE facilitynames[];
|
||||
# else
|
||||
extern CODE prioritynames[];
|
||||
extern CODE facilitynames[];
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Decode a symbolic name to a numeric value
|
||||
|
||||
Reference in new issue
Block a user