From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 6 14:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE628A51 for ; Fri, 6 Dec 2013 14:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9935B1236 for ; Fri, 6 Dec 2013 14:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6EU0FD074280 for ; Fri, 6 Dec 2013 14:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB6EU0gs074279; Fri, 6 Dec 2013 14:30:00 GMT (envelope-from gnats) Resent-Date: Fri, 6 Dec 2013 14:30:00 GMT Resent-Message-Id: <201312061430.rB6EU0gs074279@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ganael Laplanche Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EFFFD9C2 for ; Fri, 6 Dec 2013 14:25:58 +0000 (UTC) Received: from oldred.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D09B31207 for ; Fri, 6 Dec 2013 14:25:58 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rB6EPwLB043329 for ; Fri, 6 Dec 2013 14:25:58 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rB6EPwgZ043328; Fri, 6 Dec 2013 14:25:58 GMT (envelope-from nobody) Message-Id: <201312061425.rB6EPwgZ043328@oldred.freebsd.org> Date: Fri, 6 Dec 2013 14:25:58 GMT From: Ganael Laplanche To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/184540: New options framework + DEBUG option set = wrong INSTALL_TARGET X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2013 14:30:00 -0000 >Number: 184540 >Category: ports >Synopsis: New options framework + DEBUG option set = wrong INSTALL_TARGET >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: Fri Dec 06 14:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Ganael Laplanche >Release: 10-STABLE >Organization: http://contribs.martymac.org >Environment: FreeBSD laptop.martymac.org 10.0-BETA3 FreeBSD 10.0-BETA3 #0 r258683M: Wed Nov 27 20:49:22 CET 2013 root@laptop.martymac.org:/usr/obj/files/Src/sys/GENERIC amd64 >Description: I would like to update emulators/dolphin-emu and use the new options framework to handle the DEBUG option (see the attached patch). Unfortunately, with the DEBUG option set to on, INSTALL_TARGET keeps being defined to 'install/strip' while it should be set to 'install'. FYI, including just before in the port fixes the problem (but that's not a clean way of fixing it :p). >How-To-Repeat: Use the attached patch, then : # cd /usr/ports/dolphin-emu && make config => uncheck the DEBUG option # make -V INSTALL_TARGET install/strip => that is OK # make config => check the DEBUG option # make -V INSTALL_TARGET install/strip => still the same, should be 'install' >Fix: Patch attached with submission follows: diff -aurN emulators/dolphin-emu.orig/Makefile emulators/dolphin-emu/Makefile --- emulators/dolphin-emu.orig/Makefile 2013-12-04 19:48:48.000000000 +0100 +++ emulators/dolphin-emu/Makefile 2013-12-05 06:13:09.140779000 +0100 @@ -1,9 +1,9 @@ # Created by: Ganael Laplanche -# $FreeBSD: emulators/dolphin-emu/Makefile 335626 2013-12-04 18:48:48Z makc $ +# $FreeBSD: emulators/dolphin-emu/Makefile 335549 2013-12-03 08:34:29Z martymac $ PORTNAME= dolphin-emu PORTVERSION= 4.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac @@ -28,8 +28,6 @@ WX_UNICODE= yes USE_GL= gl glew glu -USE_GCC= yes - USES= dos2unix cmake pkgconfig iconv DOS2UNIX_REGEX= .*\.(h|c|cpp) @@ -41,61 +39,39 @@ -DUSE_X11:BOOL=ON \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON -OPTIONS_DEFINE= PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP +OPTIONS_DEFINE= PULSEAUDIO PORTAUDIO DEBUG FRAMEDUMPS UPNP NLS +OPTIONS_DEFAULT= PORTAUDIO FRAMEDUMPS UPNP NLS +OPTIONS_SUB= yes +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CMAKE_ON= -DDISABLE_PULSEAUDIO:BOOL=OFF +PULSEAUDIO_CMAKE_OFF= -DDISABLE_PULSEAUDIO:BOOL=ON PORTAUDIO_DESC= Enable PortAudio (mic) support +PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_CMAKE_ON= -DDISABLE_PORTAUDIO:BOOL=OFF +PORTAUDIO_CMAKE_OFF= -DDISABLE_PORTAUDIO:BOOL=ON +DEBUG_MAKE_ENV= VERBOSE=yes +DEBUG_CMAKE_ON= -DFASTLOG:BOOL=ON +DEBUG_CMAKE_OFF= -DFASTLOG:BOOL=OFF FRAMEDUMPS_DESC= Encode framedumps in AVI format -OPTIONS_DEFAULT= PORTAUDIO FRAMEDUMPS UPNP - -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CMAKE_ARGS+= -DDISABLE_NLS:BOOL=ON -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CMAKE_ARGS+= -DFASTLOG:BOOL=ON -MAKE_ENV+= VERBOSE=yes -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -.else -CMAKE_ARGS+= -DDISABLE_PULSEAUDIO:BOOL=ON -.endif - -.if ${PORT_OPTIONS:MPORTAUDIO} -LIB_DEPENDS+= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 -.else -CMAKE_ARGS+= -DDISABLE_PORTAUDIO:BOOL=ON -.endif - -.if ${PORT_OPTIONS:MFRAMEDUMPS} -CMAKE_ARGS+= -DENCODE_FRAMEDUMPS:BOOL=ON -LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ - libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ - libswscale.so:${PORTSDIR}/multimedia/ffmpeg \ - libavutil.so:${PORTSDIR}/multimedia/ffmpeg -.else -CMAKE_ARGS+= -DENCODE_FRAMEDUMPS:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MUPNP} -CMAKE_ARGS+= -DUSE_UPNP:BOOL=ON -LIB_DEPENDS+= libminiupnpc.so:${PORTSDIR}/net/miniupnpc -.else -CMAKE_ARGS+= -DUSE_UPNP:BOOL=OFF -.endif +FRAMEDUMPS_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ + libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ + libswscale.so:${PORTSDIR}/multimedia/ffmpeg \ + libavutil.so:${PORTSDIR}/multimedia/ffmpeg +FRAMEDUMPS_CMAKE_ON= -DENCODE_FRAMEDUMPS:BOOL=ON +FRAMEDUMPS_CMAKE_OFF= -DENCODE_FRAMEDUMPS:BOOL=OFF +UPNP_LIB_DEPENDS= libminiupnpc.so:${PORTSDIR}/net/miniupnpc +UPNP_CMAKE_ON= -DUSE_UPNP:BOOL=ON +UPNP_CMAKE_OFF= -DUSE_UPNP:BOOL=OFF +NLS_USES= gettext +NLS_CMAKE_ON= -DDISABLE_NLS:BOOL=OFF +NLS_CMAKE_OFF= -DDISABLE_NLS:BOOL=ON .include .if !empty(ICONV_LIB) -CMAKE_ARGS+= -DUSE_ICONV:BOOL=ON +CMAKE_ARGS+= -DICONV_LINK:BOOL=ON .else -CMAKE_ARGS+= -DUSE_ICONV:BOOL=OFF +CMAKE_ARGS+= -DICONV_LINK:BOOL=OFF .endif .include diff -aurN emulators/dolphin-emu.orig/files/patch-Source-Core-DolphinWX-CMakeLists.txt emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt --- emulators/dolphin-emu.orig/files/patch-Source-Core-DolphinWX-CMakeLists.txt 2013-10-16 09:16:57.000000000 +0200 +++ emulators/dolphin-emu/files/patch-Source-Core-DolphinWX-CMakeLists.txt 2013-12-04 17:02:59.552168000 +0100 @@ -14,12 +14,12 @@ else() - set(LIBS ${LIBS} png iconv) + set(LIBS ${LIBS} png) -+ set(USE_ICONV True) ++ set(ICONV_LINK True) +endif() + -+if(USE_ICONV) -+ message( "-- Adding iconv") -+ set(LIBS ${LIBS} iconv) ++if(ICONV_LINK) ++ message( "-- Linking to libiconv") ++ set(LIBS ${LIBS} iconv) endif() if(LIBAV_FOUND) >Release-Note: >Audit-Trail: >Unformatted: