Ignore:
Timestamp:
Feb 25, 2011, 9:26:54 PM (9 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi-busybox/Makefile.flags

    r1765 r2725  
    44
    55BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
    6 SKIP_STRIP = n
     6export BB_VER
     7SKIP_STRIP ?= n
    78
    89# -std=gnu99 needed for [U]LLONG_MAX on some systems
     
    1112CPPFLAGS += \
    1213    -Iinclude -Ilibbb \
    13     $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) -I$(srctree)/libbb \
     14    $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include -I$(srctree)/libbb) \
    1415    -include include/autoconf.h \
    1516    -D_GNU_SOURCE -DNDEBUG \
     
    1718    -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP
    1819
    19 # flag checks are grouped together to speed the checks up a bit..
    20 CFLAGS += $(call cc-option,-Wall -Wshadow -Wwrite-strings,)
    21 CFLAGS += $(call cc-option,-Wundef -Wstrict-prototypes,)
    22 # If you want to add "-Wmissing-prototypes -Wmissing-declarations" above
    23 # (or anything else for that matter) make sure that it is still possible
    24 # to build bbox without warnings. Current offender: find.c:alloc_action().
    25 # Looks more like gcc bug: gcc will warn on it with or without prototype.
    26 # But still, warning-free compile is a must, or else we will drown
    27 # in warnings pretty soon.
     20CFLAGS += $(call cc-option,-Wall,)
     21CFLAGS += $(call cc-option,-Wshadow,)
     22CFLAGS += $(call cc-option,-Wwrite-strings,)
     23CFLAGS += $(call cc-option,-Wundef,)
     24CFLAGS += $(call cc-option,-Wstrict-prototypes,)
     25CFLAGS += $(call cc-option,-Wunused -Wunused-parameter,)
     26CFLAGS += $(call cc-option,-Wunused-function -Wunused-value,)
     27CFLAGS += $(call cc-option,-Wmissing-prototypes -Wmissing-declarations,)
     28# warn about C99 declaration after statement
     29CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
     30# If you want to add more -Wsomething above, make sure that it is
     31# still possible to build bbox without warnings.
    2832
    2933ifeq ($(CONFIG_WERROR),y)
    3034CFLAGS += $(call cc-option,-Werror,)
    31 else
    32 # for development, warn a little bit about unused results..
    33 CPPFLAGS += -D_FORTIFY_SOURCE=2
     35## TODO:
     36## gcc version 4.4.0 20090506 (Red Hat 4.4.0-4) (GCC) is a PITA:
     37## const char *ptr; ... off_t v = *(off_t*)ptr; -> BOOM
     38## and no easy way to convince it to shut the hell up.
     39## We have a lot of such things all over the place.
     40## Classic *(off_t*)(void*)ptr does not work,
     41## and I am unwilling to do crazy gcc specific ({ void *ppp = ...; })
     42## stuff in macros. This would obfuscate the code too much.
     43## Maybe try __attribute__((__may_alias__))?
     44#CFLAGS += $(call cc-ifversion, -eq, 0404, -fno-strict-aliasing)
    3445endif
    3546# gcc 3.x emits bogus "old style proto" warning on find.c:alloc_action()
    3647CFLAGS += $(call cc-ifversion, -ge, 0400, -Wold-style-definition)
    3748
    38 # gcc emits bogus "no prev proto" warning on find.c:alloc_action()
    39 ifneq ($(CONFIG_WERROR),y)
    40 CFLAGS += $(call cc-option,-Wmissing-prototypes -Wmissing-declarations,)
    41 endif
    42 
    43 CFLAGS += $(call cc-option,-Os -fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
     49CFLAGS += $(call cc-option,-fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
    4450# -fno-guess-branch-probability: prohibit pseudo-random guessing
    4551# of branch probabilities (hopefully makes bloatcheck more stable):
     
    5056# FIXME: These warnings are at least partially to be concerned about and should
    5157# be fixed..
    52 #CFLAGS+=$(call cc-option,-Wconversion,)
     58#CFLAGS += $(call cc-option,-Wconversion,)
    5359
    54 ifeq ($(CONFIG_DEBUG),y)
    55 CFLAGS += $(call cc-option,-g)
     60ifneq ($(CONFIG_DEBUG),y)
     61CFLAGS += $(call cc-option,-Os,)
     62else
     63CFLAGS += $(call cc-option,-g,)
     64#CFLAGS += "-D_FORTIFY_SOURCE=2"
     65ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
     66CFLAGS += $(call cc-option,-O0,)
     67else
     68CFLAGS += $(call cc-option,-Os,)
     69endif
     70endif
     71
     72# If arch/$(ARCH)/Makefile did not override it (with, say, -fPIC)...
     73ARCH_FPIC ?= -fpic
     74ARCH_FPIE ?= -fpie
     75ARCH_PIE ?= -pie
     76
     77ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
     78# on i386: 14% smaller libbusybox.so
     79# (code itself is 9% bigger, we save on relocs/PLT/GOT)
     80CFLAGS += $(ARCH_FPIC)
     81# and another 4% reduction of libbusybox.so:
     82# (external entry points must be marked EXTERNALLY_VISIBLE)
     83CFLAGS += $(call cc-option,-fvisibility=hidden)
    5684endif
    5785
    5886ifeq ($(CONFIG_STATIC),y)
    59 LDFLAGS += -static
     87CFLAGS_busybox += -static
    6088endif
    6189
    62 BBOX_LIB_LIST = m crypt
     90ifeq ($(CONFIG_PIE),y)
     91CFLAGS_busybox += $(ARCH_PIE)
     92CFLAGS += $(ARCH_FPIE)
     93endif
     94
     95ifneq ($(CONFIG_EXTRA_CFLAGS),)
     96CFLAGS += $(strip $(subst ",,$(CONFIG_EXTRA_CFLAGS)))
     97#"))
     98endif
     99
     100LDLIBS += m crypt
    63101
    64102ifeq ($(CONFIG_PAM),y)
    65 BBOX_LIB_LIST += pam pam_misc
     103LDLIBS += pam pam_misc
    66104endif
    67105
    68106ifeq ($(CONFIG_SELINUX),y)
    69 BBOX_LIB_LIST += selinux sepol
     107LDLIBS += selinux sepol
    70108endif
    71109
    72110ifeq ($(CONFIG_EFENCE),y)
    73 BBOX_LIB_LIST += efence
     111LDLIBS += efence
    74112endif
    75113
    76114ifeq ($(CONFIG_DMALLOC),y)
    77 BBOX_LIB_LIST += dmalloc
     115LDLIBS += dmalloc
    78116endif
    79117
    80 # For scripts/trylink
    81 export BBOX_LIB_LIST
    82 
    83 #LDFLAGS += -nostdlib
    84 
    85 LDFLAGS_ELF2FLT = -Wl,-elf2flt
    86 ifneq (,$(findstring $(LDFLAGS_ELF2FLT),$(LDFLAGS)))
     118# If a flat binary should be built, CFLAGS_busybox="-elf2flt"
     119# env var should be set for make invocation.
     120# Here we check whether CFLAGS_busybox indeed contains that flag.
     121# (For historical reasons, we also check LDFLAGS, which doesn't
     122# seem to be entirely correct variable to put "-elf2flt" into).
     123W_ELF2FLT = -elf2flt
     124ifneq (,$(findstring $(W_ELF2FLT),$(LDFLAGS) $(CFLAGS_busybox)))
    87125SKIP_STRIP = y
    88126endif
     
    91129# TODO: use "make stksizes" to find & fix big stack users
    92130# (we stole scripts/checkstack.pl from the kernel... thanks guys!)
    93 FLTFLAGS += -s 20000
     131# Reduced from 20k to 16k in 1.9.0.
     132FLTFLAGS += -s 16000
Note: See TracChangeset for help on using the changeset viewer.