Author: justin Date: 2005-09-24 18:59:40 -0600 (Sat, 24 Sep 2005) New Revision: 750
Added: x86/trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch Modified: x86/trunk/packages/irssi/Makefile Log: Messages/Logging update for irssi, added patch for gcc4 compile error. Modified: x86/trunk/packages/irssi/Makefile =================================================================== --- x86/trunk/packages/irssi/Makefile 2005-09-24 17:39:16 UTC (rev 749) +++ x86/trunk/packages/irssi/Makefile 2005-09-25 00:59:40 UTC (rev 750) @@ -1,5 +1,4 @@ # irssi Makefile -#============================================================================== NM= irssi VRS= 0.8.9 @@ -9,49 +8,27 @@ URL-$(FILE)= http://irssi.org/files/$(FILE) SHA-$(FILE)= 57799a1e99ac5f6694eb6fd049d39a4e2e51f576 +PATCH1= $(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) - @$(std_build) + $(std_build) compile-stage2: - @$(call echo_message, Configuring) -#============================================================================== -# Configure commands below \/ -#============================================================================== - @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1 -# -#==Status Messages========================================== -# - @$(OK) - @$(call echo_message, Making) -#============================================================================== -# Make commands below \/ -#============================================================================== - @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1 -# -#==Status Messages=========================================== -# - @$(OK) - @$(call echo_message, Installing) -#============================================================================== -# Install commands below \/ -#============================================================================== - @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1 - @cp -ra $(ROOT)/root/.irssi /root -# -#==Status Messages=========================================== -# - @$(OK) + patch -Np1 -i ../$(PATCH1) + ./configure --prefix=/usr + make $(PM) + make install + cp -ra $(ROOT)/root/.irssi /root clean: - @-rm -rf $(DIR) + -rm -rf $(DIR) .PHONY: clean chroot compile-stage2 Added: x86/trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch =================================================================== --- x86/trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch 2005-09-24 17:39:16 UTC (rev 749) +++ x86/trunk/packages/irssi/irssi-0.8.9-gcc4_fixes-1.patch 2005-09-25 00:59:40 UTC (rev 750) @@ -0,0 +1,32 @@ +Submitted By: Justin Knierim <justin at linuxfromscratch dot org> +Date: 2005-09-24 +Initial Package Version: 0.8.9 +Upstream Status: "Fixed" +Origin: Pawel Sikora (pluto at pld-linux dot org) +Description: Fixes a compilation problem with gcc-4.0.x as described on http://bugs.irssi.org/?do=details&id=219. + +diff -Naur irssi-orig/src/core/misc.h irssi-0.8.9/src/core/misc.h +--- irssi-orig/src/core/misc.h 2003-01-30 20:10:02.000000000 -0800 ++++ irssi-0.8.9/src/core/misc.h 2005-09-24 17:19:14.000000000 -0700 +@@ -1,6 +1,10 @@ + #ifndef __MISC_H + #define __MISC_H + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + /* `str' should be type char[MAX_INT_STRLEN] */ + #define ltoa(str, num) \ + g_snprintf(str, sizeof(str), "%d", num) +diff -Naur irssi-orig/src/perl/module.h irssi-0.8.9/src/perl/module.h +--- irssi-orig/src/perl/module.h 2001-12-13 17:54:12.000000000 -0800 ++++ irssi-0.8.9/src/perl/module.h 2005-09-24 17:20:46.000000000 -0700 +@@ -1,3 +1,7 @@ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #ifdef NEED_PERL_H + # include <EXTERN.h> + # ifndef _SEM_SEMUN_UNDEFINED -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
