From 357cfd3b035d1ba6438e82cc1cbec105874206b6 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 5 Apr 2017 12:15:27 -0700 Subject: A bunch of "{Mac} OS X" -> "macOS" changes. Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris --- README.macos | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'README.macos') diff --git a/README.macos b/README.macos index 47f4a6b231..262f9993d2 100644 --- a/README.macos +++ b/README.macos @@ -1,8 +1,9 @@ -This file tries to help building Wireshark for (Mac) OS X (Wireshark -does not work on earlier versions of Mac OS). +This file tries to help building Wireshark for macOS (The Operating +System Formerly Known As Mac OS X And Then OS X) (Wireshark does not +work on the classic Mac OS). You must have the developer tools (called Xcode) installed. For -versions of OS X up to and including Snow Leopard, Xcode 3 should be +versions of macOS up to and including Snow Leopard, Xcode 3 should be available on the install DVD; Xcode 4 is available for download from developer.apple.com and, for Lion and later releases, from the Mac App Store. See @@ -35,7 +36,7 @@ environment variable's setting includes both /usr/X11/lib/pkgconfig and If you wish to build the legacy (GTK+) UI you must have X11 and the X11 developer headers and libraries installed, as well as the Pango, ATK, and GTK+ libraries; otherwise, you will not be able to build or install -GTK+. The X11 and X11 SDK that come with OS X releases for releases +GTK+. The X11 and X11 SDK that come with macOS releases for releases from Panther to Lion can be used to build and run Wireshark. Mountain Lion and later do not include X11; you should install X11 from elsewhere, such as @@ -51,7 +52,7 @@ you've added new source files to the Wireshark source. Then run the configure script, and run make to build Wireshark. -If you upgrade the major release of OS X on which you are building +If you upgrade the major release of macOS on which you are building Wireshark, we advise that, before you do any builds after the upgrade, you do, in the build directory: @@ -73,9 +74,9 @@ build 64-bit by default. This means that you will, by default, get a 64-bit version of Wireshark. One consequence of this is that, if you built and installed any required -or optional libraries for Wireshark on an earlier release of OS X, those +or optional libraries for Wireshark on an earlier release of macOS, those are probably 32-bit versions of the libraries, and you will need to -un-install them and rebuild them on your current version of OS X, to get +un-install them and rebuild them on your current version of macOS, to get 64-bit versions. Some required and optional libraries require special attention if you @@ -85,7 +86,7 @@ releases; the macosx-setup.sh script will handle that for you. GLib - the GLib configuration script determines whether the system's libiconv is GNU iconv or not by checking whether it has libiconv_open(), and the compile will fail if that test doesn't correctly indicate -whether libiconv is GNU iconv. In OS X, libiconv is GNU iconv, but the +whether libiconv is GNU iconv. In macOS, libiconv is GNU iconv, but the 64-bit version doesn't have libiconv_open(); a workaround for this is to replace all occurrences of "libiconv_open" with "iconv_open" in the configure script before running the script. The macosx-setup.sh setup @@ -100,7 +101,7 @@ GTK+ with the CUPS printing backend disabled. libgcrypt - the libgcrypt configuration script attempts to determine which flavor of assembler-language routines to use based on the platform type determined by standard autoconf code. That code uses uname to -determine the processor type; however, in OS X, uname always reports +determine the processor type; however, in macOS, uname always reports "i386" as the processor type on Intel machines, even Intel machines with 64-bit processors, so it will attempt to assemble the 32-bit x86 assembler-language routines, which will fail. The workaround for this @@ -108,7 +109,7 @@ is to run the configure script with the --disable-asm argument, so that the assembler-language routines are not used. The macosx-setup.sh will configure libgcrypt with that option. -PortAudio - when compiling on OS X, the configure script for the +PortAudio - when compiling on macOS, the configure script for the pa_stable_v19_20071207 version of PortAudio will cause certain platform-dependent build environment #defines to be set in the Makefile rules, and to cause a universal build to be done; those #defines will be @@ -119,7 +120,7 @@ if a universal build is attempted. The macosx-setup.sh script downloads a newer version, and also suppresses the universal build. GeoIP - Their man pages "helpfully" have an ISO 8859-1 copyright symbol -in the copyright notice, but OS X's default character encoding is UTF-8. +in the copyright notice, but macOS's default character encoding is UTF-8. sed on Mountain Lion barfs at the "illegal character sequence" represented by an ISO 8859-1 copyright symbol, as it's not a valid UTF-8 sequence. The macosx-setup.sh script uses iconv to convert the man page -- cgit v1.2.1