Changeset 14010


Ignorieren:
Zeitstempel:
08.01.2017 16:53:56 (vor 6 Wochen)
Autor:
er13
Nachricht:

toolchain:

  • remove FREETZ_TARGET_LFS menuconfig symbol
  • from now LFS is always enabled (default so far) and could not be disabled [reasons: a) not supported for all packages anyway, b) AVM's toolchain is LFS-enabled]
  • refs #1939
Ort:
trunk
Dateien:
15 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/config/ui/toolchain.in

    r13868 r14010  
    391391            ls: /foo/bar: Datei oder Verzeichnis nicht gefunden 
    392392 
    393 config FREETZ_TARGET_LFS 
    394     bool "Large file support (LFS) for target toolchain" if FREETZ_BUILD_TOOLCHAIN 
    395     default y 
    396     select FREETZ_BUSYBOX_LFS 
    397     help 
    398         Support files > 2 GB on target system. This is desirable for Torrent 
    399         clients, for example. This option is enabled by default and should not 
    400         be changed unless you know what you are doing, as it can easily cause 
    401         problems. 
    402  
    403393config FREETZ_TARGET_TOOLCHAIN 
    404394    select FREETZ_LIB_libgmp 
  • trunk/include/site/freetz

    r12443 r14010  
    1717ac_cv_sizeof_ssize_t=4 
    1818ac_cv_sizeof_socklen_t=4 
    19 if [ "$FREETZ_TARGET_LFS" = "y" ]; then 
    20     ac_cv_sizeof_fpos_t=24 
    21     ac_cv_sizeof_off_t=8 
    22     ac_cv_sizeof_stat_st_size=8 
    23 else 
    24     ac_cv_sizeof_fpos_t=16 
    25     ac_cv_sizeof_off_t=4 
    26     ac_cv_sizeof_stat_st_size=4 
    27 fi 
     19ac_cv_sizeof_fpos_t=24 
     20ac_cv_sizeof_off_t=8 
     21ac_cv_sizeof_stat_st_size=8 
    2822 
    2923# Header files 
  • trunk/make/Makefile.in

    r13648 r14010  
    3434endif 
    3535 
    36 CFLAGS_LFS_ENABLED:=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
    37 CFLAGS_LFS_DISABLED:=-D_FILE_OFFSET_BITS=32 
    38 ifeq ($(strip $(FREETZ_TARGET_LFS)),y) 
    39 DISABLE_LARGEFILE:= 
    40 CFLAGS_LARGEFILE=$(CFLAGS_LFS_ENABLED) 
    41 else 
    42 DISABLE_LARGEFILE:=--disable-largefile 
    43 CFLAGS_LARGEFILE=$(CFLAGS_LFS_DISABLED) 
    44 endif 
     36TARGET_CFLAGS_LFS:=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
    4537 
    4638# TODO: investigate if the flags could/should be changed to the commented out ones 
     
    6355    These flags are automatically set by freetz build environment now) 
    6456endif 
    65 TARGET_CFLAGS:=$(TARGET_CFLAGS_ARCH_CPU_TUNE) $(TARGET_CFLAGS_FLOAT_ABI) $(call qstrip,$(FREETZ_TARGET_CFLAGS)) $(CFLAGS_LARGEFILE) 
     57TARGET_CFLAGS:=$(TARGET_CFLAGS_ARCH_CPU_TUNE) $(TARGET_CFLAGS_FLOAT_ABI) $(call qstrip,$(FREETZ_TARGET_CFLAGS)) $(TARGET_CFLAGS_LFS) 
    6658 
    6759TARGET_SPECIFIC_SUBDIR:=target-$(TARGET_TOOLCHAIN_COMPILER) 
     
    171163TARGET_CONFIGURE_OPTIONS += --with-gnu-ld 
    172164TARGET_CONFIGURE_OPTIONS += $(DISABLE_NLS) 
    173 TARGET_CONFIGURE_OPTIONS += $(DISABLE_LARGEFILE) 
    174165 
    175166DL_SITE:=$(call qstrip,$(FREETZ_DL_SITE)) 
     
    823814        $(TARGET_CONFIGURE_ENV) \ 
    824815        $($(PKG)_CONFIGURE_ENV) \ 
    825         FREETZ_TARGET_LFS="$(strip $(FREETZ_TARGET_LFS))" \ 
    826816        CONFIG_SITE=$(CONFIG_SITE) \ 
    827817        conf_cmd \ 
  • trunk/make/busybox/Config.in

    r13512 r14010  
    180180    select FREETZ_BUSYBOX_KILLALL 
    181181    select FREETZ_BUSYBOX_KILL 
     182    select FREETZ_BUSYBOX_LFS 
    182183    select FREETZ_BUSYBOX_LN 
    183184    select FREETZ_BUSYBOX_LOGGER 
  • trunk/make/dosfstools/Config.in

    r13154 r14010  
    11config FREETZ_PACKAGE_DOSFSTOOLS 
    22    bool "dosfstools 3.0.28 (binary only)" 
    3     depends on FREETZ_TARGET_LFS 
    43    select FREETZ_LIB_libiconv if FREETZ_TARGET_UCLIBC_0_9_28 
    54    default n 
  • trunk/make/libs/uclibcxx/uclibcxx.mk

    r13668 r14010  
    1919endif 
    2020 
    21 $(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_LFS 
    2221$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libuClibc__WITH_WCHAR 
    2322 
     
    2827    cp $(UCLIBCXX_MAKE_DIR)/Config.uclibc++ $(UCLIBCXX_DIR)/.config 
    2928    $(call PKG_EDIT_CONFIG, \ 
    30         UCLIBCXX_HAS_LFS=$(FREETZ_TARGET_LFS) \ 
    3129        UCLIBCXX_HAS_WCHAR=$(FREETZ_LIB_libuClibc__WITH_WCHAR) \ 
    3230        UCLIBCXX_SUPPORT_WCIN=$(FREETZ_LIB_libuClibc__WITH_WCHAR) \ 
  • trunk/make/lsof/lsof.mk

    r13411 r14010  
    2323$(PKG)_CONFIGURE_ENV += LSOF_RANLIB="$(TARGET_RANLIB)" 
    2424$(PKG)_CONFIGURE_ENV += LSOF_CCV="$(FREETZ_TARGET_GCC_VERSION)" 
    25 $(PKG)_CONFIGURE_ENV += LSOF_TSTBIGF="$(if $(FREETZ_TARGET_LFS),$(CFLAGS_LARGEFILE))" 
     25$(PKG)_CONFIGURE_ENV += LSOF_TSTBIGF="$(TARGET_CFLAGS_LFS)" 
    2626$(PKG)_CONFIGURE_ENV += LINUX_HASIPV6="$(LSOF_HASIPV6)" 
    2727$(PKG)_CONFIGURE_ENV += LINUX_HASSELINUX="N" 
  • trunk/make/samba/samba.mk

    r13129 r14010  
    1616$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_SAMBA_MAX_DEBUG_LEVEL 
    1717$(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT 
    18 $(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_LFS 
    1918 
    2019$(PKG)_BINARY:=samba_multicall 
  • trunk/make/samba/samba30.mk.in

    r11072 r14010  
    66    fu_cv_sys_stat_statfs2_bsize=yes \ 
    77    libreplace_cv_HAVE_IPV6=$(if $(FREETZ_TARGET_IPV6_SUPPORT),yes,no) \ 
    8     LINUX_LFS_SUPPORT=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
     8    LINUX_LFS_SUPPORT=yes \ 
    99    samba_cv_fpie=no \ 
    1010    samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \ 
     
    3939    samba_cv_REPLACE_INET_NTOA=no \ 
    4040    samba_cv_SIZEOF_DEV_T=yes \ 
    41     samba_cv_SIZEOF_INO_T=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
    42     samba_cv_SIZEOF_OFF_T=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
     41    samba_cv_SIZEOF_INO_T=yes \ 
     42    samba_cv_SIZEOF_OFF_T=yes \ 
    4343    samba_cv_SIZEOF_TIME_T=no \ 
    4444    samba_cv_USE_SETREUID=yes \ 
    4545    samba_sys_stat_statvfs=no \ 
    46     samba_sys_stat_statvfs64=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
     46    samba_sys_stat_statvfs64=yes \ 
    4747    SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes 
    4848 
  • trunk/make/samba/samba36.mk.in

    r10790 r14010  
    1515    libreplace_cv_HAVE_SECURE_MKSTEMP=yes \ 
    1616    libreplace_cv_REPLACE_INET_NTOA=no \ 
    17     LINUX_LFS_SUPPORT=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
     17    LINUX_LFS_SUPPORT=yes \ 
    1818    samba_path_PYTHON="" \ 
    1919    samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ 
     
    4949    samba_cv_REALPATH_TAKES_NULL=yes \ 
    5050    samba_cv_SIZEOF_DEV_T=yes \ 
    51     samba_cv_SIZEOF_INO_T=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
    52     samba_cv_SIZEOF_OFF_T=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
     51    samba_cv_SIZEOF_INO_T=yes \ 
     52    samba_cv_SIZEOF_OFF_T=yes \ 
    5353    samba_cv_SIZEOF_TIME_T=no \ 
    5454    samba_cv_TIME_T_MAX=no \ 
    5555    samba_cv_USE_SETRESUID=yes \ 
    5656    samba_cv_USE_SETREUID=yes \ 
    57     samba_sys_stat_statvfs64=$(if $(FREETZ_TARGET_LFS),yes,no) \ 
     57    samba_sys_stat_statvfs64=yes \ 
    5858    vfsfileid_cv_statfs=yes 
    5959 
  • trunk/make/target-tester/target-tester.mk

    r12239 r14010  
    44$(PKG)_BINARY_LFS:=$($(PKG)_DIR)/$($(PKG)_BINARY_NAME_LFS) 
    55$(PKG)_TARGET_BINARY_LFS:=$($(PKG)_DEST_DIR)/usr/bin/$($(PKG)_BINARY_NAME_LFS) 
    6  
    7 $(PKG)_BINARY_NAME_NOLFS:=target-tester-nolfs 
    8 $(PKG)_BINARY_NOLFS:=$($(PKG)_DIR)/$($(PKG)_BINARY_NAME_NOLFS) 
    9 $(PKG)_TARGET_BINARY_NOLFS:=$($(PKG)_DEST_DIR)/usr/bin/$($(PKG)_BINARY_NAME_NOLFS) 
    106 
    117$(PKG)_BINARIES:= \ 
     
    4945$(PKG)_CATEGORY:=Debug helpers 
    5046 
    51 TARGET_CFLAGS_WITHOUT_LARGEFILE_FLAGS:=$(strip $(subst $(CFLAGS_LARGEFILE),,$(TARGET_CFLAGS))) 
    5247TARGET_CFLAGS_WITHOUT_OPTIMIZATION_FLAGS:=$(strip $(subst -Os,,$(TARGET_CFLAGS))) 
    5348 
     
    6257        PREREQUISITE=$(2) \ 
    6358        CC="$(3)" \ 
    64         CFLAGS="$(TARGET_CFLAGS_WITHOUT_LARGEFILE_FLAGS) $(4)" 
     59        CFLAGS="$(TARGET_CFLAGS) $(4)" 
    6560endef 
    6661 
    67 $(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_LFS),target-tester,$(TARGET_CC),$(CFLAGS_LFS_ENABLED) -DINCLUDE_LFS_ONLY_TYPES)) 
    68 $(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_NOLFS),target-tester,$(TARGET_CC),$(CFLAGS_LFS_DISABLED))) 
     62$(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_LFS),target-tester,$(TARGET_CC),-DINCLUDE_LFS_ONLY_TYPES)) 
    6963$(foreach binary,$($(PKG)_BINARIES), \ 
    70     $(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_DIR)/$(binary),$(binary),$(TARGET_CC),$(CFLAGS_LFS_ENABLED))) \ 
     64    $(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_DIR)/$(binary),$(binary),$(TARGET_CC))) \ 
    7165) 
    7266$(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_excepttest),$($(PKG)_BINARY_NAME_excepttest),$(TARGET_CXX),-g -ggdb3 $(TARGET_CFLAGS_WITHOUT_OPTIMIZATION_FLAGS))) 
    7367 
    7468 
    75 $($(PKG)_TARGET_BINARY_LFS) $($(PKG)_TARGET_BINARY_NOLFS) $($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/bin/%: $($(PKG)_DIR)/% 
     69$($(PKG)_TARGET_BINARY_LFS) $($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/bin/%: $($(PKG)_DIR)/% 
    7670    $(INSTALL_BINARY_STRIP) 
    7771 
     
    9084$(pkg): 
    9185 
    92 $(pkg)-precompiled: $($(PKG)_TARGET_BINARY_LFS) $($(PKG)_TARGET_BINARY_NOLFS) $($(PKG)_BINARIES_TARGET_DIR) $($(PKG)_TARGET_BINARY_excepttest) 
     86$(pkg)-precompiled: $($(PKG)_TARGET_BINARY_LFS) $($(PKG)_BINARIES_TARGET_DIR) $($(PKG)_TARGET_BINARY_excepttest) 
    9387 
    9488$(pkg)-clean: 
    9589    -$(MAKE_ENV) $(MAKE) -C $(TARGET_TESTER_DIR) TARGET=$(TARGET_TESTER_BINARY_NAME_LFS) clean 
    96     -$(MAKE_ENV) $(MAKE) -C $(TARGET_TESTER_DIR) TARGET=$(TARGET_TESTER_BINARY_NAME_NOLFS) clean 
    9790 
    9891$(pkg)-uninstall: 
    99     $(RM) $(TARGET_TESTER_TARGET_BINARY_LFS) $(TARGET_TESTER_TARGET_BINARY_NOLFS) $(TARGET_TESTER_BINARIES_TARGET_DIR) 
     92    $(RM) $(TARGET_TESTER_TARGET_BINARY_LFS) $(TARGET_TESTER_BINARIES_TARGET_DIR) 
    10093 
    10194$(PKG_FINISH) 
  • trunk/make/truecrypt/truecrypt.mk

    r13033 r14010  
    1515$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TRUECRYPT_STATIC 
    1616 
    17 # strip lfs flags 
    18 $(PKG)_CFLAGS := $(subst $(CFLAGS_LARGEFILE),,$(TARGET_CFLAGS)) 
     17# strip LFS flags 
     18$(PKG)_CFLAGS := $(subst $(TARGET_CFLAGS_LFS),,$(TARGET_CFLAGS)) 
    1919 
    2020$(PKG_SOURCE_DOWNLOAD) 
     
    3131        ARCH=$(TARGET_ARCH) \ 
    3232        \ 
    33         LFS_FLAGS="$(CFLAGS_LFS_ENABLED)" \ 
     33        LFS_FLAGS="$(TARGET_CFLAGS_LFS)" \ 
    3434        \ 
    3535        CC="$(TARGET_CC)" \ 
  • trunk/toolchain/make/target/binutils/binutils.mk

    r13868 r14010  
    8585        CFLAGS_FOR_BUILD="-O2 $(TOOLCHAIN_HOST_CFLAGS)" \ 
    8686        $(TARGET_CONFIGURE_ENV) \ 
    87         FREETZ_TARGET_LFS="$(strip $(FREETZ_TARGET_LFS))" \ 
    8887        CONFIG_SITE=$(CONFIG_SITE) \ 
    8988        $(BINUTILS_DIR)/configure \ 
  • trunk/toolchain/make/target/gcc/gcc.mk

    r13866 r14010  
    3434GCC_COMMON_CONFIGURE_OPTIONS += $(GCC_COMMON_CONFIGURE_OPTIONS_ARCH_ABI) 
    3535GCC_COMMON_CONFIGURE_OPTIONS += --disable-nls 
    36 GCC_COMMON_CONFIGURE_OPTIONS += $(DISABLE_LARGEFILE) 
    3736GCC_COMMON_CONFIGURE_OPTIONS += $(QUIET) 
    3837 
     
    229228    (cd $(GCC_BUILD_DIR3); $(RM) config.cache; \ 
    230229        $(TARGET_CONFIGURE_ENV) \ 
    231         FREETZ_TARGET_LFS="$(strip $(FREETZ_TARGET_LFS))" \ 
    232230        CONFIG_SITE=$(CONFIG_SITE) \ 
    233231        \ 
  • trunk/toolchain/make/target/uclibc/uclibc.mk

    r13542 r14010  
    7979        CONFIG_MIPS_ISA_MIPS32R2=$(if $(FREETZ_TARGET_ARCH_BE),y,n) \ 
    8080        UCLIBC_HAS_IPV6=$(FREETZ_TARGET_IPV6_SUPPORT) \ 
    81         UCLIBC_HAS_LFS=$(FREETZ_TARGET_LFS) \ 
    8281        UCLIBC_HAS_FOPEN_LARGEFILE_MODE=n \ 
    8382        UCLIBC_HAS_WCHAR=y \ 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.