Revision: 5511 http://ipcop.svn.sourceforge.net/ipcop/?rev=5511&view=rev Author: gespinasse Date: 2011-03-03 21:08:54 +0000 (Thu, 03 Mar 2011)
Log Message: ----------- Update bash with patch10 Modified Paths: -------------- ipcop/trunk/lfs/bash ipcop/trunk/updates/1.9.18/information.xml Modified: ipcop/trunk/lfs/bash =================================================================== --- ipcop/trunk/lfs/bash 2011-03-02 05:51:50 UTC (rev 5510) +++ ipcop/trunk/lfs/bash 2011-03-03 21:08:54 UTC (rev 5511) @@ -43,19 +43,24 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) +# patches 1 to 9 are together PATCH1 = $(THISAPP)-fixes-3.patch +PATCH10 = $(PKG_NAME)41-010 ############################################################################### # Top-level Rules ############################################################################### objects = $(DL_FILE) \ - $(PATCH1) + $(PATCH1) \ + $(PATCH10).patch $(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1) +$(PATCH10).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH10) $(DL_FILE)_MD5 = 9800d8724815fd84994d9be65ab5e7b8 $(PATCH1)_MD5 = 500043db34cfb2c857335cb090ffd43d +$(PATCH10).patch_MD5 = 3bfe98c6896ada8a447d3f6c5c22eaed install : $(TARGET) @@ -86,11 +91,13 @@ @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1) - # configure and configure.in are patched in that order - # if they are not in the same second, autoconf is called - # and compilation fail if autoconf is not available on the building machine + cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/$(PATCH10).patch + # In bash-3.2, configure and configure.in are patched in that order + # if they are not in the same second, autoconf is called. + # Toolchain compilation fail if autoconf is not available on the building machine # uncomment to protect against autoconf call if new patch require that # cd $(DIR_APP) && touch configure + ifeq "$(STAGE)" "toolchain" cd $(DIR_APP) && ./configure --prefix=/$(TOOLS_DIR) \ --without-bash-malloc \ Modified: ipcop/trunk/updates/1.9.18/information.xml =================================================================== --- ipcop/trunk/updates/1.9.18/information.xml 2011-03-02 05:51:50 UTC (rev 5510) +++ ipcop/trunk/updates/1.9.18/information.xml 2011-03-03 21:08:54 UTC (rev 5511) @@ -4,7 +4,7 @@ <releasedate>2010-mm-dd</releasedate> <size>0</size> <description>Language updates.<br /> - Upgrade acpid to 2.0.7, apache to 2.2.17, bash to 4.1.9, cairo to 1.10.2, + Upgrade acpid to 2.0.7, apache to 2.2.17, bash to 4.1.10, cairo to 1.10.2, conntrack-tools to 1.0.0, coreutils to 8.10, dejavu-fonts to 2.32, dhcpcd to 5.2.11, dnsmqsq to 2.57, e2fsprogs to 1.41.14, ethtool to 2.6.36, freetype to 2.4.4, glib to 2.26.1, glibc to 2.11.3, gnupg to 1.4.11, grep to 2.7, hdparm to 9.36, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ What You Don't Know About Data Connectivity CAN Hurt You This paper provides an overview of data connectivity, details its effect on application quality, and explores various alternative solutions. http://p.sf.net/sfu/progress-d2d _______________________________________________ Ipcop-svn mailing list Ipcop-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ipcop-svn