Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Jun 2008 07:12:40 +0400 (MSD)
From:      Dmitry Marakasov <amdmi3@amdmi3.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/124742: [PATCH] graphics/ogre3d: make demos compilation optional, disabled by default
Message-ID:  <20080619031240.BBF051702D@hades.panopticon>
Resent-Message-ID: <200806190320.m5J3K15G005220@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         124742
>Category:       ports
>Synopsis:       [PATCH] graphics/ogre3d: make demos compilation optional, disabled by default
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 19 03:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Fri Apr 25 11:18:45 MSD 2008 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
* Make samples compilation optional and disabled by default, as samples are not installed and useful only for developers
* Don't add -NDEBUG to CPPFLAGS in case of ogre3d is compiled with WITH_DEBUG flag
>How-To-Repeat:
>Fix:

--- ogre3d.patch begins here ---
diff -ruN ogre3d.orig/Makefile ogre3d/Makefile
--- ogre3d.orig/Makefile	2008-06-19 06:22:10.000000000 +0400
+++ ogre3d/Makefile	2008-06-19 06:24:48.000000000 +0400
@@ -23,11 +23,11 @@
 WRKSRC=		${WRKDIR}/ogre
 CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static \
 		--with-cppunit-prefix=/nonexistent --disable-freeimage
-CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -DNDEBUG" \
-		ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV+=	ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \
 		ZZIPLIB_LIBS="-L${LOCALBASE}/lib -lzzip"
 
-OPTIONS=	GTK	"Use GTK instead of Xt gui"	off
+OPTIONS=	GTK	"Use GTK instead of Xt gui"	off \
+		DEMOS	"Build OGRE demos"		off
 
 GNU_CONFIGURE=	YES
 USE_AUTOTOOLS=	libtool:15
@@ -40,6 +40,16 @@
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITH_DEBUG)
+CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -DNDEBUG"
+.else
+CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include"
+.endif
+
+.if !defined(WITH_DEMOS)
+CONGIGURE_ARGS+=	--disable-ogre-demos
+.endif
+
 .if defined(WITH_GTK)
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=--with-gui=gtk
--- ogre3d.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080619031240.BBF051702D>