Date: Tue, 3 Mar 2020 12:56:16 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527673 - in head: devel/subversion devel/subversion-lts editors/openoffice-4 editors/openoffice-devel irc/irssi mail/rspamd-devel math/wxmaxima multimedia/mplayer net/libzmq4 net/samba... Message-ID: <202003031256.023CuGxj055934@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Mar 3 12:56:15 2020 New Revision: 527673 URL: https://svnweb.freebsd.org/changeset/ports/527673 Log: 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 Modified: head/devel/subversion-lts/Makefile (contents, props changed) head/devel/subversion-lts/Makefile.common (contents, props changed) head/devel/subversion/Makefile (contents, props changed) head/devel/subversion/Makefile.common (contents, props changed) head/editors/openoffice-4/Makefile (contents, props changed) head/editors/openoffice-devel/Makefile (contents, props changed) head/irc/irssi/Makefile (contents, props changed) head/mail/rspamd-devel/Makefile (contents, props changed) head/math/wxmaxima/Makefile (contents, props changed) head/multimedia/mplayer/Makefile (contents, props changed) head/multimedia/mplayer/Makefile.options (contents, props changed) head/net/libzmq4/Makefile (contents, props changed) head/net/samba410/Makefile (contents, props changed) head/net/udpxy/Makefile (contents, props changed) head/ports-mgmt/pkg-devel/Makefile (contents, props changed) head/sysutils/e2fsprogs/Makefile (contents, props changed) Modified: head/devel/subversion-lts/Makefile ============================================================================== --- head/devel/subversion-lts/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/devel/subversion-lts/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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) Modified: head/devel/subversion-lts/Makefile.common ============================================================================== --- head/devel/subversion-lts/Makefile.common Tue Mar 3 12:20:10 2020 (r527672) +++ head/devel/subversion-lts/Makefile.common Tue Mar 3 12:56:15 2020 (r527673) @@ -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=" # =============================================================== .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 Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/devel/subversion/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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) Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Tue Mar 3 12:20:10 2020 (r527672) +++ head/devel/subversion/Makefile.common Tue Mar 3 12:56:15 2020 (r527673) @@ -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=" # =============================================================== .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 Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/editors/openoffice-4/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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 Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/editors/openoffice-devel/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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 Modified: head/irc/irssi/Makefile ============================================================================== --- head/irc/irssi/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/irc/irssi/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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 Modified: head/mail/rspamd-devel/Makefile ============================================================================== --- head/mail/rspamd-devel/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/mail/rspamd-devel/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -59,7 +59,6 @@ USE_GITHUB= yes GH_TAGNAME= 2939a82 DEBUG_FLAGS= -g -O0 -WITH_DEBUG= yes USE_RC_SUBR= rspamd Modified: head/math/wxmaxima/Makefile ============================================================================== --- head/math/wxmaxima/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/math/wxmaxima/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -25,10 +25,8 @@ 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 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/multimedia/mplayer/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -10,7 +10,7 @@ COMMENT= High performance media player supporting many .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 \ Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Tue Mar 3 12:20:10 2020 (r527672) +++ head/multimedia/mplayer/Makefile.options Tue Mar 3 12:56:15 2020 (r527673) @@ -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 Modified: head/net/libzmq4/Makefile ============================================================================== --- head/net/libzmq4/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/net/libzmq4/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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 @@ -68,6 +65,11 @@ CONFIGURE_ARGS+= --with-pkgconfigdir=${PREFIX}/libdata 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 Modified: head/net/samba410/Makefile ============================================================================== --- head/net/samba410/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/net/samba410/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -303,7 +303,6 @@ NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupda 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`" Modified: head/net/udpxy/Makefile ============================================================================== --- head/net/udpxy/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/net/udpxy/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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> Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/ports-mgmt/pkg-devel/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -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 Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Tue Mar 3 12:20:10 2020 (r527672) +++ head/sysutils/e2fsprogs/Makefile Tue Mar 3 12:56:15 2020 (r527673) @@ -65,7 +65,7 @@ ALLTESTS_DESC= Run most self-tests (needs more RAM/dis 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003031256.023CuGxj055934>