Page MenuHomeFreeBSD
Files F144937480

D44750.id136921.diff
No OneTemporary
Actions

D44750.id136921.diff
View Options

diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -139,10 +139,8 @@
CARGO_ENV+= RUST_BACKTRACE=1
. endif
-. if !defined(_WITHOUT_LTO) && (!defined(WITHOUT_LTO_PORTS) || ${WITHOUT_LTO_PORTS:N${PKGORIGIN}})
+. if defined(WITH_LTO)
_CARGO_MSG= "===> Additional optimization to port applied"
-_WITH_LTO= yes
-.undef _WITHOUT_LTO
. endif
# Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1324,19 +1324,45 @@
TMPDIR?= /tmp
. endif # defined(PACKAGE_BUILDING)
+# If user specified WITH_FEATURE=yes for a feature that is disabled by default
+# treat it as enabled by default
+. for feature in ${_LIST_OF_WITH_FEATURES}
+. if ${_DEFAULT_WITH_FEATURES:N${feature}} && defined(WITH_${feature:tu})
+_DEFAULT_WITH_FEATURES+= ${feature}
+. endif
+. endfor
+
+. for feature in ${_LIST_OF_WITH_FEATURES}
+# Create _{WITH,WITHOUT}_FEATURE vars based on user-provided {WITH,WITHOUT}_FEATURE
+# Test WITHOUT_* first to make sure a port can disable the feature
+. if defined(WITHOUT_${feature:tu})
+_WITHOUT_${feature:tu}= ${WITHOUT_${feature:tu}}
+. elif defined(WITH_${feature:tu})
+_WITH_${feature:tu}= ${WITH_${feature:tu}}
+. endif
# For each Feature we support, process the
# WITH_FEATURE_PORTS and WITHOUT_FEATURE_PORTS variables
-. for feature in ${_LIST_OF_WITH_FEATURES}
. if ${_DEFAULT_WITH_FEATURES:M${feature}}
-_WITH_OR_WITHOUT= WITHOUT
+. if defined(WITHOUT_${feature:tu}_PORTS) && ${WITHOUT_${feature:tu}_PORTS:M${PKGORIGIN}}
+_WITHOUT_${feature:tu}= yes
+.undef _WITH_${feature:tu}
+. endif
. else
-_WITH_OR_WITHOUT= WITH
+. if defined(WITH_${feature:tu}_PORTS) && ${WITH_${feature:tu}_PORTS:M${PKGORIGIN}}
+_WITH_${feature:tu}= yes
+.undef _WITHOUT_${feature:tu}
+. endif
. endif
+. endfor
-. if defined(${_WITH_OR_WITHOUT}_${feature:tu}_PORTS)
-. if ${${_WITH_OR_WITHOUT}_${feature:tu}_PORTS:M${PKGORIGIN}}
-${_WITH_OR_WITHOUT}_${feature:tu}= yes
-. endif
+# Now we made sure the features are either on or off, let's put them back in
+# the WITH_* variable. From now on, we only need to test defined(WITH_*) or
+# !defined(WITH_*)
+. for feature in ${_LIST_OF_WITH_FEATURES}
+. if defined(_WITH_${feature:tu})
+WITH_${feature:tu}= _WITH_${feature:tu}
+. else
+.undef WITH_${feature:tu}
. endif
. endfor
@@ -1800,7 +1826,7 @@
. endif
. for f in ${_LIST_OF_WITH_FEATURES}
-. if defined(WITH_${f:tu}) || ( ${_DEFAULT_WITH_FEATURES:M${f}} && !defined(WITHOUT_${f:tu}) )
+. if defined(WITH_${f:tu})
.include "${PORTSDIR}/Mk/Features/$f.mk"
. endif
. endfor
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -58,7 +58,7 @@
--with-ldflags="-lm -lkvm -ldevstat -L${PKG_PREFIX}/lib -L${LOCALBASE}/lib ${LCRYPTO}"
SUB_FILES= pkg-message
-.if !defined(WITHOUT_SSP)
+.if defined(WITH_SSP)
CONFIGURE_ARGS+=--with-libs="-lssp_nonshared"
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 15, 7:23 AM (16 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28731766
Default Alt Text
D44750.id136921.diff (3 KB)

Event Timeline