From owner-freebsd-amd64@FreeBSD.ORG  Fri Feb  6 13:09:33 2004
Return-Path: <owner-freebsd-amd64@FreeBSD.ORG>
Delivered-To: freebsd-amd64@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5751316A4CE; Fri,  6 Feb 2004 13:09:33 -0800 (PST)
Received: from pandora.cs.kun.nl (pandora.cs.kun.nl [131.174.33.4])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8E09843D48; Fri,  6 Feb 2004 13:09:31 -0800 (PST)
	(envelope-from adridg@cs.kun.nl)
Received: from odin.cs.kun.nl [131.174.33.33]  (helo=localhost)
	by pandora.cs.kun.nl (8.12.10/3.61) with ESMTP id i16L9URv017161;
	Fri, 6 Feb 2004 22:09:30 +0100 (MET)
From: Adriaan de Groot <adridg@cs.kun.nl>
To: lioux@freebsd.org
Date: Fri, 6 Feb 2004 22:09:30 +0100
User-Agent: KMail/1.6.50
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_KKAJAatr4BtKheM"
Message-Id: <200402062209.30490.adridg@cs.kun.nl>
cc: kde@freebsd.org
cc: freebsd-amd64@freebsd.org
Subject: [PATCH] libmpeg2
X-BeenThere: freebsd-amd64@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting FreeBSD to the AMD64 platform <freebsd-amd64.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-amd64>,
	<mailto:freebsd-amd64-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-amd64>
List-Post: <mailto:freebsd-amd64@freebsd.org>
List-Help: <mailto:freebsd-amd64-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-amd64>,
	<mailto:freebsd-amd64-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 21:09:33 -0000


--Boundary-00=_KKAJAatr4BtKheM
Content-Type: Text/Plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

=2D----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[CC to amd64 list because it's relevant for that platform; CC to kde becaus=
e=20
it's a dependency  port for kde.]

The attached patch takes out the don't-use-PIC logic from the libmpeg2 port=
 on=20
amd64. amd64 doesn't like libraries without -fPIC with 32-bit relocations (=
or=20
something like that). In any case, the port doesn't compile with=20
=2D -prefer-no-pic, so I ripped it out :)

=2D --=20
       pub  1024D/FEA2A3FE 2002-06-18 Adriaan de Groot <groot@kde.org>
The users that I support would double-click on a landmine to see what it di=
d.
=2D----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFAJAKKdqzuAf6io/4RAgogAKCZEF2eHVpsQ/kJfFlCizU/4ue6yACcCy1w
Pb9cELc5CF43IpYAg5/MYKs=3D
=3DT3qp
=2D----END PGP SIGNATURE-----

--Boundary-00=_KKAJAatr4BtKheM
Content-Type: text/x-diff;
  charset="us-ascii";
  name="libmpeg2.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="libmpeg2.diff"

--- Makefile.orig	Fri Feb  6 21:42:59 2004
+++ Makefile	Fri Feb  6 21:59:39 2004
@@ -52,6 +52,7 @@
 CFLAGS:=	${CFLAGS:N-mcpu=*}
 .endif
 
+
 pre-everything::
 	@${ECHO_MSG} "====>"
 .ifndef(WITH_SDL)
@@ -67,6 +68,11 @@
 	@${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/libmpeg2/Makefile.in
+
+.if ${MACHINE_ARCH:L} == "amd64"
+post-configure:
+	@${REINPLACE_CMD} -e 's|-prefer-non-pic||' ${WRKSRC}/*/Makefile*
+.endif
 
 post-install:
 .ifndef(NOPORTDOCS)

--Boundary-00=_KKAJAatr4BtKheM--