Date: Tue, 30 Mar 2004 19:26:09 +0200 From: Marco Molteni <molter@tin.it> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64945: [PATCH] graphics/hpoj: unbreak build on fbsd 5.x Message-ID: <20040330192609.48183959@localhost> Resent-Message-ID: <200403301740.i2UHe62x037182@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64945
>Category: ports
>Synopsis: [PATCH] graphics/hpoj: unbreak build on fbsd 5.x
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 30 09:40:06 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Marco Molteni
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
Citello Networks
>Environment:
System: FreeBSD gattaccio 5.2-CURRENT
>Description:
Port graphics/hpoj is marked BROKEN on fbsd 5.x:
BROKEN= "ffs() clash, see i386/41930"
If you look at i386/41930, you will see that it is a nasty
C preprocessor problem on an include file that triggers a duplicated
definition and so an error.
Following patch, which is limited to the port in question and so
shouldn't raise any eyebrowns, fixes the problem with a classic
preprocessor trick.
>How-To-Repeat:
cd /usr/ports/graphics/hpoj && make
>Fix:
Apply following patch
diff -uNr hpoj/Makefile hpoj-marco/Makefile
--- hpoj/Makefile Tue Mar 30 19:04:30 2004
+++ hpoj-marco/Makefile Tue Mar 30 19:04:45 2004
@@ -50,9 +50,6 @@
.include <bsd.port.pre.mk>
-.if ${ARCH} == "i386" && ${OSVERSION} > 500000
-BROKEN= "ffs() clash, see i386/41930"
-.endif
.if ${ARCH} != "i386"
BROKEN= "Configure fails on !i386"
diff -uNr hpoj/files/patch-mlcd-ParPort.h hpoj-marco/files/patch-mlcd-ParPort.h
--- hpoj/files/patch-mlcd-ParPort.h Thu Jan 1 01:00:00 1970
+++ hpoj-marco/files/patch-mlcd-ParPort.h Tue Mar 30 19:01:14 2004
@@ -0,0 +1,13 @@
+--- mlcd/ParPort.h.orig Tue Mar 30 18:42:02 2004
++++ mlcd/ParPort.h Tue Mar 30 18:51:23 2004
+@@ -32,6 +32,10 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ extern "C" {
++ #undef fls
++ #define fls iamdirtybutloved
++ #undef ffs__ParPort
++ #define ffs__ParPort iamdirtybutfancied
+ #include <machine/cpufunc.h>
+ }
+ #else
--
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040330192609.48183959>