Revision: 6417
http://ipcop.svn.sourceforge.net/ipcop/?rev=6417&view=rev
Author: owes
Date: 2012-02-25 17:49:58 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Update make to 3.82. Building problems caused by the change from 3.81 to 3.82
are (mostly) gone/solved by now.
Modified Paths:
--------------
ipcop/trunk/lfs/make
Removed Paths:
-------------
ipcop/trunk/src/patches/make-3.81-recursion-test-1.patch
Modified: ipcop/trunk/lfs/make
===================================================================
--- ipcop/trunk/lfs/make 2012-02-25 17:39:00 UTC (rev 6416)
+++ ipcop/trunk/lfs/make 2012-02-25 17:49:58 UTC (rev 6417)
@@ -33,30 +33,25 @@
include Config
PKG_NAME = make
-VER = 3.81
+VER = 3.82
HOST_ARCH = all
OTHER_SRC = yes
-THISAPP = make-$(VER)
+THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_GNU)/make
+DL_FROM = $(URL_GNU)/$(PKG_NAME)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-PATCH1 = $(THISAPP)-upstream_fixes-1.patch
-PATCH2 = $(THISAPP)-recursion-test-1.patch
-
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) $(PATCH1)
+objects = $(DL_FILE)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 354853e0b2da90c527e35aabb8d6f1e6
-$(PATCH1)_MD5 = 8b1e478d8e733dc2d72e31bc7af1defa
+$(DL_FILE)_MD5 = 1a11100f3c63fcf5753818e59d63088f
install : $(TARGET)
@@ -85,9 +80,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(PATCH2)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
ifeq "$(STAGE)" "toolchain"
# use --disable-nls just to be smaller
Deleted: ipcop/trunk/src/patches/make-3.81-recursion-test-1.patch
===================================================================
--- ipcop/trunk/src/patches/make-3.81-recursion-test-1.patch 2012-02-25
17:39:00 UTC (rev 6416)
+++ ipcop/trunk/src/patches/make-3.81-recursion-test-1.patch 2012-02-25
17:49:58 UTC (rev 6417)
@@ -1,16 +0,0 @@
-http://lists.gnu.org/archive/html/bug-make/2010-05/msg00022.html
-Add a space to separate -w-j 2 is required for glibc-2.11.2 and 2.12
-
---- make-3.81/tests/scripts/features/recursion~ 2005-02-10
01:10:58.000000000 +0100
-+++ make-3.81/tests/scripts/features/recursion 2010-05-26 15:30:30.000000000
+0200
-@@ -16,7 +16,7 @@ last:
- @echo MAKELEVEL = $(MAKELEVEL)
- @echo THE END
- ',
-- ('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')),
-+ ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')),
- ($vos
- ? "#MAKE#: Entering directory `#PWD#'
- make 'CFLAGS=-O' -f #MAKEFILE# foo
-
-Diff finished. Wed May 26 15:30:43 2010
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
