- introduce TARGET_CONFIGURE_ARGS to hold presets for configure for target packages
This commit is contained in:
parent
732beaf4d9
commit
de18b661cf
package
@ -186,7 +186,32 @@ HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
|
||||
STRIP_FOR_TARGET=$(TARGET_CROSS)strip \
|
||||
OBJCOPY_FOR_TARGET=$(TARGET_CROSS)objcopy
|
||||
|
||||
#######################################################################
|
||||
# settings we need to pass to configure
|
||||
|
||||
# does unaligned access trap?
|
||||
BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=yes
|
||||
ifeq ($(BR2_i386),y)
|
||||
BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_x86_64),y)
|
||||
BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_m68k),y)
|
||||
BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_s390),y)
|
||||
BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_powerpc)$(BR2_ENDIAN),yBIG)
|
||||
BR2_AC_CV_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
|
||||
TARGET_CONFIGURE_ARGS= \
|
||||
$(BR2_AC_CV_TRAP_CHECK) \
|
||||
|
||||
|
||||
#######################################################################
|
||||
|
||||
ifeq ($(BR2_ENABLE_LOCALE),y)
|
||||
DISABLE_NLS:=
|
||||
@ -207,6 +232,7 @@ TARGET_CONFIGURE_OPTS+=CXX=""
|
||||
endif
|
||||
|
||||
|
||||
|
||||
# X Windowing system
|
||||
|
||||
XSERVER:=
|
||||
|
@ -12,23 +12,6 @@ ARGUS_CAT:=$(ZCAT)
|
||||
ARGUS_BINARY:=bin/argus
|
||||
ARGUS_TARGET_BINARY:=usr/sbin/argus
|
||||
|
||||
ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=yes
|
||||
ifeq ($(BR2_i386),y)
|
||||
ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_x86_64),y)
|
||||
ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_m68k),y)
|
||||
ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_s390),y)
|
||||
ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
ifeq ($(BR2_powerpc)$(BR2_ENDIAN),yBIG)
|
||||
ARGUS_TRAP_CHECK=ac_cv_lbl_unaligned_fail=no
|
||||
endif
|
||||
|
||||
$(DL_DIR)/$(ARGUS_SOURCE):
|
||||
$(WGET) -P $(DL_DIR) $(ARGUS_SITE)/$(ARGUS_SOURCE)
|
||||
|
||||
@ -46,14 +29,14 @@ ifneq ($(ARGUS_PATCH),)
|
||||
toolchain/patch-kernel.sh $(ARGUS_DIR) $(ARGUS_DIR)/debian/patches \*.patch ; \
|
||||
fi
|
||||
endif
|
||||
touch $(ARGUS_DIR)/.unpacked
|
||||
touch $@
|
||||
|
||||
$(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
|
||||
(cd $(ARGUS_DIR); rm -rf config.cache; \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
$(ARGUS_TRAP_CHECK) \
|
||||
$(TARGET_CONFIGURE_ARGS) \
|
||||
./configure \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
@ -61,7 +44,7 @@ $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
|
||||
--prefix=/usr \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
);
|
||||
touch $(ARGUS_DIR)/.configured
|
||||
touch $@
|
||||
|
||||
$(ARGUS_DIR)/$(ARGUS_BINARY): $(ARGUS_DIR)/.configured
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(ARGUS_DIR)
|
||||
|
@ -37,13 +37,12 @@ $(LIBPCAP_DIR)/.unpacked: $(DL_DIR)/$(LIBPCAP_SOURCE)
|
||||
toolchain/patch-kernel.sh $(LIBPCAP_DIR) package/libpcap/ \*.patch
|
||||
touch $@
|
||||
|
||||
# XXX: FIXME: put the argus ac_cv_lbl_unaligned_fail setting to som commonly
|
||||
# seen place and introduce TARGET_CONFIGURE_HINTS or the like!
|
||||
$(LIBPCAP_DIR)/.configured: $(LIBPCAP_DIR)/.unpacked
|
||||
(cd $(LIBPCAP_DIR) ; rm -rf config.cache ; \
|
||||
ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
|
||||
BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
$(TARGET_CONFIGURE_ARGS) \
|
||||
./configure \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
|
Loading…
Reference in New Issue
Block a user