[leaf-commits] src/bering-uclibc4/source/buildenv buildtool.cfg, 1.4, 1.5 buildtool.mk, 1.4, 1.5

Andrew <[email protected]>
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-serv14589

Modified Files:
	buildtool.cfg buildtool.mk 
Log Message:
Try to fix gcc to build on system without GMP


Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/buildenv/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg	17 Sep 2010 18:08:38 -0000	1.4
--- buildtool.cfg	19 Sep 2010 13:05:59 -0000	1.5
***************
*** 30,33 ****
--- 30,38 ----
  	Serverpath = /
  </Server>
+ <Server multiprecision.org>
+ 	Type = http
+ 	Name = www.multiprecision.org
+ 	Serverpath = /mpc
+ </Server>
  
  ###############################
***************
*** 62,65 ****
--- 67,76 ----
  </File>
  
+ <File mpc-0.8.2.tar.gz>
+         Server = multiprecision.org
+ 	Directory = download
+ 	Envname = MPC_TARFILE
+ </File>
+ 
  # gcc
  <File gcc-4.4.4.tar.bz2>

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/buildenv/buildtool.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.mk	17 Sep 2010 18:08:38 -0000	1.4
--- buildtool.mk	19 Sep 2010 13:05:59 -0000	1.5
***************
*** 31,37 ****
  TARGET_LANGUAGES:=c,c++
  
- # C compiler for the build system
- #HOSTCC:=gcc
- 
  # If you want multilib enabled, enable this...
  MULTILIB:=--enable-multilib
--- 31,34 ----
***************
*** 40,43 ****
--- 37,41 ----
  GMP_VERSION:=4.3.2
  MPFR_VERSION:=2.3.2
+ MPC_VERSION:=0.8.2
  UCLIBC_VERSION:=0.9.30.3
  BINUTILS_VERSION:=2.20.1
***************
*** 80,89 ****
  
  GMP_SOURCE:=$(GMP_TARFILE)
! GMP_DIR:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION)
! GMP_TARGET_DIR:=$(BT_BUILD_DIR)/gmp
  
  MPFR_SOURCE:=$(MPFR_TARFILE)
! MPFR_DIR:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)
! MPFR_TARGET_DIR:=$(BT_BUILD_DIR)/mpfr
  
  #############################################################
--- 78,88 ----
  
  GMP_SOURCE:=$(GMP_TARFILE)
! GMP_DIR:=$(GCC_DIR)/gmp
  
  MPFR_SOURCE:=$(MPFR_TARFILE)
! MPFR_DIR:=$(GCC_DIR)/mpfr
! 
! MPC_SOURCE:=$(MPC_TARFILE)
! MPC_DIR:=$(GCC_DIR)/mpfr
  
  #############################################################
***************
*** 459,491 ****
  #############################################################
  $(GMP_DIR)/.unpacked: 
! 	bzcat $(GMP_SOURCE) | tar -xvf -
  	touch $(GMP_DIR)/.unpacked
  
  gmp-source: $(GMP_DIR)/.unpacked
  
! $(GMP_DIR)/.configured: $(GMP_DIR)/.unpacked 
! 	(cd $(GMP_DIR); CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
! 	./configure --build=i386-pc-linux-gnu --host=i386-pc-linux-gnu --prefix=/)
! 	touch $(GMP_DIR)/.configured
  
! $(GMP_DIR)/.build: $(GMP_DIR)/.configured
! 	$(MAKE) $(MAKEOPTS) CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" -C $(GMP_DIR)
! 	mkdir -p $(GMP_TARGET_DIR)
  #	$(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
! #	    DESTDIR=$(GMP_TARGET_DIR) -C $(GMP_DIR) check
! 	$(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
! 	    DESTDIR=$(GMP_TARGET_DIR) -C $(GMP_DIR) install
! 	-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(GMP_TARGET_DIR)/lib/*
! 	-rm -rf $(GMP_TARGET_DIR)/share
! 	cp -a $(GMP_TARGET_DIR)/* $(STAGING_DIR)
! 	touch $(GMP_DIR)/.build
  	
! gmp: $(GMP_DIR)/.build
  
! gmp-clean:
! 	-$(MAKE) -C $(GMP_DIR) clean
  
! gmp-dirclean:
! 	rm -rf $(GMP_DIR)
  
  #############################################################
--- 458,489 ----
  #############################################################
  $(GMP_DIR)/.unpacked: 
! 	(cd $(GCC_DIR); bzcat ../$(GMP_SOURCE) | tar -xvf -)
! 	mv $(GMP_DIR)-$(GMP_VERSION) $(GMP_DIR)
  	touch $(GMP_DIR)/.unpacked
  
  gmp-source: $(GMP_DIR)/.unpacked
  
! #$(GMP_DIR)/.configured: $(GMP_DIR)/.unpacked 
! #	(cd $(GMP_DIR); CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
! #	./configure --build=i386-pc-linux-gnu --host=i386-pc-linux-gnu --prefix=/)
! #	touch $(GMP_DIR)/.configured
  
! #$(GMP_DIR)/.build: $(GMP_DIR)/.configured
! #	$(MAKE) $(MAKEOPTS) CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" -C $(GMP_DIR)
! #	mkdir -p $(GMP_TARGET_DIR)
  #	$(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
! #	    DESTDIR=$(GMP_TARGET_DIR) -C $(GMP_DIR) install
! #	-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(GMP_TARGET_DIR)/lib/*
! #	-rm -rf $(GMP_TARGET_DIR)/share
! #	cp -a $(GMP_TARGET_DIR)/* $(STAGING_DIR)
! #	touch $(GMP_DIR)/.build
  	
! #gmp: $(GMP_DIR)/.build
  
! #gmp-clean:
! #	-$(MAKE) -C $(GMP_DIR) clean
  
! #gmp-dirclean:
! #	rm -rf $(GMP_DIR)
  
  #############################################################
***************
*** 495,499 ****
  #############################################################
  $(MPFR_DIR)/.unpacked: 
! 	bzcat $(MPFR_SOURCE) | tar -xvf -
  	perl -i -p -e "s,(['"'"=: ])/(usr/)?lib,\1$(STAGING_DIR)/\2lib,g' \
  		$(MPFR_DIR)/configure
--- 493,498 ----
  #############################################################
  $(MPFR_DIR)/.unpacked: 
! 	(cd $(GCC_DIR); bzcat ../$(MPFR_SOURCE) | tar -xvf - )
! 	mv $(MPFR_DIR)-$(MPFR_VERSION) $(MPFR_DIR)
  	perl -i -p -e "s,(['"'"=: ])/(usr/)?lib,\1$(STAGING_DIR)/\2lib,g' \
  		$(MPFR_DIR)/configure
***************
*** 502,534 ****
  mpfr-source: $(MPFR_DIR)/.unpacked
  
! $(MPFR_DIR)/.configured: $(MPFR_DIR)/.unpacked $(GMP_DIR)/.build
! 	(cd $(MPFR_DIR); CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
! 	LDFLAGS="-L$(STAGING_DIR)/lib" \
! 	./configure --build=i386-pc-linux-gnu --host=i386-pc-linux-gnu --prefix=/ \
! 		--with-gmp=$(STAGING_DIR))
! 	touch $(MPFR_DIR)/.configured
  
! $(MPFR_DIR)/.build: $(MPFR_DIR)/.configured
! 	$(MAKE) $(MAKEOPTS) CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
! 	LDFLAGS="-L$(STAGING_DIR)/lib" -C $(MPFR_DIR)
! 	mkdir -p $(MPFR_TARGET_DIR)
  #	$(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
! #	    DESTDIR=$(MPFR_TARGET_DIR) -C $(MPFR_DIR) check
! 	$(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
! 	    DESTDIR=$(MPFR_TARGET_DIR) -C $(MPFR_DIR) install
! 	-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(MPFR_TARGET_DIR)/lib/*
! 	-rm -rf $(MPFR_TARGET_DIR)/share
! 	cp -a $(MPFR_TARGET_DIR)/* $(STAGING_DIR)
! 	touch $(MPFR_DIR)/.build
  	
! mpfr: $(MPFR_DIR)/.build
  
! mpfr-clean:
! 	-$(MAKE) -C $(MPFR_DIR) clean
  
! mpfr-dirclean:
! 	rm -rf $(MPFR_DIR)
  
  
  
  #############################################################
--- 501,545 ----
  mpfr-source: $(MPFR_DIR)/.unpacked
  
! #$(MPFR_DIR)/.configured: $(MPFR_DIR)/.unpacked $(GMP_DIR)/.build
! #	(cd $(MPFR_DIR); CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
! #	LDFLAGS="-L$(STAGING_DIR)/lib" \
! #	./configure --build=i386-pc-linux-gnu --host=i386-pc-linux-gnu --prefix=/ \
! #		--with-gmp=$(STAGING_DIR))
! #	touch $(MPFR_DIR)/.configured
  
! #$(MPFR_DIR)/.build: $(MPFR_DIR)/.configured
! #	$(MAKE) $(MAKEOPTS) CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
! #	LDFLAGS="-L$(STAGING_DIR)/lib" -C $(MPFR_DIR)
! #	mkdir -p $(MPFR_TARGET_DIR)
  #	$(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
! #	    DESTDIR=$(MPFR_TARGET_DIR) -C $(MPFR_DIR) install
! #	-$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(MPFR_TARGET_DIR)/lib/*
! #	-rm -rf $(MPFR_TARGET_DIR)/share
! #	cp -a $(MPFR_TARGET_DIR)/* $(STAGING_DIR)
! #	touch $(MPFR_DIR)/.build
  	
! #mpfr: $(MPFR_DIR)/.build
  
! #mpfr-clean:
! #	-$(MAKE) -C $(MPFR_DIR) clean
  
! #mpfr-dirclean:
! #	rm -rf $(MPFR_DIR)
  
  
+ #############################################################
+ #
+ # MPC is required by GCC
+ #
+ #############################################################
+ $(MPC_DIR)/.unpacked: 
+ 	(cd $(GCC_DIR); zcat ../$(MPC_SOURCE) | tar -xvf -)
+ 	mv $(MPC_DIR)-$(MPC_VERSION) $(MPC_DIR)
+ 	perl -i -p -e "s,(['"'"=: ])/(usr/)?lib,\1$(STAGING_DIR)/\2lib,g' \
+ 		$(MPC_DIR)/configure
+ 	touch $(MPC_DIR)/.unpacked
+ 
+ mpc-source: $(MPC_DIR)/.unpacked
+ 
  
  #############################################################
***************
*** 540,544 ****
  GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
  
! $(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched $(GMP_DIR)/.build $(MPFR_DIR)/.build
  	#
  	# Hack up the soname for libstdc++
--- 551,556 ----
  GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
  
! $(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched 
! #$(GMP_DIR)/.build $(MPFR_DIR)/.build
  	#
  	# Hack up the soname for libstdc++
***************
*** 665,669 ****
  
  ########################### bering uclibc stuff
! .source: .setup $(BINUTILS_DIR)/.patched $(UCLIBC_DIR)/.configured $(GCC_DIR)/.patched $(GMP_DIR)/.unpacked $(MPFR_DIR)/.unpacked
  	touch .source
  
--- 677,681 ----
  
  ########################### bering uclibc stuff
! .source: .setup $(BINUTILS_DIR)/.patched $(UCLIBC_DIR)/.configured $(GCC_DIR)/.patched $(GMP_DIR)/.unpacked $(MPFR_DIR)/.unpacked $(MPC_DIR)/.unpacked
  	touch .source
  


------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.