Attachment 160892 Details for Bug 203011 – Patch

[patch] Patch

xorp.patch (text/plain), 2.18 KB, created by Dmitry Marakasov on 2015-09-10 13:06:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-09-10 13:06:57 UTC

Size: 2.18 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 396519)
>+++ Makefile	(working copy)
>@@ -49,16 +49,11 @@
> TCP_RPC_MAKE_ARGS=	transport=tcp
> TCP_RPC_MAKE_ARGS_OFF=	transport=local
> 
>-.include <bsd.port.pre.mk>
>-
> post-patch:
>-	${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/SConstruct
>-.if ${COMPILER_TYPE} == "clang"
>-	${REINPLACE_CMD} 's,-Werror,& -Wno-unused-function,' ${WRKSRC}/SConstruct
>-.endif
>+	@${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/SConstruct
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/rtrmgr/config/multicast4.boot \
> 	    ${STAGEDIR}${PREFIX}/etc/xorp.conf.sample
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: files/patch-SConstruct
>===================================================================
>--- files/patch-SConstruct	(revision 396519)
>+++ files/patch-SConstruct	(working copy)
>@@ -20,25 +20,24 @@
>  		  BUILDDIR = builddir,
> -		  CPPPATH=['$BUILDDIR'],
> -		  LIBPATH=['usr/lib'],
>-+		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
>-+		  LIBPATH=['usr/lib', '/usr/local/lib'],
>++		  CPPPATH=['%%LOCALBASE%%/include', '$BUILDDIR'],
>++		  LIBPATH=['usr/lib', '%%LOCALBASE%%/lib'],
>  		  variables = vars)
>  
>  prefix = env['prefix']
>-@@ -858,13 +849,13 @@ if ((build != "i386-pc-mingw32") and
>-      host_cpu == "i386" or
>-      host_cpu == "x86_64")):
>-         env.AppendUnique(CFLAGS = [
>--	        '-Werror',
>-+	        '-Werror -Wno-unused-function',
>- 		])
>- 	env.AppendUnique(CXXFLAGS = [
>--		'-Werror',
>-+		'-Werror -Wno-unused-function',
>- 		])
>- else:
>--	print "WARNING:  Detected funky platform, will not enable -Werror compile option: ", host_cpu
>-+	print "WARNING:  Detected funky platform, will not enable -Werror -Wno-unused-function compile option: ", host_cpu
>- 	
>+@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [
>+     '-Wcast-align',
>+     '-Wstrict-prototypes',
>+     '-Wnested-externs',
>++    '-Wno-unused-function',
>+     '-pipe',
>+     ])
>  
>- # NOTE: gcc specific flags.
>+@@ -891,6 +883,7 @@ env.AppendUnique(CXXFLAGS = [
>+     '-Wpointer-arith',
>+     '-Wcast-align',
>+     '-Woverloaded-virtual',
>++    '-Wno-unused-function',
>+     '-ftemplate-depth-25',
>+     '-pipe',
>+     ])

Actions: View | Diff

Attachments on bug 203011: 160892