Date: Mon, 30 Sep 2013 23:25:33 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/182514: [PATCH] Mk/bsd.options.mk: add more OPTIONS helpers Message-ID: <20130930152534.0B30C3C76@sunpoet.net> Resent-Message-ID: <201309301530.r8UFU0f6015067@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182514
>Category: ports
>Synopsis: [PATCH] Mk/bsd.options.mk: add more OPTIONS helpers
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 30 15:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 9.2-PRERELEASE amd64
>Organization:
The FreeBSD project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #0 r255451: Wed Sep 11 02:56:55 CST 2013 sunpoet@bonjour.sunpoet.net:/usr/obj/usr/src/sys/bonjour amd64
>Description:
- Add more OPTIONS helpers: MAKE_ARGS, PLIST_FILES, PLIST_DIRS and PLIST_DIRSTRY
- Fix typo
>How-To-Repeat:
>Fix:
--- bsd.options.mk.patch begins ---
Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk (revision 328549)
+++ Mk/bsd.options.mk (working copy)
@@ -70,7 +70,7 @@
# WITHOUT - Unset options from the command line
#
#
-# The following knobs are there to simplfy the handling of OPTIONS in simple
+# The following knobs are there to simplify the handling of OPTIONS in simple
# cases :
#
# OPTIONS_SUB When defined it will add to PLIST_SUB:
@@ -93,9 +93,9 @@
# ${opt}_CMAKE_OFF When option is disabled, it will add its content to
# the CMAKE_ARGS.
#
-# For each of CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ENV USES
-# DISTFILES, defining ${opt}_${variable} will add it to the actual variable
-# when the option is enabled.
+# For each of CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV
+# USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY, defining
+# ${opt}_${variable} will add it to the actual variable when the option is enabled.
#
# For each of the depends target PKG EXTRACT PATCH FETCH BUILD LIB RUN,
# defining ${opt}_${deptype}_DEPENDS will add it to the actual dependency when
@@ -392,7 +392,8 @@
. if defined(${opt}_CMAKE_ON)
CMAKE_ARGS+= ${${opt}_CMAKE_ON}
. endif
-. for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ENV USES DISTFILES
+. for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV \
+ USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY
. if defined(${opt}_${flags})
${flags}+= ${${opt}_${flags}}
. endif
--- bsd.options.mk.patch ends ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130930152534.0B30C3C76>