gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package: get rid of redundant malloc related configure presets 

Those are already in TARGET_CONFIGURE_ARGS. Also get rid of unused
BR2_AC_CV_FUNC_MALLOC_0_NONNULL variable.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2009-12-06 19:55:42 +01:00
parent d8968c6794
commit 9e76714747
21 changed files with 6 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/Makefile.in
View File

@ -303,20 +303,6 @@ else
BR2_AC_CV_C_BIGENDIAN=ac_cv_c_bigendian=no
endif
# XXX: FIXME: We would need to grab MALLOC_GLIBC_COMPAT from the uClibc.config
# Including it doesn't seem wise, grepping is ugly.. Suggestions?
# Does malloc return live pointer for malloc(0) ?
ifeq ($(MALLOC_GLIBC_COMPAT),y)
BR2_AC_CV_FUNC_MALLOC_0_NONNULL=ac_cv_func_malloc_0_nonnull=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes
else
BR2_AC_CV_FUNC_MALLOC_0_NONNULL=ac_cv_func_malloc_0_nonnull=no \
gl_cv_func_malloc_0_nonnull=no \
ac_cv_func_realloc_0_nonnull=no
endif
TARGET_CONFIGURE_ARGS= \
$(BR2_AC_CV_TRAP_CHECK) \
ac_cv_func_mmap_fixed_mapped=yes \

2
package/atk/atk.mk
View File

@ -28,8 +28,6 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
ac_cv_func_getdelim=yes ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_memcmp_working=yes ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no gl_cv_func_working_readdir=yes \
jm_ac_cv_func_link_follows_symlink=no utils_cv_localtime_cache=no \
ac_cv_struct_st_mtim_nsec=no gl_cv_func_tzset_clobber=no \

6
package/avahi/avahi.mk
View File

@ -46,12 +46,6 @@ AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no \
am_cv_func_working_getline=yes \
gl_cv_func_working_readdir=yes \

2
package/bootutils/bootutils.mk
View File

@ -6,8 +6,6 @@
BOOTUTILS_VERSION = 0.0.9
BOOTUTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bootutils
BOOTUTILS_CONF_ENV = ac_cv_func_malloc_0_nonnull=yes
BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/
BOOTUTILS_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) install

5
package/cairo/cairo.mk
View File

@ -26,10 +26,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
utils_cv_func_mkdir_trailing_slash_bug=no jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \

6
package/coreutils/coreutils.mk
View File

@ -63,12 +63,6 @@ $(COREUTILS_DIR)/.configured: $(COREUTILS_DIR)/.unpacked
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
gl_cv_func_rename_dest_exists_bug=no \
ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no \
am_cv_func_working_getline=yes \
gl_cv_func_working_readdir=yes \

6
package/diffutils/diffutils.mk
View File

@ -55,12 +55,6 @@ $(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked
ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no \
am_cv_func_working_getline=yes \
gl_cv_func_working_readdir=yes \

2
package/fbdump/fbdump.mk
View File

@ -7,8 +7,6 @@ FBDUMP_VERSION:=0.4.2
FBDUMP_SOURCE:=fbdump-$(FBDUMP_VERSION).tar.gz
FBDUMP_SITE:=http://www.rcdrummond.net/fbdump
FBDUMP_AUTORECONF = NO
FBDUMP_CONF_ENV = ac_cv_func_malloc_0_nonnull=yes
FBDUMP_INSTALL_TARGET = YES
$(eval $(call AUTOTARGETS,package,fbdump))

4
package/games/gnuchess/gnuchess.mk
View File

@ -6,10 +6,6 @@
GNUCHESS_VERSION = 5.07
GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz
GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
GNUCHESS_INSTALL_STAGING = NO
GNUCHESS_INSTALL_TARGET = YES
GNUCHESS_CONF_ENV = ac_cv_func_realloc_0_nonnull=yes ac_cv_func_malloc_0_nonnull=yes
$(eval $(call AUTOTARGETS,package/games,gnuchess))

6
package/gettext/gettext.mk
View File

@ -67,12 +67,6 @@ $(GETTEXT_DIR)/.configured: $(GETTEXT_DIR)/.unpacked
ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes \
jm_ac_cv_func_link_follows_symlink=no \

6
package/gtk2-engines/gtk2-engines.mk
View File

@ -46,12 +46,6 @@ GTK2_ENGINES_BUILD_ENV= \
ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes \
jm_ac_cv_func_link_follows_symlink=no \

5
package/iperf/iperf.mk
View File

@ -8,9 +8,6 @@ IPERF_VERSION:=2.0.3
IPERF_SOURCE:=iperf-$(IPERF_VERSION).tar.gz
IPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
IPERF_AUTORECONF:=NO
IPERF_INSTALL_STAGING:=NO
IPERF_INSTALL_TARGET:=YES
IPERF_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes
IPERF_CONF_OPT:=--disable-dependency-tracking --disable-web100 $(DISABLE_IPV6)
IPERF_CONF_OPT:=--disable-dependency-tracking --disable-web100
$(eval $(call AUTOTARGETS,package,iperf))

4
package/java/classpath/classpath.mk
View File

@ -30,9 +30,7 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \

4
package/java/jamvm/jamvm.mk
View File

@ -28,9 +28,7 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \

4
package/libglib2/libglib2.mk
View File

@ -33,9 +33,7 @@ LIBGLIB2_CONF_ENV = \
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \

6
package/libgtk2/libgtk2.mk
View File

@ -45,12 +45,6 @@ LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes \
jm_ac_cv_func_link_follows_symlink=no \

7
package/libpng/libpng.mk
View File

@ -8,13 +8,6 @@ LIBPNG_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/li
LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
LIBPNG_LIBTOOL_PATCH = NO
LIBPNG_INSTALL_STAGING = YES
LIBPNG_INSTALL_TARGET = YES
LIBPNG_CONF_ENV = \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes
LIBPNG_CONF_OPT = --without-libpng-compat
LIBPNG_DEPENDENCIES = host-pkgconfig zlib

5
package/lvm2/lvm2.mk
View File

@ -61,11 +61,6 @@ $(LVM2_DIR)/.configured: $(LVM2_DIR)/.unpacked
(cd $(LVM2_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
./configure $(QUIET) \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \

5
package/pango/pango.mk
View File

@ -26,10 +26,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
utils_cv_func_mkdir_trailing_slash_bug=no jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \

5
package/psmisc/psmisc.mk
View File

@ -7,11 +7,6 @@ PSMISC_VERSION:=22.8
PSMISC_SOURCE:=psmisc-$(PSMISC_VERSION).tar.gz
PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
PSMISC_AUTORECONF:=NO
PSMISC_INSTALL_STAGING:=NO
PSMISC_INSTALL_TARGET:=YES
PSMISC_CONF_ENV:=ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes
PSMISC_CONF_OPT:= $(DISABLE_IPV6)
PSMISC_DEPENDENCIES:=ncurses
ifeq ($(BR2_ENABLE_LOCALE),y)

1
package/x11r7/xlib_libX11/xlib_libX11.mk
View File

@ -10,7 +10,6 @@ XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBX11_AUTORECONF = YES
XLIB_LIBX11_INSTALL_STAGING = YES
XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto
XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes
XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static --with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11))