Update of /cvsroot/leaf/src/bering-uclibc/apps/buildenv
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9245
Modified Files:
.config buildtool.cfg buildtool.mk
Log Message:
update to uClibc-0.9.28 and removed no longer needed patches
Index: .config
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/buildenv/.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .config 15 Mar 2005 21:40:25 -0000 1.1
--- .config 18 Jun 2006 20:59:10 -0000 1.2
***************
*** 2,5 ****
--- 2,25 ----
# Automatically generated make config: don't edit
#
+ # TARGET_alpha is not set
+ # TARGET_arm is not set
+ # TARGET_bfin is not set
+ # TARGET_cris is not set
+ # TARGET_e1 is not set
+ # TARGET_frv is not set
+ # TARGET_h8300 is not set
+ TARGET_i386=y
+ # TARGET_i960 is not set
+ # TARGET_m68k is not set
+ # TARGET_microblaze is not set
+ # TARGET_mips is not set
+ # TARGET_nios is not set
+ # TARGET_nios2 is not set
+ # TARGET_powerpc is not set
+ # TARGET_sh is not set
+ # TARGET_sh64 is not set
+ # TARGET_sparc is not set
+ # TARGET_v850 is not set
+ # TARGET_x86_64 is not set
#
***************
*** 7,10 ****
--- 27,32 ----
#
HAVE_ELF=y
+ ARCH_SUPPORTS_LITTLE_ENDIAN=y
+ TARGET_ARCH="i386"
CONFIG_GENERIC_386=y
# CONFIG_386 is not set
***************
*** 13,30 ****
# CONFIG_586MMX is not set
# CONFIG_686 is not set
# CONFIG_PENTIUMIII is not set
# CONFIG_PENTIUM4 is not set
# CONFIG_K6 is not set
# CONFIG_K7 is not set
# CONFIG_CRUSOE is not set
# CONFIG_WINCHIPC6 is not set
# CONFIG_WINCHIP2 is not set
# CONFIG_CYRIXIII is not set
! UCLIBC_HAS_MMU=y
UCLIBC_HAS_FLOATS=y
HAS_FPU=y
DO_C99_MATH=y
! WARNINGS="-Wall"
! KERNEL_SOURCE="/usr/src/linux"
C_SYMBOL_PREFIX=""
HAVE_DOT_CONFIG=y
--- 35,57 ----
# CONFIG_586MMX is not set
# CONFIG_686 is not set
+ # CONFIG_PENTIUMII is not set
# CONFIG_PENTIUMIII is not set
# CONFIG_PENTIUM4 is not set
# CONFIG_K6 is not set
# CONFIG_K7 is not set
+ # CONFIG_ELAN is not set
# CONFIG_CRUSOE is not set
# CONFIG_WINCHIPC6 is not set
# CONFIG_WINCHIP2 is not set
# CONFIG_CYRIXIII is not set
! # CONFIG_NEHEMIAH is not set
! ARCH_LITTLE_ENDIAN=y
! # ARCH_BIG_ENDIAN is not set
! # ARCH_HAS_NO_MMU is not set
! ARCH_HAS_MMU=y
UCLIBC_HAS_FLOATS=y
HAS_FPU=y
DO_C99_MATH=y
! KERNEL_SOURCE="/usr/src/linux/linux"
C_SYMBOL_PREFIX=""
HAVE_DOT_CONFIG=y
***************
*** 33,54 ****
# General Library Settings
#
DOPIC=y
HAVE_SHARED=y
! # ADD_LIBGCC_FUNCTIONS is not set
BUILD_UCLIBC_LDSO=y
LDSO_LDD_SUPPORT=y
UCLIBC_CTOR_DTOR=y
! # UCLIBC_PROFILING is not set
UCLIBC_HAS_THREADS=y
# PTHREADS_DEBUG_SUPPORT is not set
UCLIBC_HAS_LFS=y
# MALLOC is not set
! MALLOC_930716=y
# UCLIBC_DYNAMIC_ATEXIT is not set
HAS_SHADOW=y
- UCLIBC_HAS_REGEX=y
# UNIX98PTY_ONLY is not set
# ASSUME_DEVPTS is not set
UCLIBC_HAS_TM_EXTENSIONS=y
#
--- 60,94 ----
# General Library Settings
#
+ # HAVE_NO_PIC is not set
DOPIC=y
+ # HAVE_NO_SHARED is not set
HAVE_SHARED=y
! # ARCH_HAS_NO_LDSO is not set
BUILD_UCLIBC_LDSO=y
+ # FORCE_SHAREABLE_TEXT_SEGMENTS is not set
LDSO_LDD_SUPPORT=y
+ # LDSO_CACHE_SUPPORT is not set
+ # LDSO_PRELOAD_FILE_SUPPORT is not set
+ LDSO_RUNPATH=y
+ # DL_FINI_CRT_COMPAT is not set
UCLIBC_CTOR_DTOR=y
! # HAS_NO_THREADS is not set
UCLIBC_HAS_THREADS=y
# PTHREADS_DEBUG_SUPPORT is not set
UCLIBC_HAS_LFS=y
+ # UCLIBC_STATIC_LDCONFIG is not set
# MALLOC is not set
! # MALLOC_SIMPLE is not set
! MALLOC_STANDARD=y
! # MALLOC_GLIBC_COMPAT is not set
# UCLIBC_DYNAMIC_ATEXIT is not set
HAS_SHADOW=y
# UNIX98PTY_ONLY is not set
# ASSUME_DEVPTS is not set
UCLIBC_HAS_TM_EXTENSIONS=y
+ UCLIBC_HAS_TZ_CACHING=y
+ UCLIBC_HAS_TZ_FILE=y
+ UCLIBC_HAS_TZ_FILE_READ_MANY=y
+ UCLIBC_TZ_FILE_PATH="/etc/TZ"
#
***************
*** 62,81 ****
# String and Stdio Support
#
# UCLIBC_HAS_WCHAR is not set
# USE_OLD_VFPRINTF is not set
#
# Library Installation Options
#
! SHARED_LIB_LOADER_PATH="/lib"
! DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
! SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)"
! DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
#
! # uClibc hacking options
#
# DODEBUG is not set
# DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set
# SUPPORT_LD_DEBUG_EARLY is not set
--- 102,172 ----
# String and Stdio Support
#
+ UCLIBC_HAS_STRING_GENERIC_OPT=y
+ UCLIBC_HAS_STRING_ARCH_OPT=y
+ UCLIBC_HAS_CTYPE_TABLES=y
+ UCLIBC_HAS_CTYPE_SIGNED=y
+ UCLIBC_HAS_CTYPE_UNSAFE=y
+ # UCLIBC_HAS_CTYPE_CHECKED is not set
+ # UCLIBC_HAS_CTYPE_ENFORCED is not set
# UCLIBC_HAS_WCHAR is not set
+ # UCLIBC_HAS_LOCALE is not set
+ # UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
+ # UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
# USE_OLD_VFPRINTF is not set
+ UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+ # UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+ # UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+ # UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+ # UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+ # UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+ # UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+ UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+ # UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+ UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+ # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+ # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+ # UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+ UCLIBC_HAS_STDIO_GETC_MACRO=y
+ UCLIBC_HAS_STDIO_PUTC_MACRO=y
+ UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+ # UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+ # UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
+ # UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
+ # UCLIBC_HAS_PRINTF_M_SPEC is not set
+ UCLIBC_HAS_ERRNO_MESSAGES=y
+ # UCLIBC_HAS_SYS_ERRLIST is not set
+ UCLIBC_HAS_SIGNUM_MESSAGES=y
+ # UCLIBC_HAS_SYS_SIGLIST is not set
+ UCLIBC_HAS_GNU_GETOPT=y
+
+ #
+ # Big and Tall
+ #
+ UCLIBC_HAS_REGEX=y
+ # UCLIBC_HAS_WORDEXP is not set
+ # UCLIBC_HAS_FTW is not set
+ UCLIBC_HAS_GLOB=y
#
# Library Installation Options
#
! SHARED_LIB_LOADER_PREFIX="/lib"
! RUNTIME_PREFIX="/"
! DEVEL_PREFIX="/usr/"
#
! # uClibc security related options
! #
! # UCLIBC_SECURITY is not set
!
! #
! # uClibc development/debugging options
#
+ CROSS_COMPILER_PREFIX=""
# DODEBUG is not set
+ # DODEBUG_PT is not set
# DOASSERTS is not set
# SUPPORT_LD_DEBUG is not set
# SUPPORT_LD_DEBUG_EARLY is not set
+ WARNINGS="-Wall"
+ # UCLIBC_MJN3_ONLY is not set
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/buildenv/buildtool.cfg,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** buildtool.cfg 15 Mar 2005 21:40:26 -0000 1.14
--- buildtool.cfg 18 Jun 2006 20:59:10 -0000 1.15
***************
*** 37,41 ****
# binutils
! <File binutils-2.14.tar.bz2>
Server = ftp.gnu.org
Directory = binutils
--- 37,41 ----
# binutils
! <File binutils-2.16.1.tar.bz2>
Server = ftp.gnu.org
Directory = binutils
***************
*** 56,62 ****
# uclibc
! <File uClibc-0.9.20.tar.gz>
Server = kernel.org
! Directory = old-releases
Envname = UC_TARFILE
</File>
--- 56,62 ----
# uclibc
! <File uClibc-0.9.28.tar.gz>
Server = kernel.org
! # Directory = old-releases
Envname = UC_TARFILE
</File>
***************
*** 67,86 ****
Envname = UC_CONFIG
</File>
- <File uClibc_fopencookie.diff.gz>
- Server = cvs-sourceforge
- Directory = buildenv/patches
- Revision = HEAD
- Envname = UC_PATCH1
- </File>
- <File uClibc-sigwait.patch.gz>
- Server = cvs-sourceforge
- Directory = buildenv/patches
- Revision = HEAD
- Envname = UC_PATCH2
- </File>
<File uClibc-path.patch.gz>
Server = cvs-sourceforge
Directory = buildenv/patches
Revision = HEAD
! Envname = UC_PATCH3
</File>
--- 67,74 ----
Envname = UC_CONFIG
</File>
<File uClibc-path.patch.gz>
Server = cvs-sourceforge
Directory = buildenv/patches
Revision = HEAD
! Envname = UC_PATCH1
</File>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/buildenv/buildtool.mk,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** buildtool.mk 24 Oct 2005 23:44:52 -0000 1.23
--- buildtool.mk 18 Jun 2006 20:59:10 -0000 1.24
***************
*** 1,3 ****
- ## Makefile for to build a gcc/uClibc toolchain
# $Id$
# changed for working with uclibc-bering buildtool by Arne Bernin <[EMAIL
PROTECTED]>
--- 1,2 ----
***************
*** 29,43 ****
#
#############################################################
- #Directory in which to build the toolchain
- ##TOOL_BUILD_DIR=$(BASE_DIR)/toolchain_build
TARGET_LANGUAGES:=c,c++
# C compiler for the build system
! # HOSTCC:=gcc
# If you want multilib enabled, enable this...
MULTILIB:=--enable-multilib
###########################################################
--- 28,43 ----
#
#############################################################
TARGET_LANGUAGES:=c,c++
# C compiler for the build system
! #HOSTCC:=gcc
# If you want multilib enabled, enable this...
MULTILIB:=--enable-multilib
+ GCC_VERSION:=3.3.3
+ UCLIBC_VERSION:=0.9.28
+ BINUTILS_VERSION:=2.16.1
###########################################################
***************
*** 52,56 ****
TARGET_PATH=$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
! TARGET_CROSS=$(STAGING_DIR)/bin/$(ARCH)-uclibc-
TARGET_CC=$(TARGET_CROSS)gcc
--- 52,56 ----
TARGET_PATH=$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
! TARGET_CROSS=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-
TARGET_CC=$(TARGET_CROSS)gcc
***************
*** 67,78 ****
#BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
BINUTILS_SOURCE:=$(BINUTILS_TARFILE)
! BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14
! #
! # Perhaps you would perfer to use the older 2.12.1 version?
! #BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
! #BINUTILS_SOURCE:=binutils-2.12.1.tar.bz2
! #BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.12.1
! UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-0.9.20
UCLIBC_SOURCE:=$(UC_TARFILE)
#UCLIBC_SITE:=http://www.uclibc.org/downloads
--- 67,73 ----
#BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
BINUTILS_SOURCE:=$(BINUTILS_TARFILE)
! BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)
! UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VERSION)
UCLIBC_SOURCE:=$(UC_TARFILE)
#UCLIBC_SITE:=http://www.uclibc.org/downloads
***************
*** 80,84 ****
#GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/
GCC_SOURCE:=$(GCCTAR)
! GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-3.3.3
--- 75,79 ----
#GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/
GCC_SOURCE:=$(GCCTAR)
! GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)
***************
*** 95,103 ****
mkdir -p $(STAGING_DIR)/lib/gcc-lib
mkdir -p $(STAGING_DIR)/usr/lib
! mkdir -p $(STAGING_DIR)/usr/bin;
mkdir -p $(STAGING_DIR)/$(GNU_TARGET_NAME)/
(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../lib)
(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include)
! (cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include sys-include)
(cd $(STAGING_DIR)/usr/lib; ln -fs ../../lib/gcc-lib)
touch $(STAGING_DIR)/.setup
--- 90,99 ----
mkdir -p $(STAGING_DIR)/lib/gcc-lib
mkdir -p $(STAGING_DIR)/usr/lib
! mkdir -p $(STAGING_DIR)/usr/bin
! mkdir -p $(STAGING_DIR)/usr/include
mkdir -p $(STAGING_DIR)/$(GNU_TARGET_NAME)/
(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../lib)
(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include)
! # (cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include sys-include)
(cd $(STAGING_DIR)/usr/lib; ln -fs ../../lib/gcc-lib)
touch $(STAGING_DIR)/.setup
***************
*** 124,128 ****
#
#############################################################
! BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-build
$(BINUTILS_DIR)/.unpacked:
--- 120,124 ----
#
#############################################################
! BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-build
$(BINUTILS_DIR)/.unpacked:
***************
*** 173,177 ****
--enable-targets=$(GNU_TARGET_NAME) \
$(MULTILIB) \
! --program-prefix=$(ARCH)-uclibc-);
touch $(BINUTILS_DIR1)/.configured
--- 169,173 ----
--enable-targets=$(GNU_TARGET_NAME) \
$(MULTILIB) \
! --program-prefix=$(GNU_TARGET_NAME)-);
touch $(BINUTILS_DIR1)/.configured
***************
*** 188,197 ****
objdump ranlib readelf size strings strip ; \
do \
! if [ -x $(STAGING_DIR)/bin/$(ARCH)-uclibc-$${app} ] ; then \
(cd $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin; \
! ln -fs ../../bin/$(ARCH)-uclibc-$${app} $${app}; \
); \
(cd $(STAGING_DIR)/usr/bin; \
! ln -fs ../../bin/$(ARCH)-uclibc-$${app} $${app}; \
); \
fi; \
--- 184,193 ----
objdump ranlib readelf size strings strip ; \
do \
! if [ -x $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-$${app} ] ; then \
(cd $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin; \
! ln -fs ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
); \
(cd $(STAGING_DIR)/usr/bin; \
! ln -fs ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
); \
fi; \
***************
*** 218,222 ****
#
#############################################################
! GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-initial
$(GCC_DIR)/.unpacked:
--- 214,218 ----
#
#############################################################
! GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial
$(GCC_DIR)/.unpacked:
***************
*** 256,259 ****
--- 252,256 ----
perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define
STANDARD_INCLUDE_DIR \
\"$(STAGING_DIR)/include\",;" $(GCC_DIR)/gcc/cppdefault.h;
+ #
# Prevent system glibc libraries from being found by collect2
# when it calls locatelib() and rummages about the system looking
***************
*** 262,266 ****
perl -i -p -e "s,\"/lib,\"$(STAGING_DIR)/lib,g;"
$(GCC_DIR)/gcc/collect2.c
perl -i -p -e "s,\"/usr/,\"$(STAGING_DIR)/usr/,g;"
$(GCC_DIR)/gcc/collect2.c
-
#
# Prevent gcc from using the unwind-dw2-fde-glibc code
--- 259,262 ----
***************
*** 269,285 ****
#ifndef inhibit_libc,g;" $(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
touch $(GCC_DIR)/.gcc_build_hacks
!
# The --without-headers option stopped working with gcc 3.0 and has never been
! # # fixed, so we need to actually have working C library header files prior to
! # # the step or libgcc will not build...
$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.gcc_build_hacks
mkdir -p $(GCC_BUILD_DIR1)
! (cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH):/bin AR=$(TARGET_CROSS)ar \
! RANLIB=$(TARGET_CROSS)ranlib CC=$(HOSTCC) \
$(GCC_DIR)/configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_HOST_NAME) \
- --build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR) \
--exec-prefix=$(STAGING_DIR) \
--bindir=$(STAGING_DIR)/bin \
--- 265,283 ----
#ifndef inhibit_libc,g;" $(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
touch $(GCC_DIR)/.gcc_build_hacks
!
# The --without-headers option stopped working with gcc 3.0 and has never been
! # fixed, so we need to actually have working C library header files prior to
! # the step or libgcc will not build...
$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.gcc_build_hacks
mkdir -p $(GCC_BUILD_DIR1)
! (cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH) \
! AR=$(TARGET_CROSS)ar \
! RANLIB=$(TARGET_CROSS)ranlib \
! CC="$(HOSTCC)" \
$(GCC_DIR)/configure \
--prefix=$(STAGING_DIR) \
+ --build=$(GNU_HOST_NAME) \
+ --host=$(GNU_HOST_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--exec-prefix=$(STAGING_DIR) \
--bindir=$(STAGING_DIR)/bin \
***************
*** 293,325 ****
--infodir=$(STAGING_DIR)/info \
--with-local-prefix=$(STAGING_DIR)/usr/local \
! --oldincludedir=$(STAGING_DIR)/include $(MULTILIB) \
! --enable-target-optspace --disable-nls --with-gnu-ld \
! --disable-shared --enable-languages=c --disable-__cxa_atexit \
! $(EXTRA_GCC_CONFIG_OPTIONS) --program-prefix=$(ARCH)-uclibc-);
touch $(GCC_BUILD_DIR1)/.configured
$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) \
! AR_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-uclibc-ar \
! RANLIB_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-uclibc-ranlib
touch $(GCC_BUILD_DIR1)/.compiled
! $(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc: $(GCC_BUILD_DIR1)/.compiled
! PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install;
! #Cleanup then mess when --program-prefix mysteriously fails
! -mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp
$(STAGING_DIR)/bin/$(ARCH)-uclibc-cpp
! -mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
$(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc
! rm -f $(STAGING_DIR)/bin/gccbug $(STAGING_DIR)/bin/gcov
! rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
! $(STAGING_DIR)/share/locale
! gcc_initial: binutils $(UCLIBC_DIR)/.configured
$(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc
gcc_initial-clean:
rm -rf $(GCC_BUILD_DIR1)
- rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)*
gcc_initial-dirclean:
! rm -rf $(GCC_BUILD_DIR1)
--- 291,323 ----
--infodir=$(STAGING_DIR)/info \
--with-local-prefix=$(STAGING_DIR)/usr/local \
! --oldincludedir=$(STAGING_DIR)/include \
! --enable-languages=c \
! --disable-shared \
! --disable-__cxa_atexit \
! --enable-target-optspace \
! --with-gnu-ld \
! --disable-nls \
! $(MULTILIB) \
! $(EXTRA_GCC_CONFIG_OPTIONS));
touch $(GCC_BUILD_DIR1)/.configured
$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) \
! AR_FOR_TARGET=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-ar \
! RANLIB_FOR_TARGET=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-ranlib all-gcc
touch $(GCC_BUILD_DIR1)/.compiled
! $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
! PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
! #rm -f $(STAGING_DIR)/bin/gccbug $(STAGING_DIR)/bin/gcov
! #rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc
$(STAGING_DIR)/share/locale
! gcc_initial: uclibc-configured binutils
$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
gcc_initial-clean:
rm -rf $(GCC_BUILD_DIR1)
gcc_initial-dirclean:
! rm -rf $(GCC_BUILD_DIR1) $(GCC_DIR)
***************
*** 336,392 ****
zcat $(UCLIBC_SOURCE) | tar -xvf -
zcat $(UC_PATCH1) | patch -d $(UCLIBC_DIR) -p1
- zcat $(UC_PATCH2) | patch -d $(UCLIBC_DIR) -p1
- zcat $(UC_PATCH3) | patch -d $(UCLIBC_DIR) -p1
touch $(UCLIBC_DIR)/.unpacked
$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(BT_LINUX_DIR)/.configured
! perl -i -p -e
's,^CROSS=.*,TARGET_ARCH=$(ARCH)\nCROSS=$(TARGET_CROSS),g' \
! $(UCLIBC_DIR)/Rules.mak
cp $(TOOL_BUILD_DIR)/$(UC_CONFIG) $(UCLIBC_DIR)/.config
! perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e
's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e
's,^DEVEL_TOOL_PREFIX=.*,DEVEL_TOOL_PREFIX=\"$(STAGING_DIR)/usr\",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e
's,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH=\"/lib\",g' \
$(UCLIBC_DIR)/.config
! # perl -i -p -e
's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' \
! # $(UCLIBC_DIR)/.config
! perl -i -p -e
's,^GCC_BIN.*,GCC_BIN=$(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc,g' \
! $(UCLIBC_DIR)/extra/gcc-uClibc/Makefile
! perl -i -p -e
's,^LD_BIN.*,LD_BIN=$(STAGING_DIR)/bin/$(ARCH)-uclibc-ld,g' \
! $(UCLIBC_DIR)/extra/gcc-uClibc/Makefile
! $(MAKE) -C $(UCLIBC_DIR) oldconfig
! $(MAKE) -C $(UCLIBC_DIR) headers install_dev;
touch $(UCLIBC_DIR)/.configured
$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured
! $(MAKE) -C $(UCLIBC_DIR) TARGET_PREFIX=$(STAGING_DIR)/
$(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
! $(MAKE) -C $(UCLIBC_DIR) install_dev install_runtime install_utils
! # Install uClibc loader for host system, recheck when updating uClibc
version
$(MAKE) -C $(UCLIBC_DIR) clean
! $(MAKE) -C $(UCLIBC_DIR) TARGET_PREFIX=/
cp $(UCLIBC_DIR)/ldso/ldso/ld-uClibc-*
$(STAGING_DIR)/lib/ld-uClibc-target.so
! ifneq ($(TARGET_DIR),)
! $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
! $(MAKE) -C $(UCLIBC_DIR) DEVEL_PREFIX=$(TARGET_DIR) \
! SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \
! DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_runtime
!
! $(TARGET_DIR)/usr/bin/ldd: $(TARGET_DIR)/lib/libc.so.0
! $(MAKE) -C $(UCLIBC_DIR) PREFIX=$(TARGET_DIR) install_target_utils
! (cd $(TARGET_DIR)/sbin; ln -sf /bin/true ldconfig)
! UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0 $(TARGET_DIR)/usr/bin/ldd
! endif
! uclibc: $(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc $(STAGING_DIR)/lib/libc.a \
$(UCLIBC_TARGETS)
--- 334,406 ----
zcat $(UCLIBC_SOURCE) | tar -xvf -
zcat $(UC_PATCH1) | patch -d $(UCLIBC_DIR) -p1
touch $(UCLIBC_DIR)/.unpacked
$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(BT_LINUX_DIR)/.configured
! # perl -i -p -e
's,^CROSS=.*,TARGET_ARCH=$(ARCH)\nCROSS=$(TARGET_CROSS),g' \
! # $(UCLIBC_DIR)/Rules.mak
cp $(TOOL_BUILD_DIR)/$(UC_CONFIG) $(UCLIBC_DIR)/.config
! perl -i -p -e
's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e 's,^.*TARGET_$(ARCH).*,TARGET_$(ARCH)=y,g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e 's,^TARGET_ARCH.*,TARGET_ARCH=\"$(ARCH)\",g'
$(UCLIBC_DIR)/.config
! perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/\",g' \
$(UCLIBC_DIR)/.config
! perl -i -p -e
's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
! $(UCLIBC_DIR)/.config
! # $(MAKE) -C $(UCLIBC_DIR) oldconfig
! $(MAKE) -C $(UCLIBC_DIR) \
! PREFIX=$(STAGING_DIR)/ \
! DEVEL_PREFIX=/ \
! RUNTIME_PREFIX=$(STAGING_DIR)/ \
! pregen install_dev;
touch $(UCLIBC_DIR)/.configured
+ # Set runtime prefix to STAGING_DIR for the host uClibc loader (see hack
below)
$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured
! $(MAKE) -C $(UCLIBC_DIR) \
! PREFIX= \
! DEVEL_PREFIX=/ \
! RUNTIME_PREFIX=$(STAGING_DIR)/ \
! all
$(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
! $(MAKE) -C $(UCLIBC_DIR) \
! PREFIX= \
! DEVEL_PREFIX=$(STAGING_DIR)/ \
! RUNTIME_PREFIX=$(STAGING_DIR)/ \
! install_runtime install_dev
! $(MAKE) -C $(UCLIBC_DIR) \
! PREFIX=$(STAGING_DIR) \
! install_utils
!
! # Install uClibc loader for target system
$(MAKE) -C $(UCLIBC_DIR) clean
! $(MAKE) -C $(UCLIBC_DIR) RUNTIME_PREFIX=/
cp $(UCLIBC_DIR)/ldso/ldso/ld-uClibc-*
$(STAGING_DIR)/lib/ld-uClibc-target.so
! #ifneq ($(TARGET_DIR),)
! #$(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
! # $(MAKE) -C $(UCLIBC_DIR) \
! # PREFIX=$(TARGET_DIR) \
! # RUNTIME_PREFIX=/ \
! # DEVEL_PREFIX=/usr/ \
! # install_runtime
! #
! #$(TARGET_DIR)/usr/bin/ldd: $(TARGET_DIR)/lib/libc.so.0
! # $(MAKE) -C $(UCLIBC_DIR) PREFIX=$(TARGET_DIR) utils install_utils
! # (cd $(TARGET_DIR)/sbin; ln -sf /bin/true ldconfig)
! #
! #UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0 $(TARGET_DIR)/usr/bin/ldd
! #endif
! uclibc-configured: $(UCLIBC_DIR)/.configured
! uclibc: $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc $(STAGING_DIR)/lib/libc.a \
$(UCLIBC_TARGETS)
***************
*** 401,405 ****
-
#############################################################
#
--- 415,418 ----
***************
*** 408,412 ****
#
#############################################################
! GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-final
$(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched
#
--- 421,426 ----
#
#############################################################
! GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
!
$(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched
#
***************
*** 432,445 ****
touch $(GCC_DIR)/.g++_build_hacks
$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.g++_build_hacks
mkdir -p $(GCC_BUILD_DIR2)
! (cd $(GCC_BUILD_DIR2); PATH=$(TARGET_PATH) AR=$(TARGET_CROSS)ar \
! RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld \
! NM=$(TARGET_CROSS)nm CC=$(HOSTCC) \
$(GCC_DIR)/configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_HOST_NAME) \
- --build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR) \
--exec-prefix=$(STAGING_DIR) \
--bindir=$(STAGING_DIR)/bin \
--- 446,465 ----
touch $(GCC_DIR)/.g++_build_hacks
+
$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.g++_build_hacks
mkdir -p $(GCC_BUILD_DIR2)
! # Importants! Requierd for limits.h to be fixed.
! ln -snf ../include $(STAGING_DIR)/$(GNU_TARGET_NAME)/sys-include
! (cd $(GCC_BUILD_DIR2); PATH=$(TARGET_PATH) \
! AR=$(TARGET_CROSS)ar \
! RANLIB=$(TARGET_CROSS)ranlib \
! LD=$(TARGET_CROSS)ld \
! NM=$(TARGET_CROSS)nm \
! CC="$(HOSTCC)" \
$(GCC_DIR)/configure \
--prefix=$(STAGING_DIR) \
+ --build=$(GNU_HOST_NAME) \
+ --host=$(GNU_HOST_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--exec-prefix=$(STAGING_DIR) \
--bindir=$(STAGING_DIR)/bin \
***************
*** 455,465 ****
--with-gxx-include-dir=$(STAGING_DIR)/include/c++ \
--oldincludedir=$(STAGING_DIR)/include \
- --enable-shared $(MULTILIB) \
- --enable-target-optspace --disable-nls \
- --with-gnu-ld --disable-__cxa_atexit \
--enable-languages=$(TARGET_LANGUAGES) \
! $(EXTRA_GCC_CONFIG_OPTIONS) \
! --program-prefix=$(ARCH)-uclibc- \
! );
touch $(GCC_BUILD_DIR2)/.configured
--- 475,486 ----
--with-gxx-include-dir=$(STAGING_DIR)/include/c++ \
--oldincludedir=$(STAGING_DIR)/include \
--enable-languages=$(TARGET_LANGUAGES) \
! --enable-shared \
! --disable-__cxa_atexit \
! --enable-target-optspace \
! --disable-nls \
! --with-gnu-ld \
! $(MULTILIB) \
! $(EXTRA_GCC_CONFIG_OPTIONS));
touch $(GCC_BUILD_DIR2)/.configured
***************
*** 468,472 ****
AR_FOR_TARGET=$(TARGET_CROSS)ar
RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
! CC_FOR_TARGET=$(TARGET_CROSS)gcc $(MAKE) -C $(GCC_BUILD_DIR2)
touch $(GCC_BUILD_DIR2)/.compiled
--- 489,493 ----
AR_FOR_TARGET=$(TARGET_CROSS)ar
RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
! CC_FOR_TARGET=$(TARGET_CROSS)gcc $(MAKE) -C $(GCC_BUILD_DIR2) all
touch $(GCC_BUILD_DIR2)/.compiled
***************
*** 474,505 ****
touch $(GCC_BUILD_DIR2)/.installed
! $(STAGING_DIR)/bin/$(ARCH)-uclibc-g++: $(GCC_BUILD_DIR2)/.compiled
! PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install;
-mv $(STAGING_DIR)/bin/gcc $(STAGING_DIR)/usr/bin;
-mv $(STAGING_DIR)/bin/protoize $(STAGING_DIR)/usr/bin;
-mv $(STAGING_DIR)/bin/unprotoize $(STAGING_DIR)/usr/bin;
- -mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp
$(STAGING_DIR)/bin/$(ARCH)-uclibc-cpp
- -mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
$(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc
- -mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++
$(STAGING_DIR)/bin/$(ARCH)-uclibc-c++
- -mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-g++
$(STAGING_DIR)/bin/$(ARCH)-uclibc-g++
- -mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++filt
$(STAGING_DIR)/bin/$(ARCH)-uclibc-c++filt
rm -f $(STAGING_DIR)/bin/cpp $(STAGING_DIR)/bin/gcov
$(STAGING_DIR)/bin/*gccbug
- rm -f $(STAGING_DIR)/bin/$(GNUT_TARGET_NAME)-$(ARCH)-uclibc-*
rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
$(STAGING_DIR)/share/locale
- # Strip the host binaries
- -strip --strip-all -R .note -R .comment $(STAGING_DIR)/bin/$(ARCH)-*
- -strip --strip-unneeded $(STAGING_DIR)/lib/libstdc++.so*
- -strip --strip-unneeded $(STAGING_DIR)/lib/libgcc_s.so*
set -e; \
for app in cc gcc c89 cpp c++ g++ ; do \
! if [ -x $(STAGING_DIR)/bin/$(ARCH)-uclibc-$${app} ] ; then \
(cd $(STAGING_DIR)/usr/bin; \
! ln -fs ../../bin/$(ARCH)-uclibc-$${app} $${app}; \
); \
fi; \
done;
! gcc_final: $(STAGING_DIR)/.setup binutils gcc_initial uclibc
$(STAGING_DIR)/bin/$(ARCH)-uclibc-g++
gcc_final-clean:
--- 495,538 ----
touch $(GCC_BUILD_DIR2)/.installed
!
! $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-g++: $(GCC_BUILD_DIR2)/.compiled
! PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install
! # if [ -d "$(STAGING_DIR)/lib64" ] ; then \
! # if [ ! -e "$(STAGING_DIR)/lib" ] ; then \
! # mkdir "$(STAGING_DIR)/lib" ; \
! # fi ; \
! # mv "$(STAGING_DIR)/lib/"* "$(STAGING_DIR)/lib/" ; \
! # rmdir "$(STAGING_DIR)/lib64" ; \
! # fi
! # Strip the host binaries
! -strip --strip-all -R .note -R .comment $(STAGING_DIR)/bin/*
! -strip --strip-unneeded $(STAGING_DIR)/lib/libstdc++.so*
! -strip --strip-unneeded $(STAGING_DIR)/lib/libgcc_s.so*
!
! # Make sure we have 'cc'.
! if [ ! -e $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cc ] ; then \
! ln -snf $(GNU_TARGET_NAME)-gcc \
! $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cc ; \
! fi;
! if [ ! -e $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/cc ] ; then \
! ln -snf gcc $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/cc ; \
! fi
!
-mv $(STAGING_DIR)/bin/gcc $(STAGING_DIR)/usr/bin;
-mv $(STAGING_DIR)/bin/protoize $(STAGING_DIR)/usr/bin;
-mv $(STAGING_DIR)/bin/unprotoize $(STAGING_DIR)/usr/bin;
rm -f $(STAGING_DIR)/bin/cpp $(STAGING_DIR)/bin/gcov
$(STAGING_DIR)/bin/*gccbug
rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
$(STAGING_DIR)/share/locale
set -e; \
for app in cc gcc c89 cpp c++ g++ ; do \
! if [ -x $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-$${app} ] ; then \
(cd $(STAGING_DIR)/usr/bin; \
! ln -fs ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
); \
fi; \
done;
! gcc_final: uclibc-configured $(STAGING_DIR)/.setup binutils gcc_initial
uclibc $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-g++
gcc_final-clean:
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
