[gentoo-commits] gentoo-x86 commit in net-irc/irssi-xmpp/files: irssi-xmpp-0.51-implicit_conversion.patch irssi-xmpp-0.51-build_system.patch

[Kacper Kowalik (xarthisius)]

xarthisius    10/09/05 12:03:29

  Added:                irssi-xmpp-0.51-implicit_conversion.patch
                        irssi-xmpp-0.51-build_system.patch
  Log:
  Version bump wrt bug 322991. Fix building with --as-needed wrt bug 334861, fix parallel build, fix implicit function conversions that resulted in SIGSEGV on amd64. Fix docs wrt bug 322355. Remove old. Claim ownership with Tobias' blessing.
  
  (Portage version: 2.1.9/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-irc/irssi-xmpp/files/irssi-xmpp-0.51-implicit_conversion.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-implicit_conversion.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-implicit_conversion.patch?rev=1.1&content-type=text/plain

Index: irssi-xmpp-0.51-implicit_conversion.patch
===================================================================
Function `strdup' implicitly converted to pointer at xmpp-servers.c:295

--- src/core/xmpp-servers.c
+++ src/core/xmpp-servers.c
@@ -18,5 +18,6 @@
 */

+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <string.h>



1.1                  net-irc/irssi-xmpp/files/irssi-xmpp-0.51-build_system.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-build_system.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/irssi-xmpp/files/irssi-xmpp-0.51-build_system.patch?rev=1.1&content-type=text/plain

Index: irssi-xmpp-0.51-build_system.patch
===================================================================
* fix as-needed issues
* fix parallel build 

http://bugs.gentoo.org/show_bug.cgi?id=334861

--- config.mk
+++ config.mk
@@ -22,11 +22,11 @@
 LIBS =	${LIB_LIBS}
 
 # flags
-CFLAGS += -fPIC -std=c99 -DUOFF_T_LONG ${INCS}
-LDFLAGS += -shared ${LIBS}
+CFLAGS += -fPIC -std=c99 -DUOFF_T_LONG
+LDFLAGS += -shared
 
 # debug
-CFLAGS += -W -ggdb -Wall -Wno-unused-parameter
+#CFLAGS += -W -ggdb -Wall -Wno-unused-parameter
 
 # compiler and linker
 CC = cc
--- src/rules.mk
+++ src/rules.mk
@@ -4,25 +4,27 @@
 
 OBJS = ${SRCS:.c=.o}
 
-all: ${LIB}
+LIBSO=lib${LIB}.so
+
+all: ${LIBSO}
 
 .c.o:
-	${CC} ${CFLAGS} -o $@ -c $<
+	${CC} ${CFLAGS} ${INCS} -o $@ -c $<
 
-${LIB}: ${OBJS}
-	${CC} ${LDFLAGS} -o lib$@.so ${OBJS}
+${LIBSO}: ${OBJS}
+	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
 clean:
-	rm -f lib${LIB}.so ${OBJS}
+	rm -f ${LIBSO} ${OBJS}
 
 install: all
-	@echo installing the module lib${LIB}.so to ${DESTDIR}${IRSSI_LIB}/modules
+	@echo installing the module ${LIBSO} to ${DESTDIR}${IRSSI_LIB}/modules
 	install -d ${DESTDIR}${IRSSI_LIB}/modules
-	install lib${LIB}.so ${DESTDIR}${IRSSI_LIB}/modules
+	install ${LIBSO} ${DESTDIR}${IRSSI_LIB}/modules
 
 uninstall:
-	@echo deinstalling the module lib${LIB}.so from ${DESTDIR}${IRSSI_LIB}/modules
-	rm -f ${DESTDIR}${IRSSI_LIB}/modules/lib${LIB}.so
+	@echo deinstalling the module ${LIBSO} from ${DESTDIR}${IRSSI_LIB}/modules
+	rm -f ${DESTDIR}${IRSSI_LIB}/modules/${LIBSO}
 
 user-install:
 	env DESTDIR= IRSSI_LIB=~/.irssi ${MAKE} install