Attachment 144432 Details for Bug 191426 – Unbreak for both, gcc and clang

[patch] Unbreak for both, gcc and clang

sendip-2.5_3_1.patch (text/plain), 3.07 KB, created by Marco Steinbach on 2014-07-05 18:49:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Steinbach

Created: 2014-07-05 18:49:14 UTC

Size: 3.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 360738)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	sendip
> PORTVERSION=	2.5
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-mgmt ipv6
> MASTER_SITES=	http://www.earth.li/projectpurple/files/
> 
>@@ -14,15 +14,21 @@
> 
> BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
> 
>-USES=		gmake perl5
>+USES=		gmake perl5 compiler
> 
> USE_LDCONFIG=	yes
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${COMPILER_TYPE} == clang
>+CFLAGS+=	-Wno-empty-body -Wno-constant-conversion
>+.endif
>+
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sendip
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sendip
> .for slib in ipv4.so ipv6.so icmp.so tcp.so udp.so rip.so ripng.so ntp.so \
> bgp.so
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/sendip/${slib}
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/sendip/${slib}
> .endfor
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 360738)
>+++ files/patch-Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Tue Jan 28 13:03:48 2003
>-+++ Makefile	Tue Jan 28 13:04:35 2003
>+--- Makefile.orig	2014-07-05 20:02:54.000000000 +0200
>++++ Makefile	2014-07-05 20:06:02.000000000 +0200
> @@ -1,23 +1,23 @@
>  #configureable stuff
> -PREFIX ?= /usr/local
>@@ -17,14 +17,12 @@
>  #INSTALL=/usr/ucb/install
>  
> -CFLAGS=	-fPIC -fsigned-char -pipe -Wall -Wpointer-arith -Wwrite-strings \
>--			-Wstrict-prototypes -Wnested-externs -Winline -Werror -g -Wcast-align \
>--			-DSENDIP_LIBS=\"$(LIBDIR)\"
>-+CFLAGS+=	-fPIC -fsigned-char -pipe -Wall -Wpointer-arith -Wwrite-strings -Wno-empty-body -Wno-constant-conversion \
>-+			-Wstrict-prototypes -Wnested-externs -Winline -Werror -Wcast-align \
>-+			-DSENDIP_LIBS=\"${LIBDIR}\"
>++CFLAGS+=	-fPIC -fsigned-char -pipe -Wall -Wpointer-arith -Wwrite-strings \
>+ 			-Wstrict-prototypes -Wnested-externs -Winline -Werror -g -Wcast-align \
>+ 			-DSENDIP_LIBS=\"$(LIBDIR)\"
>  #-Wcast-align causes problems on solaris, but not serious ones
> -LDFLAGS=	-g -rdynamic -lm
>-+LDFLAGS+=	-rdynamic -lm
>++LDFLAGS=	-rdynamic -lm
>  #LDFLAGS_SOLARIS= -g -lsocket -lnsl -lm
>  LDFLAGS_SOLARIS= -g -lsocket -lnsl -lm -ldl
>  LDFLAGS_LINUX= -g  -rdynamic -ldl -lm
>Index: files/patch-ripng.h
>===================================================================
>--- files/patch-ripng.h	(revision 0)
>+++ files/patch-ripng.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- ripng.h.orig	2014-07-05 20:09:27.000000000 +0200
>++++ ripng.h	2014-07-05 20:09:51.000000000 +0200
>+@@ -15,7 +15,7 @@
>+ 	struct in6_addr prefix;
>+ 	u_int16_t tag;
>+ 	u_int8_t len;
>+-	u_int8_t metric;
>++	u_int16_t metric;
>+ } ripng_entry;
>+ 
>+ /* Defines for which parts have been modified
>
>Property changes on: files/patch-ripng.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

coco: maintainer-approval+

Actions: View | Diff

Attachments on bug 191426: 144177 | 144432 | 144950