[leaf-commits] src/bering-uclibc4/source/buildenv buildtool.mk, 1.13, 1.14
Andrew <[email protected]> Sun, 12 Dec 2010 15:28:46 +0000
| Newsgroups | gmane.linux.leaf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/leaf/src/bering-uclibc4/source/buildenv
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20159
Modified Files:
buildtool.mk
Log Message:
binutils now are built as static by host compiler, and it's dynamic libraries - by target compiler
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/buildenv/buildtool.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** buildtool.mk 12 Dec 2010 13:52:04 -0000 1.13
--- buildtool.mk 12 Dec 2010 15:28:35 -0000 1.14
***************
*** 69,72 ****
--- 69,73 ----
BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)
BINUTILS_BUILD_DIR=$(BT_BUILD_DIR)/binutils
+ BINUTILS_BUILD_LIB_DIR=$(BT_BUILD_DIR)/binutils-lib
UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VERSION)
***************
*** 129,132 ****
--- 130,134 ----
#############################################################
BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-build
+ BINUTILS_DIR2:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-libs
$(BINUTILS_DIR)/.unpacked:
***************
*** 162,177 ****
$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
mkdir -p $(BINUTILS_DIR1)
! (cd $(BINUTILS_DIR1); CC=$(HOSTCC) AR=ar CFLAGS="$(BT_COPT_FLAGS) -m32" \
$(BINUTILS_DIR)/configure \
--target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
--prefix=/ \
--enable-targets=$(GNU_TARGET_NAME) \
! --enable-shared \
$(MULTILIB) \
--program-prefix=$(GNU_TARGET_NAME)-);
! # --build=$(GNU_HOST_NAME) \
! # --exec-prefix=/ \
! # --bindir=/bin \
# --sbindir=$(STAGING_DIR)/sbin \
# --sysconfdir=$(STAGING_DIR)/etc \
--- 164,179 ----
$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
mkdir -p $(BINUTILS_DIR1)
! (cd $(BINUTILS_DIR1); CC=$(HOSTCC) \
$(BINUTILS_DIR)/configure \
--target=$(GNU_TARGET_NAME) \
--prefix=/ \
--enable-targets=$(GNU_TARGET_NAME) \
! --host=$(GNU_TARGET_NAME) \
! --build=$(GNU_HOST_NAME) \
$(MULTILIB) \
--program-prefix=$(GNU_TARGET_NAME)-);
! # --prefix=$(STAGING_DIR) \
! # --exec-prefix=$(STAGING_DIR) \
! # --bindir=$(STAGING_DIR)/bin \
# --sbindir=$(STAGING_DIR)/sbin \
# --sysconfdir=$(STAGING_DIR)/etc \
***************
*** 184,198 ****
touch $(BINUTILS_DIR1)/.configured
$(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
! $(MAKE) $(MAKEOPTS) -C $(BINUTILS_DIR1);
$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump
mkdir -p $(BINUTILS_BUILD_DIR)/$(GNU_TARGET_NAME)
mkdir -p $(BINUTILS_BUILD_DIR)/lib
! (cd $(BINUTILS_BUILD_DIR)/$(GNU_TARGET_NAME); ln -s ../lib lib)
! $(MAKE) $(MAKEOPTS) DESTDIR=$(BINUTILS_BUILD_DIR) -C $(BINUTILS_DIR1) install
! -strip $(BT_STRIP_LIBOPTS) $(BINUTILS_BUILD_DIR)/lib/*
rm -rf $(BINUTILS_BUILD_DIR)/share/info $(BINUTILS_BUILD_DIR)/share/man \
! $(BINUTILS_BUILD_DIR)/share/doc $(BINUTILS_BUILD_DIR)/share/locale
mkdir -p $(BINUTILS_BUILD_DIR)/usr/bin;
set -e; \
--- 186,204 ----
touch $(BINUTILS_DIR1)/.configured
+
$(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
! $(MAKE) $(MAKEOPTS) -C $(BINUTILS_DIR1) \
! all-binutils all-gas all-gprof all-ld
$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump
mkdir -p $(BINUTILS_BUILD_DIR)/$(GNU_TARGET_NAME)
mkdir -p $(BINUTILS_BUILD_DIR)/lib
! (cd $(BINUTILS_BUILD_DIR)/$(GNU_TARGET_NAME); test -e lib || ln -s ../lib lib)
! $(MAKE) $(MAKEOPTS) DESTDIR=$(BINUTILS_BUILD_DIR) -C $(BINUTILS_DIR1) \
! install-binutils install-gas \
! install-gprof install-ld
rm -rf $(BINUTILS_BUILD_DIR)/share/info $(BINUTILS_BUILD_DIR)/share/man \
! $(BINUTILS_BUILD_DIR)/share/doc $(BINUTILS_BUILD_DIR)/share/locale \
! $(BINUTILS_BUILD_DIR)/lib/*.a $(BINUTILS_BUILD_DIR)/lib/*.la
mkdir -p $(BINUTILS_BUILD_DIR)/usr/bin;
set -e; \
***************
*** 211,218 ****
cp -a $(BINUTILS_BUILD_DIR)/* $(STAGING_DIR)
$(STAGING_DIR)/lib/libg.a:
$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ar rv $(STAGING_DIR)/lib/libg.a;
! binutils: $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld $(STAGING_DIR)/lib/libg.a
binutils-clean:
--- 217,281 ----
cp -a $(BINUTILS_BUILD_DIR)/* $(STAGING_DIR)
+ # rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man \
+ # $(STAGING_DIR)/share/doc $(STAGING_DIR)/share/locale
+ # set -e; \
+ # for app in addr2line ar as c++filt gprof ld nm objcopy \
+ # 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; \
+ # done;
+
+ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld \
+ $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc
+ mkdir -p $(BINUTILS_DIR2)
+ (cd $(BINUTILS_DIR2); CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS)" \
+ $(BINUTILS_DIR)/configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/ \
+ --includedir=/include \
+ --libdir=/lib \
+ --enable-targets=$(GNU_TARGET_NAME) \
+ --enable-shared \
+ $(MULTILIB) )
+ # --program-prefix=$(GNU_TARGET_NAME)-);
+ # --exec-prefix=/ \
+ # --bindir=/bin \
+ # --sbindir=$(STAGING_DIR)/sbin \
+ # --sysconfdir=$(STAGING_DIR)/etc \
+ # --datadir=$(STAGING_DIR)/share \
+ # --includedir=$(STAGING_DIR)/include \
+ # --libdir=$(STAGING_DIR)/lib \
+ # --localstatedir=$(STAGING_DIR)/var \
+ # --mandir=$(STAGING_DIR)/man \
+ # --infodir=$(STAGING_DIR)/info \
+ touch $(BINUTILS_DIR2)/.configured
+
+ $(BINUTILS_DIR2)/bfd/.libs/libbfd.a: $(BINUTILS_DIR2)/.configured
+ $(MAKE) $(MAKEOPTS) -C $(BINUTILS_DIR2) all-bfd all-opcodes
+
+ $(STAGING_DIR)/lib/libbfd.a: $(BINUTILS_DIR2)/bfd/.libs/libbfd.a
+ mkdir -p $(BINUTILS_BUILD_LIB_DIR)/lib
+ mkdir -p $(BINUTILS_BUILD_LIB_DIR)/include
+ $(MAKE) $(MAKEOPTS) DESTDIR=$(BINUTILS_BUILD_LIB_DIR) -C $(BINUTILS_DIR2) install-bfd install-opcodes
+ -strip $(BT_STRIP_LIBOPTS) $(BINUTILS_BUILD_LIB_DIR)/lib/*
+ rm -rf $(BINUTILS_BUILD_LIB_DIR)/share/info $(BINUTILS_BUILD_LIB_DIR)/share/man \
+ $(BINUTILS_BUILD_LIB_DIR)/share/doc $(BINUTILS_BUILD_LIB_DIR)/share/locale
+ cp -a $(BINUTILS_BUILD_LIB_DIR)/* $(STAGING_DIR)
+
+
+
$(STAGING_DIR)/lib/libg.a:
$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ar rv $(STAGING_DIR)/lib/libg.a;
! binutils: $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld $(STAGING_DIR)/lib/libg.a
binutils-clean:
***************
*** 697,701 ****
source: .source
! .build: uclibc_toolchain
touch .build
--- 760,766 ----
source: .source
! shared_libs: $(STAGING_DIR)/lib/libbfd.a
!
! .build: uclibc_toolchain shared_libs
touch .build
------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages,
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev