Revision: 7563
http://sourceforge.net/p/ipcop/svn/7563
Author: owes
Date: 2014-05-23 10:49:07 +0000 (Fri, 23 May 2014)
Log Message:
-----------
gcc requires gmp and mpfr, for maintenance/patches etc. it is easier to have
the build split also for toolchain.
Modified Paths:
--------------
ipcop/trunk/lfs/gcc
ipcop/trunk/lfs/gmp
ipcop/trunk/lfs/mpfr
ipcop/trunk/make.sh
Modified: ipcop/trunk/lfs/gcc
===================================================================
--- ipcop/trunk/lfs/gcc 2014-05-23 09:21:21 UTC (rev 7562)
+++ ipcop/trunk/lfs/gcc 2014-05-23 10:49:07 UTC (rev 7563)
@@ -54,34 +54,19 @@
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
endif
-# awk does not work for this
-GMPVERSION = gmp-$(shell grep 'VER ' gmp | cut -d '=' -f2 | cut -d ' ' -f2 )
-MPFRVERSION = mpfr-$(shell grep 'VER ' mpfr | cut -d '=' -f2 | cut -d ' ' -f2 )
-MPFRPATCH := $(MPFRVERSION)-allpatches.patch
-
PATCH1 = gcc-4.4.3-startfiles_fix-1.patch
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE) \
- $(GMPVERSION).tar.xz \
- $(MPFRVERSION).tar.xz \
- $(MPFRPATCH) \
$(PATCH1)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(GMPVERSION).tar.xz = $(URL_GNU)/gmp/$(GMPVERSION).tar.xz
-$(MPFRVERSION).tar.xz = $(URL_GNU)/mpfr/$(MPFRVERSION).tar.xz
-$(MPFRPATCH) =
http://www.mpfr.org/$(MPFRVERSION)/allpatches
-$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = 44b3192c4c584b9be5243d9e8e7e0ed1
-# weak : cut -d ' ' -f 3 rely only on ' = ' for gmp and mpfr _MD5
-$(GMPVERSION).tar.xz_MD5 = $(shell sed -ne '/_MD5.*/p' gmp | sed
-e '1!d' | cut -d ' ' -f 3)
-$(MPFRVERSION).tar.xz_MD5 = $(shell sed -ne '/_MD5.*/p' mpfr |
sed -e '1!d' | cut -d ' ' -f 3)
-$(MPFRPATCH)_MD5 = $(shell sed -ne '/_MD5.*/p' mpfr |
sed -e '2!d' | cut -d ' ' -f 3)
-$(PATCH1)_MD5 = 799ef1971350d2e3c794f2123f247cc6
+$(DL_FILE)_MD5 = 44b3192c4c584b9be5243d9e8e7e0ed1
+$(PATCH1)_MD5 = 799ef1971350d2e3c794f2123f247cc6
install : $(TARGET)
@@ -153,11 +138,6 @@
@mkdir $(DIR_SRC)/gcc-build
ifeq "$(STAGE)" "toolchain"
- cd $(DIR_APP) && xz -dc $(DIR_DL)/$(GMPVERSION).tar.xz | tar xf -
- cd $(DIR_APP) && mv $(GMPVERSION) gmp
- cd $(DIR_APP) && xz -dc $(DIR_DL)/$(MPFRVERSION).tar.xz | tar xf -
- cd $(DIR_APP) && mv $(MPFRVERSION) mpfr
- cd $(DIR_APP)/mpfr && patch -Np1 -i $(DIR_DL)/$(MPFRPATCH)
ifeq "$(PASS)" "1"
# Don't depend on host gcc behavior for the first stage, there is so
many warning with gcc-4.7
@@ -176,7 +156,8 @@
--disable-libgomp \
--enable-languages=c \
--without-ppl \
- --without-cloog
+ --without-cloog \
+ --with-gmp=/$(TOOLS_DIR) --with-mpfr=/$(TOOLS_DIR)
cd $(DIR_SRC)/gcc-build && make -j $(PARALLELISM)
cd $(DIR_SRC)/gcc-build && make install
# hacked with -m32 (2 in 1 DIY instruction) to support arch that build
fine (x86 and ppc) and sparc64
Modified: ipcop/trunk/lfs/gmp
===================================================================
--- ipcop/trunk/lfs/gmp 2014-05-23 09:21:21 UTC (rev 7562)
+++ ipcop/trunk/lfs/gmp 2014-05-23 10:49:07 UTC (rev 7563)
@@ -92,6 +92,13 @@
# The only code that use HAVE_CLOCK_GETTIME is tune/time.c that is not
compiled and is broken code. So remove the useless check
cd $(DIR_APP) && sed -i 's/clock clock_gettime/clock/' configure
+ifeq "$(STAGE)" "toolchain"
+ cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR) --disable-static
--build=$(MACHINE)-linux
+ cd $(DIR_APP) && make -j $(PARALLELISM)
+ cd $(DIR_APP) && make install
+endif
+
+ifeq "$(STAGE)" "base"
# --build=i486-linux force 32-bits ABI on an AMD 64-bits CPU
# and disable sse2 intructions usage on i686
# on sparc64 and powerpc64, force 32-bits userspace
@@ -108,6 +115,7 @@
endif
cd $(DIR_APP) && make install
+endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/lfs/mpfr
===================================================================
--- ipcop/trunk/lfs/mpfr 2014-05-23 09:21:21 UTC (rev 7562)
+++ ipcop/trunk/lfs/mpfr 2014-05-23 10:49:07 UTC (rev 7563)
@@ -55,7 +55,6 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(PATCH1) = http://www.mpfr.org/$(THISAPP)/allpatches
-# one space on each side of = matter for gcc
$(DL_FILE)_MD5 = f61da10945c3de6962749a5eb70dafd3
$(PATCH1)_MD5 = 9f81d0b7fea489b72d0e4125fd8c466a
@@ -89,6 +88,13 @@
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
+ifeq "$(STAGE)" "toolchain"
+ cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR)
--enable-thread-safe --disable-static
+ cd $(DIR_APP) && make -j $(PARALLELISM)
+ cd $(DIR_APP) && make install
+endif
+
+ifeq "$(STAGE)" "base"
cd $(DIR_APP) && ./configure --prefix=/usr --enable-thread-safe
--disable-static
cd $(DIR_APP) && make -j $(PARALLELISM)
@@ -104,6 +110,7 @@
endif
cd $(DIR_APP) && make install
+endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2014-05-23 09:21:21 UTC (rev 7562)
+++ ipcop/trunk/make.sh 2014-05-23 10:49:07 UTC (rev 7563)
@@ -1685,6 +1685,8 @@
PASS="1"
toolchain_make xz # Early, to be sure, even in
old host we could open .lzma or .xz package like glibc
toolchain_make binutils
+ toolchain_make gmp
+ toolchain_make mpfr
toolchain_make gcc
# gcc pass1 is removed on lfs/strip. If absent that mean we don't need
this signature
[ -f /${TOOLS_DIR}/bin/${LFS_TGT}-gcc ] && update-gcc-hash
"/${TOOLS_DIR}/bin/${LFS_TGT}-gcc"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
