From flynn@energyhq.es.eu.org  Thu Feb 10 20:21:42 2005
Return-Path: <flynn@energyhq.es.eu.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E292C16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Feb 2005 20:21:42 +0000 (GMT)
Received: from mindfields.energyhq.es.eu.org (73.Red-213-97-200.pooles.rima-tde.net [213.97.200.73])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6C50543D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Feb 2005 20:21:41 +0000 (GMT)
	(envelope-from flynn@energyhq.es.eu.org)
Received: from scienide.energyhq.es.eu.org (scienide.energyhq.es.eu.org [IPv6:2001:470:1f01:198:210:4bff:fe3d:e256])
	by mindfields.energyhq.es.eu.org (Postfix) with ESMTP id D186435821
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Feb 2005 21:21:39 +0100 (CET)
Message-Id: <1108066867.0@scienide.energyhq.es.eu.org>
Date: Thu, 10 Feb 2005 21:21:07 +0100
From: "Miguel Mendez" <flynn@energyhq.es.eu.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: emulators/xmame Fix RELENG_4 build and disable ia-64 for now
X-Send-Pr-Version: gtk-send-pr 0.4.4 
X-GNATS-Notify:

>Number:         77361
>Category:       ports
>Synopsis:       emulators/xmame Fix RELENG_4 build and disable ia-64 for now
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 10 20:30:02 GMT 2005
>Closed-Date:    Sat Feb 12 17:42:27 GMT 2005
>Last-Modified:  Sat Feb 12 17:42:27 GMT 2005
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:


System: FreeBSD 5.3-STABLE #0: Tue Feb  8 13:02:32 CET 2005
    root@scienide.energyhq.es.eu.org:/usr/src/sys/i386/compile/SCIENIDE.SMP



>Description:


The attached patch should fix the xmess build on RELENG_4 machines.
I've put ia64 on NOT_FOR_ARCHS because the build is bombing all the 
time in various places and needs further investigation.


>How-To-Repeat:





>Fix:


--- xmame.diff begins here ---
diff -ruN xmame.old/Makefile xmame/Makefile
--- xmame.old/Makefile	Fri Jan 28 17:41:37 2005
+++ xmame/Makefile	Thu Feb 10 21:05:49 2005
@@ -27,6 +27,9 @@
 WANT_SDL=	yes
 WANT_GNOME=	yes
 
+# Broken on ia-64
+NOT_FOR_ARCHS=	ia64
+
 # Are we building MAME, MESS or PinMAME? (also set by slave ports)
 MAMEMESS?=	mame
 
@@ -209,12 +212,6 @@
 NETWORK=\#
 .endif
 
-.if ${MAMEMESS} == "mess"
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile - duplicate symbols in messtest
-.endif
-.endif
-
 # The large number of sed regexes here is intended to make this port a whole
 # lot easier to maintain - please don't convert them into a patch.
 do-configure:
@@ -257,8 +254,10 @@
 	${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h
 
 .if ${MAMEMESS} == "mess"
-	${REINPLACE_CMD} -e "s@-Wl,--allow-multiple-definition@-Wl,-z -Wl,muldefs@" \
+.if ${OSVERSION} < 500000
+	${REINPLACE_CMD} -e "s@-Wl,--allow-multiple-definition@@" \
 		${WRKSRC}/makefile.mes ${WRKSRC}/src/unix/unix.mak
+.endif
 .endif
 
 post-build:
--- xmame.diff ends here ---



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Sat Feb 12 17:40:44 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77361 
>Unformatted:
