diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2020-03-03 12:56:15 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2020-03-03 12:56:15 +0000 |
commit | b2dcd7927c415db235d12ae921d35c3e57779584 (patch) | |
tree | 9b47606be4df16d47655e2b06e949876ce23056c | |
parent | databases/tcl-lmdb: update to 0.4.1 (diff) |
Ports MUST NOT set WITH_DEBUG.
WITH_DEBUG is a user facing variable. When a user wants to build a port
with debugging symbols enabled, they either set WITH_DEBUG globally, or
WITH_DEBUG_PORTS+=category/port.
Approved by: bapt
With hat: portmgr
Differential Revision: https://reviews.freebsd.org/D23940
Notes
Notes:
svn path=/head/; revision=527673
-rw-r--r-- | devel/subversion-lts/Makefile | 2 | ||||
-rw-r--r-- | devel/subversion-lts/Makefile.common | 6 | ||||
-rw-r--r-- | devel/subversion/Makefile | 2 | ||||
-rw-r--r-- | devel/subversion/Makefile.common | 6 | ||||
-rw-r--r-- | editors/openoffice-4/Makefile | 5 | ||||
-rw-r--r-- | editors/openoffice-devel/Makefile | 5 | ||||
-rw-r--r-- | irc/irssi/Makefile | 4 | ||||
-rw-r--r-- | mail/rspamd-devel/Makefile | 1 | ||||
-rw-r--r-- | math/wxmaxima/Makefile | 4 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile | 2 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile.options | 3 | ||||
-rw-r--r-- | net/libzmq4/Makefile | 10 | ||||
-rw-r--r-- | net/samba410/Makefile | 1 | ||||
-rw-r--r-- | net/udpxy/Makefile | 10 | ||||
-rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 1 | ||||
-rw-r--r-- | sysutils/e2fsprogs/Makefile | 2 |
16 files changed, 23 insertions, 41 deletions
diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile index b50dc47387c9..50b697d45df1 100644 --- a/devel/subversion-lts/Makefile +++ b/devel/subversion-lts/Makefile @@ -20,7 +20,6 @@ OPTIONS_DEFINE= \ DOCS \ FREEBSD_TEMPLATE\ GPG_AGENT \ - MAINTAINER_DEBUG\ NLS \ SASL \ SERF \ @@ -33,7 +32,6 @@ OPTIONS_DEFAULT=FREEBSD_TEMPLATE SERF TOOLS FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GPG_AGENT_DESC= Enable GPG agent password store -MAINTAINER_DEBUG_DESC= Build debug version SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) diff --git a/devel/subversion-lts/Makefile.common b/devel/subversion-lts/Makefile.common index a9e341e589a1..057584c8ef5f 100644 --- a/devel/subversion-lts/Makefile.common +++ b/devel/subversion-lts/Makefile.common @@ -36,8 +36,6 @@ BDB_CONFIGURE_ON= --enable-bdb6 BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USES= bdb -MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug - NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext @@ -59,8 +57,8 @@ STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-confi # =============================================================== .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMAINTAINER_DEBUG} -WITH_DEBUG= yes +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-maintainer-mode --enable-debug .endif APR_CONFIG= ${LOCALBASE}/bin/apr-1-config diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index b48ffb7a91db..77907db9f3d2 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -19,7 +19,6 @@ OPTIONS_DEFINE= \ DOCS \ FREEBSD_TEMPLATE\ GPG_AGENT \ - MAINTAINER_DEBUG\ NLS \ SASL \ SERF \ @@ -32,7 +31,6 @@ OPTIONS_DEFAULT=FREEBSD_TEMPLATE GPG_AGENT SERF TOOLS FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GPG_AGENT_DESC= Enable GPG agent password store -MAINTAINER_DEBUG_DESC= Build debug version SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index a86ab00b0859..e1677384cd9a 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -36,8 +36,6 @@ BDB_CONFIGURE_ON= --enable-bdb6 BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USES= bdb -MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug - NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext @@ -59,8 +57,8 @@ STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-confi # =============================================================== .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MMAINTAINER_DEBUG} -WITH_DEBUG= yes +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-maintainer-mode --enable-debug .endif APR_CONFIG= ${LOCALBASE}/bin/apr-1-config diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 617725b9803d..80dc7d61fccd 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -139,9 +139,9 @@ CPE_VENDOR= apache OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \ SDK WIKI_PUBLISHER OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER -CRASHDUMP_DESC= Enable crashdumps, sets WITH_DEBUG +CRASHDUMP_DESC= Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN} DBGUTIL_DESC= Enable assertions, object counting. (non-production) -DEBUG_DESC= Compile with -O0, sets WITH_DEBUG +DEBUG_DESC= Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN} GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= GNOME Virtual File System MMEDIA_DESC= Multimedia backend for impress @@ -149,7 +149,6 @@ SDK_DESC= Build and install software development kit WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension CRASHDUMP_CONFIGURE_ENABLE= crashdump -CRASHDUMP_VARS= WITH_DEBUG=yes CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 5dc1705572d4..62b69de44db9 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -153,9 +153,9 @@ CPE_VENDOR= apache OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \ MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER OPTIONS_DEFAULT= CUPS GNOME MMEDIA WIKI_PUBLISHER -CRASHDUMP_DESC= Enable crashdumps, sets WITH_DEBUG +CRASHDUMP_DESC= Enable crashdumps, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN} DBGUTIL_DESC= Enable assertions, object counting. (non-production) -DEBUG_DESC= Compile with -O0, sets WITH_DEBUG +DEBUG_DESC= Compile with -O0, you also need to set WITH_DEBUG_PORTS+=${PKGORIGIN} GNOME_DESC= GConf + screensaver presentation control via DBUS GNOMEVFS_DESC= Use GNOME Virtual File System instead of gio MMEDIA_DESC= Multimedia backend for impress @@ -166,7 +166,6 @@ SDK_DESC= Build and install software development kit WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension CRASHDUMP_CONFIGURE_ENABLE= crashdump -CRASHDUMP_VARS= WITH_DEBUG=yes CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 2fd14dfd0d79..9776efd8c541 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -19,7 +19,7 @@ USE_GNOME= glib20 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -OPTIONS_DEFINE= BOT CAPSICUM DEBUG DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC +OPTIONS_DEFINE= BOT CAPSICUM DOCS OTR PERL PROXY SOCKS TRUECOLOR UTF8PROC OPTIONS_DEFAULT= BOT CAPSICUM PERL PROXY SOCKS TRUECOLOR OPTIONS_SUB= yes @@ -27,8 +27,6 @@ BOT_DESC= Bot support BOT_CONFIGURE_WITH= bot CAPSICUM_DESC= Capsicum support CAPSICUM_CONFIGURE_WITH= capsicum -DEBUG_DESC= Build with debug symbols -DEBUG_VARS= WITH_DEBUG=yes OTR_DESC= OTR (off-the-record) support OTR_CONFIGURE_ON= --with-otr \ --with-libotr-inc-prefix=${PREFIX}/include diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile index df4e5d928b94..0d6ac9c3bd08 100644 --- a/mail/rspamd-devel/Makefile +++ b/mail/rspamd-devel/Makefile @@ -59,7 +59,6 @@ USE_GITHUB= yes GH_TAGNAME= 2939a82 DEBUG_FLAGS= -g -O0 -WITH_DEBUG= yes USE_RC_SUBR= rspamd diff --git a/math/wxmaxima/Makefile b/math/wxmaxima/Makefile index 768e21a79f1e..407e22abed31 100644 --- a/math/wxmaxima/Makefile +++ b/math/wxmaxima/Makefile @@ -25,11 +25,9 @@ WX_CONF_ARGS= absolute PORTDATA= COPYING README README.md -OPTIONS_DEFINE= DEBUG NLS +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -DEBUG_VARS= WITH_DEBUG=yes - NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-CMakeLists.txt NLS_USES= gettext diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index ab635d4265ef..1c73eaaa37ee 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -10,7 +10,7 @@ COMMENT= High performance media player supporting many formats .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common" -OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \ +OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO RTMP \ diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index dd223b65618c..6bd4437c02fa 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -56,8 +56,7 @@ LDFLAGS_i386+= -Wl,-z,notext # Extra build options for debugging # ================================= -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG= yes +.if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug=3 .endif diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile index dec2e2936093..a6d60eb58206 100644 --- a/net/libzmq4/Makefile +++ b/net/libzmq4/Makefile @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= check -OPTIONS_DEFINE= DEBUG LIBUNWIND MANPAGES +OPTIONS_DEFINE= LIBUNWIND MANPAGES OPTIONS_RADIO= CURVE OPTIONS_RADIO_CURVE= SODIUM TWEETNACL OPTIONS_GROUP= MULTICAST @@ -39,9 +39,6 @@ SODIUM_DESC= Use libsodium PGM_DESC= Enable PGM transport via OpenPGM NORM_DESC= Enable NORM via NRL -DEBUG_CONFIGURE_ENABLE= debug -DEBUG_VARS= WITH_DEBUG=yes - PGM_CONFIGURE_WITH= pgm PGM_LIB_DEPENDS= libpgm.so:net/openpgm @@ -69,6 +66,11 @@ CFLAGS+= -Wno-long-long .include <bsd.port.options.mk> +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + + .if !${PORT_OPTIONS:MSODIUM} && !${PORT_OPTIONS:MTWEETNACL} CONFIGURE_ARGS+= --disable-curve .endif diff --git a/net/samba410/Makefile b/net/samba410/Makefile index ce46de425665..86cf8eb2758f 100644 --- a/net/samba410/Makefile +++ b/net/samba410/Makefile @@ -303,7 +303,6 @@ NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate DEBUG_CONFIGURE_ON= --verbose --enable-debug DEBUG_MAKE_ARGS= --verbose DEBUG_FLAGS= -g -ggdb3 -O0 -DEBUG_VARS= WITH_DEBUG=yes MEMORY_DEBUG_IMPLIES= DEBUG MEMORY_DEBUG_CONFIGURE_ENV= ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`" diff --git a/net/udpxy/Makefile b/net/udpxy/Makefile index 52556fed8c52..262c0c3414bc 100644 --- a/net/udpxy/Makefile +++ b/net/udpxy/Makefile @@ -18,10 +18,9 @@ GH_ACCOUNT= pcherenkov WRKSRC_SUBDIR= chipmunk OPTIONS_SINGLE= CONF -OPTIONS_SINGLE_CONF= RELEASE LEAN DEBUG +OPTIONS_SINGLE_CONF= RELEASE LEAN RELEASE_DESC= No asserts, no debug symbols, verbose on LEAN_DESC= No asserts, no debug symbols, verbose off -DEBUG_DESC= Asserts, debug symbols, verbose on OPTIONS_DEFAULT= RELEASE PLIST_FILES= sbin/udpxy \ @@ -39,13 +38,12 @@ post-install: .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MRELEASE} +.if defined(WITH_DEBUG) +ALL_TARGET=debug +.elif ${PORT_OPTIONS:MRELEASE} ALL_TARGET=release .elif ${PORT_OPTIONS:MLEAN} ALL_TARGET=lean -.elif ${PORT_OPTIONS:MDEBUG} -ALL_TARGET=debug -WITH_DEBUG=yes .endif .include <bsd.port.mk> diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 123732f3f8f5..e1c4daa6a46e 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -15,7 +15,6 @@ USE_GITHUB= yes GH_ACCOUNT= freebsd GH_TAGNAME= 93c4c82e -WITH_DEBUG= yes CFLAGS+= -O0 -g -Wno-error USE_LDCONFIG= ${PREFIX}/lib/compat/pkg HAS_CONFIGURE= yes diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 5a834231acce..e5990d355283 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -65,7 +65,7 @@ ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space) PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space) SLOWTESTS_DESC= Enable slow tests that are skipped by default BASHTESTS_DESC= Enable tests that require the GNU bash shell -LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG=yes!) +LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!) FUSEFS_CONFIGURE_ENABLE= fuse2fs |