diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2018-11-02 13:32:34 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2018-11-02 13:32:34 +0000 |
| commit | 8a502cb2d43b4059a5678ee4539ca03603104107 (patch) | |
| tree | 2c2c3d0def8d9d1ad349013f7b532f0065f57789 /Mk | |
| parent | f60d4bacdc58ec061406d72cace1ac1266952e39 (diff) | |
| download | freebsd-ports-8a502cb2d43b4059a5678ee4539ca03603104107.zip | |
Remove compatibility code for FreeBSD < 11.2 from all ports.
Simplify some ports where DragonFlyBSD no longer needs to be special-cased.
Submitted by: rene
Reviewed by: bapt, jbeich
Differential Revision: https://reviews.freebsd.org/D17724
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/gssapi.mk | 15 | ||||
| -rw-r--r-- | Mk/bsd.gecko.mk | 5 |
2 files changed, 0 insertions, 20 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index f1e76ffc40b3..c09051ef2554 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -79,7 +79,6 @@ _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5 _HEADERS= sys/types.h sys/stat.h stdint.h -.undef _FIXUP_KRB5CONFIG .if empty(gssapi_ARGS) gssapi_ARGS= base .endif @@ -97,9 +96,6 @@ _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" -.if empty(OSREL:N9.3) -_FIXUP_KRB5CONFIG= yes -.endif .elif ${_local} == "heimdal" HEIMDAL_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${HEIMDAL_HOME} @@ -141,18 +137,7 @@ IGNORE= USES=gssapi - invalid args: [${_local}] specified .endif .endfor -# Fix up krb5-config if broken. This script included in 9.X prior to -# r271474 and in 10.X prior to r271473 are broken because -# libgssapi_krb5 for some interfaces of GSS-API is missing. -.if defined(_FIXUP_KRB5CONFIG) -KRB5CONFIG=${WRKDIR}/krb5-config -_USES_configure+= 290:krb5config-fix -krb5config-fix: - ${SED} -e 's,\$$lib_flags -lgssapi -lheimntlm,\$$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm,' < ${GSSAPIBASEDIR}/bin/krb5-config > ${KRB5CONFIG} - ${CHMOD} a+rx ${KRB5CONFIG} -.else KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config -.endif # Fix up -Wl,-rpath in LDFLAGS .if defined(_RPATH) && !empty(_RPATH) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index c8d630316112..f8d2400ce36b 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -163,8 +163,6 @@ RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} MOZ_EXPORT+= MOZ_JEMALLOC4=1 .if ${MOZILLA_VER:R:R} >= 48 MOZ_OPTIONS+= --enable-jemalloc=4 -.elif ${OSVERSION} < 1100079 -MOZ_OPTIONS+= --enable-jemalloc .endif # Mozilla >= 48 .endif # Mozilla < 55 @@ -414,9 +412,6 @@ MOZ_OPTIONS+= --enable-rust-simd .if ${PORT_OPTIONS:MDTRACE} MOZ_OPTIONS+= --enable-dtrace \ --disable-gold -. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100061 -LIBS+= -lelf -. endif STRIP= .else MOZ_OPTIONS+= --disable-dtrace |