r759 - x86/trunk/packages/mutt

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sat Sep 24 19:52:32 PDT 2005


Author: justin
Date: 2005-09-24 20:52:31 -0600 (Sat, 24 Sep 2005)
New Revision: 759

Added:
   x86/trunk/packages/mutt/mutt-1.4.2.1-gcc4_fixes-1.patch
Modified:
   x86/trunk/packages/mutt/Makefile
Log:
Messages/Logging update for mutt, added patch to fix gcc4 compilation problem.

Modified: x86/trunk/packages/mutt/Makefile
===================================================================
--- x86/trunk/packages/mutt/Makefile	2005-09-25 02:23:11 UTC (rev 758)
+++ x86/trunk/packages/mutt/Makefile	2005-09-25 02:52:31 UTC (rev 759)
@@ -1,5 +1,4 @@
 # mutt Makefile
-#==============================================================================
 
 NM= mutt
 VRS= 1.4.2.1
@@ -13,53 +12,31 @@
 URL-$(PATCH1)= http://mutt.org.ua/download/mutt-$(VRS)/$(PATCH1)
 SHA-$(PATCH1)= ac0ddf0831808b01c67ab27b3e3823ecf1ca131b
 
+PATCH2= $(DIR)-gcc4_fixes-1.patch
+
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) \
+	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile $(FILE) $(PATCH1)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@groupadd mail
-	@gunzip -c ../$(PATCH1) > ../patch-$(VRS).vvv.nntp
-	@patch -Np1 -i ../patch-$(VRS).vvv.nntp
-	@./configure --prefix=/usr --sysconfdir=/etc --enable-imap \
-	 --enable-pop --enable-nntp --with-ssl >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-	@install -m600  $(ROOT)/root/.muttrc /root
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	groupadd mail
+	gunzip -c ../$(PATCH1) > ../patch-$(VRS).vvv.nntp
+	patch -Np1 -i ../patch-$(VRS).vvv.nntp
+	patch -Np1 -i ../$(PATCH2)
+	./configure --prefix=/usr --sysconfdir=/etc --enable-imap \
+	 --enable-pop --enable-nntp --with-ssl
+	make $(PM)
+	make install
+	install -m600  $(ROOT)/root/.muttrc /root
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Added: x86/trunk/packages/mutt/mutt-1.4.2.1-gcc4_fixes-1.patch
===================================================================
--- x86/trunk/packages/mutt/mutt-1.4.2.1-gcc4_fixes-1.patch	2005-09-25 02:23:11 UTC (rev 758)
+++ x86/trunk/packages/mutt/mutt-1.4.2.1-gcc4_fixes-1.patch	2005-09-25 02:52:31 UTC (rev 759)
@@ -0,0 +1,32 @@
+Submitted By: Justin Knierim <justin at linuxfromscratch dot org>
+Date: 2005-09-24
+Initial Package Version: 1.4.2.1
+Upstream Status: Unknown
+Origin: bugs.mutt.org - Post from user sharninder to Bug 2062/2063
+Description: Fixes compile error when compiled with gcc-4.0.x, basically
+changing how the structure is created.
+
+diff -Naur mutt-orig/keymap.c mutt-1.4.2.1/keymap.c
+--- mutt-orig/keymap.c	2001-10-16 07:29:27.000000000 -0700
++++ mutt-1.4.2.1/keymap.c	2005-09-24 19:34:42.000000000 -0700
+@@ -28,7 +28,7 @@
+ 
+ #include "functions.h"
+ 
+-struct mapping_t Menus[] = {
++struct mapping_t *Menus = {
+  { "alias",	MENU_ALIAS },
+  { "attach",	MENU_ATTACH },
+  { "browser",	MENU_FOLDER },
+diff -Naur mutt-orig/keymap.h mutt-1.4.2.1/keymap.h
+--- mutt-orig/keymap.h	2001-09-11 04:20:34.000000000 -0700
++++ mutt-1.4.2.1/keymap.h	2005-09-24 19:33:32.000000000 -0700
+@@ -80,7 +80,7 @@
+ /* dokey() records the last real key pressed  */
+ extern int LastKey;
+ 
+-extern struct mapping_t Menus[];
++extern struct mapping_t *Menus;
+ 
+ struct binding_t
+ {




More information about the livecd mailing list