<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4c628cac76d0e5ee79c3bbe8c6679ca7f627b064">https://github.com/macports/macports-ports/commit/4c628cac76d0e5ee79c3bbe8c6679ca7f627b064</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4c628cac76d net-snmp: update to 5.9 (#9506)
</span>4c628cac76d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4c628cac76d0e5ee79c3bbe8c6679ca7f627b064
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Sun Jan 3 22:07:30 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> net-snmp: update to 5.9 (#9506)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/61624
</span>---
net/net-snmp/Portfile | 19 ++-
net/net-snmp/files/fix-compiler-warnings.patch | 103 +++++++++++++++++
net/net-snmp/files/fix-order-of-L-flags.patch | 128 ++++++++++-----------
net/net-snmp/files/patch-Makefile.in.diff | 37 +++++-
.../files/patch-agent-mibgroup-mibII-icmp.h.diff | 15 ---
net/net-snmp/files/yosemite-libtool.patch | 12 --
6 files changed, 201 insertions(+), 113 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/Portfile b/net/net-snmp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 128c7e274f8..3b5015a49da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/net-snmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
name net-snmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 66770d78f2583cda36e90cc35032d7dae2d354c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6591680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0c7843081a9b7053621d1acc0c35e78f4b930e07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6690435
</span>
categories net
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,19 +36,14 @@ depends_lib port:bzip2 \
</span> port:zlib
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # darwin18.h and above do not exist in 5.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://sourceforge.net/p/net-snmp/bugs/2504/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/include/net-snmp/system/darwin17.h ${worksrcpath}/include/net-snmp/system/darwin18.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/include/net-snmp/system/darwin17.h ${worksrcpath}/include/net-snmp/system/darwin19.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/include/net-snmp/system/darwin17.h ${worksrcpath}/include/net-snmp/system/darwin20.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|darwin10|darwin|" ${worksrcpath}/agent/mibgroup/mibII/icmp.h
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-agent-mibgroup-mibII-icmp.h.diff
</span> patchfiles-append configure-frameworks.patch
patchfiles-append configure-perl-cc.patch
patchfiles-append fix-order-of-L-flags.patch
patchfiles-append patch-Makefile.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append yosemite-libtool.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append fix-compiler-warnings.patch
</span>
configure.env-append PERLPROG=${perl5.bin}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/fix-compiler-warnings.patch b/net/net-snmp/files/fix-compiler-warnings.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..413c1a1a96c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/net-snmp/files/fix-compiler-warnings.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a7c8c26c48c954a19bca5fdc6ba285396610d7aa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mitchell Blank Jr <mitch@bodyfour.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 13 Dec 2020 03:23:02 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compiler warnings generated by configure scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Specifically, this is meant to reduce risk of issues with Xcode 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which has made -Werror,-Wimplicit-function-declaration a default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Normally this doesn't bite "real" code since such a warning would be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+visible for a long time with most compilers. However, inside of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure scripts these sorts of warnings just end up in config.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and usually get ignored. Now that they produce errors it means that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure tests that *should* pass suddenly fail, causing very
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+strange failures later on.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This can be as simple as calling "exit(0);" inside of a test C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+program without doing "#include <stdlib.h>" first!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+I also fixed an implicit-int-return warning since that is another
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+C behavior that was deprecated long ago and future compilers might
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+consider that an error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[ bvanassche: reran autoconf ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.d/config_os_functions | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.d/config_os_misc4 | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 8 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f6595e794c1f86a4898ccc33c59af5d3066478ec..a48b059a6ab380c6758420679a78071b492d792c 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28235,12 +28235,12 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_SYS_FS_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/fs_types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct fs_data fsd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Ultrix's statfs returns 1 for success,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0 for not mounted, -1 for failure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-exit (statfs (".", &fsd) != 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++return statfs (".", &fsd) != 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ac_fn_c_try_run "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31885,6 +31885,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <arpa/inet.h> /* inet_ntoa() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31957,6 +31958,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <arpa/inet.h> /* inet_ntoa() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.d/config_os_functions b/configure.d/config_os_functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3af9fa10b40c42b4a2e499e85f86ef4017644c2e..86ea64311dfc0c448026b900dbbb0a7e50477865 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.d/config_os_functions.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.d/config_os_functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,12 +212,12 @@ AC_CACHE_VAL(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_SYS_FS_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/fs_types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct fs_data fsd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Ultrix's statfs returns 1 for success,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0 for not mounted, -1 for failure. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-exit (statfs (".", &fsd) != 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++return statfs (".", &fsd) != 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [fu_cv_sys_stat_fs_data=yes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [fu_cv_sys_stat_fs_data=no],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.d/config_os_misc4 b/configure.d/config_os_misc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6f23c8e9bc76f81ddecff7440341fefabbf18977..b6864d97b8ad692a4e44b98a5a6fece0b5e656e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.d/config_os_misc4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.d/config_os_misc4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,6 +334,7 @@ AC_CACHE_CHECK([for IP_PKTINFO ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <arpa/inet.h> /* inet_ntoa() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -383,6 +384,7 @@ AC_CACHE_CHECK([for IP_RECVDSTADDR ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <arpa/inet.h> /* inet_ntoa() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int len;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/fix-order-of-L-flags.patch b/net/net-snmp/files/fix-order-of-L-flags.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index aea7d259636..bda167f514d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/fix-order-of-L-flags.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/net-snmp/files/fix-order-of-L-flags.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> Fix order of -L flags to link with the newly-built library, even if a
different version of the library is already installed.
--- perl/ASN/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/ASN/Makefile.PL 2018-09-19 12:40:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,10 +87,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $lib_version = `$opts->{'nsconfig'} --version`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/ASN/Makefile.PL 2020-12-18 16:33:01.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,10 +81,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ die "net-snmp-config failed\n";
</span>
if (lc($opts->{'insource'}) eq "true") {
- $Params{'LIBS'} =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,32 +12,31 @@ different version of the library is already installed.
</span> " -L" . abs_path("../../snmplib") .
- " " . $Params{'LIBS'};
+ " " . $Params{'LDDLFLAGS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (%Params);
</span> --- perl/OID/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/OID/Makefile.PL 2018-09-19 12:39:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,12 +82,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $lib_version = `$opts->{'nsconfig'} --version`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/OID/Makefile.PL 2020-12-18 16:50:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,11 +76,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $lib_version = `$opts->{'nsconfig'} --version` or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ die "net-snmp-config failed\n";
</span> if (lc($opts->{'insource'}) eq "true") {
- $Params{'LIBS'} =
+ $Params{'LDDLFLAGS'} =
"-L" . abs_path("../../snmplib/.libs") .
" -L" . abs_path("../../snmplib") .
- " " . $Params{'LIBS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " " . $Params{'LDDLFLAGS'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
</span> -# } else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ " " . $Params{'LDDLFLAGS'};
</span> + } else {
# $Params{'PREREQ_PM'} = {'SNMP' => '5.0'};
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> --- perl/SNMP/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/SNMP/Makefile.PL 2018-09-19 12:38:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,12 +95,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $lib_version = `$opts->{'nsconfig'} --version`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/SNMP/Makefile.PL 2020-12-18 16:35:51.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,10 +87,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $lib_version = `$opts->{'nsconfig'} --version` or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ die "net-snmp-config failed\n";
</span> if (lc($opts->{'insource'}) eq "true") {
- $Params{'LIBS'} =
+ $Params{'LDDLFLAGS'} =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,16 +44,14 @@ different version of the library is already installed.
</span> " -L" . abs_path("../../snmplib") .
- " " . $Params{'LIBS'};
+ " " . $Params{'LDDLFLAGS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # } else {
</span> # $Params{'PREREQ_PM'} = { 'NetSNMP::default_store' => 0.01 };
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- perl/TrapReceiver/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/TrapReceiver/Makefile.PL 2018-09-19 12:38:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,17 +119,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/TrapReceiver/Makefile.PL 2020-12-18 16:37:07.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,14 +108,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chomp($Params{'LIBS'});
</span>
if (lc($opts->{'insource'}) eq "true") {
- $Params{'LIBS'} =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,18 +64,14 @@ different version of the library is already installed.
</span> " -L" . abs_path("../../snmplib") .
- " " . $Params{'LIBS'};
+ " " . $Params{'LDDLFLAGS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $Params{'LIBS'} = `$opts->{'nsconfig'} --libdir` . " $Params{'LIBS'}";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $Params{'LDDLFLAGS'} = `$opts->{'nsconfig'} --libdir` . " $Params{'LDDLFLAGS'}";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $Params{'LIBS'} = `$opts->{'nsconfig'} --libdir` . " $Params{'LIBS'}";
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span> --- perl/agent/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/agent/Makefile.PL 2018-09-19 12:40:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,15 +87,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $lib_version = `$opts->{'nsconfig'} --version`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/agent/Makefile.PL 2020-12-18 16:38:46.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,14 +81,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $lib_version = `$opts->{'nsconfig'} --version` or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ die "net-snmp-config failed\n";
</span> if (lc($opts->{'insource'}) eq "true") {
- $Params{'LIBS'} =
+ $Params{'LDDLFLAGS'} =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,27 +80,26 @@ different version of the library is already installed.
</span> " -L" . abs_path("../../agent/.libs") .
" -L" . abs_path("../../agent") .
- " " . $Params{'LIBS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " " . $Params{'LDDLFLAGS'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
</span> -# } else {
- $Params{'LIBS'} = `$opts->{'nsconfig'} --libdir` . $Params{'LIBS'};
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ " " . $Params{'LDDLFLAGS'};
</span> + } else {
+ $Params{'LDDLFLAGS'} = `$opts->{'nsconfig'} --libdir` . $Params{'LDDLFLAGS'};
# $Params{'PREREQ_PM'} = {'NetSNMP::OID' => '0.1'};
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> --- perl/agent/Support/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/agent/Support/Makefile.PL 2018-09-19 12:40:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,6 +76,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $opts = NetSNMPGetOpts("../../");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chomp($Params{'LIBS'});
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,10 +84,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $lib_version = `$opts->{'nsconfig'} --version`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/agent/Support/Makefile.PL 2020-12-18 16:47:49.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($snmp_lib, $snmp_llib, $sep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $opts = NetSNMPGetOpts();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($Config{'osname'} eq 'MSWin32' && !defined($ENV{'OSTYPE'})) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $sep = '\\';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,10 +79,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ die "net-snmp-config failed\n";
</span>
if (lc($opts->{'insource'}) eq "true") {
- $Params{'LIBS'} =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,22 +108,22 @@ different version of the library is already installed.
</span> " -L" . abs_path("../../../snmplib") .
- " " . $Params{'LIBS'};
+ " " . $Params{'LDDLFLAGS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- perl/agent/default_store/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/agent/default_store/Makefile.PL 2018-09-19 12:41:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,6 +70,7 @@
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $opts = NetSNMPGetOpts("../../");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'LIBS'} = `$opts->{'nsconfig'} --libs`;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chomp($Params{'LIBS'});
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,10 +77,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $lib_version = `$opts->{'nsconfig'} --version`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (%Params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- perl/agent/default_store/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/agent/default_store/Makefile.PL 2020-12-18 16:47:04.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($snmp_lib, $snmp_llib, $sep);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $opts = NetSNMPGetOpts();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($Config{'osname'} eq 'MSWin32' && !defined($ENV{'OSTYPE'})) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $sep = '\\';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,10 +73,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $lib_version = `$opts->{'nsconfig'} --version` or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ die "net-snmp-config failed\n";
</span> if ($opts->{'insource'} eq "true") {
- $Params{'LIBS'} =
+ $Params{'LDDLFLAGS'} =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,14 +131,14 @@ different version of the library is already installed.
</span> " -L" . abs_path("../../../snmplib") .
- " " . $Params{'LIBS'};
+ " " . $Params{'LDDLFLAGS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../../include " . $Params{'CCFLAGS'};
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- perl/default_store/Makefile.PL.orig 2018-07-16 09:33:40.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ perl/default_store/Makefile.PL 2018-09-19 12:39:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,10 +77,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $lib_version = `$opts->{'nsconfig'} --version`;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ perl/default_store/Makefile.PL 2020-12-18 16:48:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,10 +71,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $lib_version = `$opts->{'nsconfig'} --version` or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ die "net-snmp-config failed\n";
</span> if (lc($opts->{'insource'}) eq "true") {
- $Params{'LIBS'} =
+ $Params{'LDDLFLAGS'} =
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,6 +146,6 @@ different version of the library is already installed.
</span> " -L" . abs_path("../../snmplib") .
- " " . $Params{'LIBS'};
+ " " . $Params{'LDDLFLAGS'};
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $Params{'CCFLAGS'} =~ s/ -W(all|inline|strict-prototypes|write-strings|cast-qual|no-char-subscripts)//g; # ignore developer warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/patch-Makefile.in.diff b/net/net-snmp/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ab8756c3db8..3848d5aac03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/net-snmp/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,36 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2018-07-16 09:33:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2018-09-14 22:21:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 52d4a465dcd92db004c34c1ad6a86fe36726e61b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Bart Van Assche <bvanassche@acm.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 4 Sep 2020 13:44:51 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Darwin: Fix 'make install'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only attempt to install header files that exist under
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+include/net-snmp/system/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See also https://github.com/net-snmp/net-snmp/issues/181 .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: f01c45c53cdc ("Darwin: Unify system header files")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile.in | 6 ++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Makefile.in b/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bdb92d4a2250fc977d78e086ba63256eaa7f81ab..ed729604fc0d5a1a60d47cbe911b52746922bf8e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,14 +17,12 @@ CPP = @CPP@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALLHEADERS=version.h net-snmp-features.h
</span> INCLUDESUBDIR=system
INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin.h darwin7.h darwin8.h darwin9.h darwin10.h darwin11.h darwin12.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- darwin.h darwin7.h darwin8.h darwin9.h darwin10.h darwin11.h darwin12.h \
</span> - darwin13.h darwin14.h darwin15.h darwin16.h darwin17.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin13.h darwin14.h darwin15.h darwin16.h darwin17.h darwin18.h darwin19.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dragonfly.h dynix.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dragonfly.h dynix.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ darwin.h dragonfly.h dynix.h \
</span> freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \
freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ freebsd12.h freebsd13.h freebsd14.h freebsd.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ generic.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hpux.h irix.h linux.h mingw32.h mingw32msvc.h mips.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hpux.h irix.h kfreebsd.h linux.h mingw32.h mingw32msvc.h mips.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ netbsd.h nto-qnx6.h osf5.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openbsd.h openbsd6.h openbsd5.h openbsd4.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/patch-agent-mibgroup-mibII-icmp.h.diff b/net/net-snmp/files/patch-agent-mibgroup-mibII-icmp.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bea2cf3be4b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/patch-agent-mibgroup-mibII-icmp.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- agent/mibgroup/mibII/icmp.h.orig 2018-07-16 09:33:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ agent/mibgroup/mibII/icmp.h 2018-09-14 22:40:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_arch_require(darwin11, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_arch_require(darwin12, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_arch_require(darwin13, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+config_arch_require(darwin14, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+config_arch_require(darwin15, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+config_arch_require(darwin16, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+config_arch_require(darwin17, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+config_arch_require(darwin18, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+config_arch_require(darwin19, mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <net-snmp/agent/cache_handler.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/yosemite-libtool.patch b/net/net-snmp/files/yosemite-libtool.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fd594168bdf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/yosemite-libtool.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't accidentally create flat-namespace dylibs on Yosemite and later (#44596).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11806,7 +11806,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span></pre><pre style='margin:0'>
</pre>