Date: Wed, 6 Sep 2006 05:21:37 +0400 (MSD) From: Dmitry Marakasov <amdmi3@mail.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102930: [PATCH] devel/ode: fix include file Message-ID: <20060906012137.B016B4064@hades.panopticon> Resent-Message-ID: <200609060130.k861UJjd022396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102930
>Category: ports
>Synopsis: [PATCH] devel/ode: fix include file
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 06 01:30:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Fri Aug 11 00:27:45 MSD 2006 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
${PREFIX}/include/ode/config.h installed by ode has some defines that shouldn't be there:
--- cut ---
/* Name of package */
#define PACKAGE "ODE"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "ode@q12.org"
/* Define to the full name of this package. */
#define PACKAGE_NAME "ODE"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "ODE 0.6.0-rc1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ode"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.6.0-rc1"
/* Version number of package */
#define VERSION "0.6.0-rc1"
--- /cut ---
These will conflict with internal config.h files of ports that depend on ode.
Usually that's lead to warnings, but sometimes (games/fwp case, which use -Werror) to errors.
Example is here: http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.6.2006072612/fwp-0.0.7.log
So, comment out these defines in post-install.
>How-To-Repeat:
cd /usr/ports/games/xmoto && make
(warnings will be displayed)
cd /usr/ports/games/fwp && make
(won't build, because of warnings coupled with -Werror)
>Fix:
--- ode.patch begins here ---
diff -ruN ode.orig/Makefile ode/Makefile
--- ode.orig/Makefile Wed Sep 6 04:24:48 2006
+++ ode/Makefile Wed Sep 6 04:53:05 2006
@@ -61,4 +61,8 @@
@${FIND} ${WRKSRC} -type f -name "*.h" -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-i "" -e 's|<malloc.h>|<stdlib.h>|g'
+post-install:
+ ${SED} -e '/PACKAGE/ s|^|//|; /VERSION/ s|^|//|' ${WRKSRC}/include/ode/config.h \
+ > ${PREFIX}/include/ode/config.h
+
.include <bsd.port.post.mk>
--- ode.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?20060906012137.B016B4064>