Date: Thu, 13 Oct 2005 13:19:57 +0200 (CEST) From: Sven Berkvens-Matthijsse <sven@ilse.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/87367: [PATCH] games/scorched3d does not compile when wxWindows 2.4 and 2.6 are both installed Message-ID: <200510131119.j9DBJvJL060043@serv7.ilse.net> Resent-Message-ID: <200510131120.j9DBKGtJ075320@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87367
>Category: ports
>Synopsis: [PATCH] games/scorched3d does not compile when wxWindows 2.4 and 2.6 are both installed
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 13 11:20:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Sven Berkvens-Matthijsse
>Release: FreeBSD 4.10-STABLE i386
>Organization:
ilse media BV
>Environment:
System: FreeBSD serv7.ilse.net 4.10-STABLE FreeBSD 4.10-STABLE #23: Wed Aug 4 15:18:52 CEST 2004 root@tango.ilse.net:/usr/obj/usr/src/sys/BAROQUE i386
>Description:
There is a problem with installing or upgrading the games/scorched3d port
if wxWindows 2.4 and 2.6 are both installed on the system. The problem is
that wxWindows 2.4 installs its include files in /usr/X11R6/include/wx
while wxWindows 2.6 installs its include files in /usr/X11R6/include/wx-2.6/wx.
The games/scorched3d port has -I /usr/X11R6/include before
-I /usr/X11R6/include/wx-2.6, and thus the compilation fails because one of
the sources includes wx/some_header_file.h and ends up including the 2.4
version instead of the 2.6 version.
>How-To-Repeat:
Install wxWindows 2.4 and 2.6 and then install scorched3d.
>Fix:
Replace the /usr/ports/games/scorched3d/files/patch-configure.ac
file with the following. This will reverse the order of the -I
compiler options and fix the problem.
--- ./configure.ac.orig Sat Aug 6 13:57:14 2005
+++ ./configure.ac Tue Aug 9 23:20:58 2005
@@ -37,8 +37,8 @@
have_SDLnet=yes
if test "x$enable_sdltest" = "xyes" ; then
AC_TRY_COMPILE([
- #include <SDL/SDL.h>
- #include <SDL/SDL_net.h>
+ #include <SDL11/SDL.h>
+ #include <SDL11/SDL_net.h>
int main(int argc, char *argv[])
{ return 0; }
@@ -248,13 +248,13 @@
])
fi
-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+CPPFLAGS="$WX_CPPFLAGS $CPPFLAGS"
+CXXFLAGS="$WX_CXXFLAGS_ONLY $CXXFLAGS"
+CFLAGS="$WX_CFLAGS_ONLY $CFLAGS"
if test x"$use_static_wx" = x"yes"; then
- LIBS="$LIBS $WX_LIBS_STATIC"
+ LIBS="$WX_LIBS_STATIC $LIBS"
else
- LIBS="$LIBS $WX_LIBS"
+ LIBS="$WX_LIBS $LIBS"
fi
dnl Check for FreeType2
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510131119.j9DBJvJL060043>