From owner-freebsd-ports@FreeBSD.ORG Fri Jan 7 13:32:42 2011 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F417B106566C; Fri, 7 Jan 2011 13:32:41 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 82A5D8FC13; Fri, 7 Jan 2011 13:32:41 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirj.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1PbCQq-0007kE-39; Fri, 07 Jan 2011 13:32:40 +0000 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1PbCQp-0002ec-Ro; Fri, 07 Jan 2011 13:32:39 +0000 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4) with ESMTP id p07DWdAO099686; Fri, 7 Jan 2011 13:32:39 GMT (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.4/8.14.4/Submit) id p07DWdsN099685; Fri, 7 Jan 2011 13:32:39 GMT (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Fri, 7 Jan 2011 13:32:39 +0000 From: Anton Shterenlikht To: Anonymous Message-ID: <20110107133239.GA99670@mech-cluster241.men.bris.ac.uk> References: <20110107095816.GA64948@mech-cluster241.men.bris.ac.uk> <86lj2xhrfi.fsf@gmail.com> <20110107114923.GA70063@mech-cluster241.men.bris.ac.uk> <86wrmghqjc.fsf@gmail.com> <20110107120900.GA70442@mech-cluster241.men.bris.ac.uk> <8662u0hp8j.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8662u0hp8j.fsf@gmail.com> User-Agent: Mutt/1.4.2.3i Cc: riggs@rrr.de, Anton Shterenlikht , freebsd-ports@freebsd.org, Eygene Ryabinkin Subject: Re: mplayer options patch X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jan 2011 13:32:42 -0000 On Fri, Jan 07, 2011 at 03:28:44PM +0300, Anonymous wrote: > Anton Shterenlikht writes: > > > On Fri, Jan 07, 2011 at 03:00:39PM +0300, Anonymous wrote: > >> Anton Shterenlikht writes: > >> > >> >> $ make config > >> >> "Makefile", line 16: Malformed conditional (${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "powerpc") > >> >> "Makefile", line 18: if-less else > >> >> "Makefile", line 20: if-less endif > >> >> make: fatal errors encountered -- cannot continue > >> > > >> > I put Eygene's snippet after .include , > >> > see my previous post. It seems to work. > >> > >> bsd.port.pre.mk starts after OPTIONS were already parsed. > >> Try to check > >> > >> $ make rmconfig > >> $ make -V WITH_RTCPU ARCH=sparc64 > >> true > > > > # make rmconfig > > ===> Removing user-configured options for mplayer-1.0.r20101106 > > rmdir: /var/db/ports/mplayer: Directory not empty > > *** Error code 1 (ignored) > > # make -V WITH_RTCPU ARCH=sparc64 > > > > # make -V WITH_RTCPU ARCH=ia64 > > > > # > > My bad, I forgot to remove RTCPU when added the ifdef. > > $ make -V WITH_RTCPU ARCH=sparc64 > > $ make -V WITHOUT_RTCPU ARCH=sparc64 > > $ make -V CONFIGURE_ARGS ARCH=sparc64 | fgrep run > ... --enable-runtime-cpudetection ... ${_LATE_CONFIGURE_ARGS} > > It's not only for sparc64, there is no WITH/WITHOUT_RTPCU for i386. > But the configure option still works > > .if !defined(WITHOUT_RTCPU) > CONFIGURE_ARGS+=--enable-runtime-cpudetection > .endif I don't think I need to change any other options from the current default to make it build and run on my ia64. So if this patch seems reasonable, can somebody submit it? many thanks anton --- Makefile 2010-12-02 09:18:00.000000000 +0000 +++ Makefile.new 2011-01-07 11:16:56.000000000 +0000 @@ -13,7 +13,6 @@ .include "${.CURDIR}/Makefile.shared" OPTIONS= DEBUG "Include debug symbols in mplayer's binaries" off -OPTIONS+= RTCPU "Allow runtime CPU detection" on OPTIONS+= OCFLAGS "Use optimized compiler flags" on OPTIONS+= IPV6 "Include inet6 network support" on OPTIONS+= X11 "Enable X11 support for mplayer's video output" on @@ -75,6 +74,12 @@ BROKEN= Does not compile on sparc64 .endif +.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "powerpc" +OPTIONS+= RTCPU "Allow runtime CPU detection" on +.else +OPTIONS+= RTCPU "Allow runtime CPU detection" off +.endif + CONFIGURE_ARGS+= --disable-ssse3 \ --disable-directfb \ --disable-faac \ -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423