[leaf-commits] src/bering-uclibc4/source/buildenv buildtool.mk, 1.12, 1.13

Andrew <[email protected]> Sun, 12 Dec 2010 13:52:14 +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-serv32230

Modified Files:
	buildtool.mk 
Log Message:
Added shared library generating for binutils


Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/buildenv/buildtool.mk,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** buildtool.mk	12 Dec 2010 13:07:47 -0000	1.12
--- buildtool.mk	12 Dec 2010 13:52:04 -0000	1.13
***************
*** 68,71 ****
--- 68,72 ----
  BINUTILS_SOURCE:=$(BINUTILS_TARFILE)
  BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)
+ BINUTILS_BUILD_DIR=$(BT_BUILD_DIR)/binutils
  
  UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VERSION)
***************
*** 165,206 ****
  		--target=$(GNU_TARGET_NAME) \
  		--host=$(GNU_TARGET_NAME) \
! 		--prefix=$(STAGING_DIR) \
! 		--exec-prefix=$(STAGING_DIR) \
! 		--bindir=$(STAGING_DIR)/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 \
  		--enable-targets=$(GNU_TARGET_NAME) \
  		$(MULTILIB) \
  		--program-prefix=$(GNU_TARGET_NAME)-);
  #		--build=$(GNU_HOST_NAME) \
  	touch $(BINUTILS_DIR1)/.configured
  
  $(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
! 	$(MAKE) -C $(BINUTILS_DIR1);
  
  $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump 
! 	$(MAKE) -C $(BINUTILS_DIR1) install
! 	rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
! 		$(STAGING_DIR)/share/locale
! 	mkdir -p $(STAGING_DIR)/usr/bin;
  	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;
  
  $(STAGING_DIR)/lib/libg.a:
--- 166,213 ----
  		--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 \
+ #		--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_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; \
  	for app in addr2line ar as c++filt gprof ld nm objcopy \
  		    objdump ranlib readelf size strings strip ; \
  	do \
! 		if [ -x $(BINUTILS_BUILD_DIR)/bin/$(GNU_TARGET_NAME)-$${app} ] ; then \
! 		    (cd $(BINUTILS_BUILD_DIR)/$(GNU_TARGET_NAME)/bin; \
  			ln -fs ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
  		    ); \
! 		    (cd $(BINUTILS_BUILD_DIR)/usr/bin; \
  			ln -fs ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
  		    ); \
  		fi; \
  	done;
+ 	cp -a $(BINUTILS_BUILD_DIR)/* $(STAGING_DIR)
  
  $(STAGING_DIR)/lib/libg.a:
***************
*** 335,339 ****
  	cp uname $(STAGING_DIR)/bin && chmod +x $(STAGING_DIR)/bin/uname
  	cp gcc-m32 $(STAGING_DIR)/bin && chmod +x $(STAGING_DIR)/bin/gcc-m32
! 	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 all-stage1-target-libgcc
--- 342,346 ----
  	cp uname $(STAGING_DIR)/bin && chmod +x $(STAGING_DIR)/bin/uname
  	cp gcc-m32 $(STAGING_DIR)/bin && chmod +x $(STAGING_DIR)/bin/gcc-m32
! 	PATH=$(TARGET_PATH) $(MAKE) $(MAKEOPTS) -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 all-stage1-target-libgcc
***************
*** 341,345 ****
  
  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
! 	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc install-target-libgcc
  	#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
--- 348,352 ----
  
  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
! 	PATH=$(TARGET_PATH) $(MAKE) $(MAKEOPTS) -C $(GCC_BUILD_DIR1) install-gcc install-target-libgcc
  	#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
***************
*** 388,392 ****
  	perl -i -p -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
  		$(UCLIBC_DIR)/.config
! 	$(MAKE) -C $(UCLIBC_DIR) oldconfig
  	$(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) \
  	PREFIX=$(STAGING_DIR)/ \
--- 395,399 ----
  	perl -i -p -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
  		$(UCLIBC_DIR)/.config
! 	$(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) oldconfig
  	$(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) \
  	PREFIX=$(STAGING_DIR)/ \
***************
*** 637,641 ****
  
  $(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 \
--- 644,648 ----
  
  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-g++: $(GCC_BUILD_DIR2)/.compiled
! 	PATH=$(TARGET_PATH) $(MAKE) $(MAKEOPTS) -C $(GCC_BUILD_DIR2) install
  #	if [ -d "$(STAGING_DIR)/lib64" ] ; then \
  #	    if [ ! -e "$(STAGING_DIR)/lib" ] ; then \


------------------------------------------------------------------------------
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