[Astlinux-commits] SF.net SVN: astlinux: [1651] trunk

[<ppr...@us...>]

Revision: 1651
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1651&view=rev
Author:   pprindeville
Date:     2008-03-13 00:40:41 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
Experimental upgrade of readline (w/ patches).  Since I changed where patches are kept, also went back and diddled vim.

Modified Paths:
--------------
    trunk/Makefile
    trunk/package/readline/readline.mk
    trunk/package/vim/vim.mk

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-03-13 05:04:47 UTC (rev 1650)
+++ trunk/Makefile	2008-03-13 07:40:41 UTC (rev 1651)
@@ -90,7 +90,7 @@
 #
 #############################################################
 $(DL_DIR):
-	@mkdir -p $(DL_DIR)
+	@mkdir -p $(DL_DIR) $(DL_DIR)/patches
 
 $(BUILD_DIR):
 	@mkdir -p $(BUILD_DIR)

Modified: trunk/package/readline/readline.mk
===================================================================
--- trunk/package/readline/readline.mk	2008-03-13 05:04:47 UTC (rev 1650)
+++ trunk/package/readline/readline.mk	2008-03-13 07:40:41 UTC (rev 1651)
@@ -3,7 +3,11 @@
 # build GNU readline
 #
 #############################################################
+ifeq ($(strip $(BR2_PACKAGE_EXPERIMENTAL)),y)
+READLINE_VER:=5.2
+else
 READLINE_VER:=5.1
+endif
 READLINE_SITE:=ftp://ftp.cwru.edu/pub/bash
 READLINE_SOURCE:=readline-$(READLINE_VER).tar.gz
 READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VER)
@@ -18,9 +22,29 @@
 	mkdir -p $(READLINE_DIR)
 	tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(READLINE_SOURCE)
 	$(CONFIG_UPDATE) $(READLINE_DIR)
-	touch $(READLINE_DIR)/.unpacked
+	touch $@
 
-$(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
+$(DL_DIR)/patches/readline-$(READLINE_VER):
+	mkdir $(DL_DIR)/patches/readline-$(READLINE_VER)
+	wget -nv -r -nH --cut-dirs=4 -P $(DL_DIR)/patches/readline-$(READLINE_VER) \
+		"$(READLINE_SITE)/readline-$(READLINE_VER)-patches/readline$(subst .,,$(READLINE_VER))-[0-9][0-9][0-9]"
+
+$(READLINE_DIR)/.patched: $(DL_DIR)/patches/readline-$(READLINE_VER)
+	@echo -n "Patches:" ; \
+	for patch in $(DL_DIR)/patches/readline-$(READLINE_VER)/*; do \
+		echo -n " `basename $$patch`"; \
+		patch -s -N -p0 -d $(READLINE_DIR) < $$patch ; \
+	done ; \
+	echo ""
+	touch $@
+
+ifeq ($(strip $(BR2_PACKAGE_EXPERIMENTAL)),y)
+$(READLINE_DIR)/.current: $(READLINE_DIR)/.unpacked $(READLINE_DIR)/.patched
+else
+$(READLINE_DIR)/.current: $(READLINE_DIR)/.unpacked
+endif
+
+$(READLINE_DIR)/.configured: $(READLINE_DIR)/.current
 	(cd $(READLINE_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -29,7 +53,7 @@
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--prefix=$(STAGING_DIR) \
-	);
+	)
 	touch $(READLINE_DIR)/.configured
 
 $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
@@ -66,7 +90,7 @@
 	$(MAKE) \
             prefix=$(TARGET_DIR) \
             libdir=$(TARGET_DIR)/lib \
-	-C $(READLINE_DIR) install-shared
+	    -C $(READLINE_DIR) install-shared
 	touch -c $(TARGET_DIR)/include/readline/readline.h
 
 readline: $(STAGING_DIR)/include/readline/readline.h
@@ -79,8 +103,11 @@
 
 readline-dirclean:
 	rm -rf $(READLINE_DIR)
+ifeq ($(strip $(BR2_PACKAGE_EXPERIMENTAL)),y)
+	rm -rf $(DL_DIR)/patches/readline-$(READLINE_VER)
+endif
 
-readline-source:  $(DL_DIR)/$(READLINE_SOURCE)   $(READLINE_DIR)/.unpacked
+readline-source: $(READLINE_DIR)/.current
 
 ifeq ($(strip $(BR2_READLINE)),y)
 TARGETS+=readline

Modified: trunk/package/vim/vim.mk
===================================================================
--- trunk/package/vim/vim.mk	2008-03-13 05:04:47 UTC (rev 1650)
+++ trunk/package/vim/vim.mk	2008-03-13 07:40:41 UTC (rev 1651)
@@ -35,9 +35,9 @@
 ## The next couple of rules use "wget" and "patch" directly...
 ##
 
-$(DL_DIR)/vim-patches:
-	mkdir $(DL_DIR)/vim-patches
-	wget -nv -r -nH --cut-dirs=4 -P $(DL_DIR)/vim-patches \
+$(DL_DIR)/patches/vim:
+	mkdir $(DL_DIR)/patches/vim
+	wget -nv -r -nH --cut-dirs=4 -P $(DL_DIR)/patches/vim \
 		"$(VIM_SITE)/patches/$(VIM_VER)/$(VIM_VER).[0-9][0-9][0-9]"
 
 $(VIM_DIR)/.unpacked: $(DL_DIR)/$(notdir $(VIM_SOURCE)) \
@@ -48,9 +48,9 @@
 	$(VIM_CAT3) $(DL_DIR)/$(notdir $(VIM_SOURCE3)) | tar -C $(BUILD_DIR) $(VIM_TAR_OPTIONS) -
 	touch $(VIM_DIR)/.unpacked
 
-$(VIM_DIR)/.current: $(DL_DIR)/vim-patches
+$(VIM_DIR)/.current: $(DL_DIR)/patches/vim
 	@echo -n "Patches:"
-	@for patch in $(DL_DIR)/vim-patches/*; do \
+	@for patch in $(DL_DIR)/patches/vim/*; do \
 		echo -n " `basename $$patch`"; \
 		patch -s -N -p0 -d $(VIM_DIR) < $$patch; \
 	done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.