aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-setup.sh
AgeCommit message (Collapse)AuthorFilesLines
2014-02-25Change libsmi url and Lua version in macosx-setup.shHadriel Kaplan1-4/+3
The libsmi url in macosx-setup.sh was dead, it's now an https site not ftp. Also we were pulling down Lua 5.1.5 but should be pullsing down 5.2.3. Lastly, macosx-setup cerates macosx-support-libs directory, which needs to be ignored. Change-Id: I79dc833dbc54fda8b237c5ada64f3564ce4f4cde Reviewed-on: https://code.wireshark.org/review/360 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-07Qt 5.2.1 - now with added native OS X toolbar!Guy Harris1-2/+1
To quote https://qt.gitorious.org/qt/qtbase/source/62feb088a30045e7fbd2a3074c64d18035b84a97:dist/changes-5.2.1 "**************************************************************************** * Platform Specific Changes * **************************************************************************** ... OS X ---- - [QTBUG-34411] Implemented QMainWindow::setUnifiedTitleAndToolBarOnMac." Also get rid of a commented-out setting of QT_VERSION to 5.1.1 while we're at it. Change-Id: I957fdfecb70954723cfd3160f40758f722dc56c8 Reviewed-on: https://code.wireshark.org/review/136 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2013-12-23From Ville Skyttä: Spelling FixesBill Meier1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591 svn path=/trunk/; revision=54387
2013-10-29Support building and installing both Qt and GTK+.Guy Harris1-101/+157
When forcing CFLAGS and CXXFLAGS, add -g and -O2; newer versions of autoconf do so for GCC-compatible compilers (clang is GCC-compatible in that sense), but only do so when those variables aren't forced. svn path=/trunk/; revision=52939
2013-10-28Add c-ares. Untested, but it *should* work.Gerald Combs1-0/+26
svn path=/trunk/; revision=52936
2013-10-23Pass -sdk, not that it actually *works*.Guy Harris1-1/+1
svn path=/trunk/; revision=52782
2013-10-23Default to GTK+ 3, not Qt, for now.Guy Harris1-1/+1
svn path=/trunk/; revision=52777
2013-10-23First cut at having this handle Qt. Adds a TOOLKIT variable that youGuy Harris1-240/+281
set to "qt", "gtk2", or "gtk3". Work done on a machine with the command-line build tools, but not Full Frontal Xcode, installed, so it couldn't build Qt, so it hasn't been tested. It *has* been fixed to complain in that case, rather than letting the Qt build fail with a somewhat less useful message talking about Xcode licensing. svn path=/trunk/; revision=52776
2013-10-22Add information about building Qt.Gerald Combs1-0/+23
svn path=/trunk/; revision=52769
2013-09-14Add copyright (Michael, Joerg and Guy) and license (GPL2+)Jörg Mayer1-3/+18
svn path=/trunk/; revision=52035
2013-08-23To handle the hypothetical case of an OS X release offering a choice ofGuy Harris1-143/+155
installing command-line developer tools with no SDKs but with a standard UN*Xy /usr/include or of installing Full Frontal Xcode, check to see whether we *have* any SDKs and, if not, don't try to find the appropriate SDK for the release and use it. svn path=/trunk/; revision=51499
2013-08-23Put back missing space between --disable-cups and --without-libtiff. Guy Harris1-1/+1
Should fix bug 9073. svn path=/trunk/; revision=51498
2013-07-31Put the GTK2 vs. GTK3 and autofoo vs. CMake options at the beginning,Guy Harris1-13/+14
before either of them are tested. Put the code to get the OS major version number just before we first use it. Fix indentation. svn path=/trunk/; revision=51054
2013-07-31If no target OS version was specified, default to the major version onGuy Harris1-150/+150
which we're running, so we *always* build against an SDK. (The "10" in "10.x.y" is not *really* part of the version number, so the "major version" includes the "10" and the major version number following it.) svn path=/trunk/; revision=51049
2013-07-24Change default gtk build from version 2 to version 3 forJörg Mayer1-1/+1
autotool, cmake and nmake. No idea what it takes to change the visual project stuff svn path=/trunk/; revision=50863
2013-07-12When building for 10.6, force the build to use libpng12.Guy Harris1-1/+16
svn path=/trunk/; revision=50538
2013-07-09Fix uninstallation of Cairo - uninstall, don't install!Guy Harris1-1/+1
svn path=/trunk/; revision=50461
2013-07-09Fix missing $ before variable name.Guy Harris1-4/+5
Look at the lua-*-done file to get the version number of the version of Lua we installed. svn path=/trunk/; revision=50460
2013-07-09Fix the uninstall procedure for Lua - the man pages are installed intoGuy Harris1-1/+1
/usr/local/man/man1, not /usr/local/man. svn path=/trunk/; revision=50458
2013-07-09Use older versions of some libraries, and build 32-bit, when buildingGuy Harris1-179/+261
for Leopard. Fix some issues that came up with the older versions. We don't support building *on* Leopard - we check for that up front - so eliminate some code to handle that. When uninstalling, check for the installed version by looking at the name of the -done file, so we don't have to trust the _VERSION settings. We don't appear to need to build our own versions of libpng or pixman when building *on* Snow Leopard *for* Leopard. The libffi configure patch for GLib appears not to be necessary - perhaps building and installing pkg-config *before* building GLib makes it no longer necessary - and it doesn't work with older versions of GLib, so don't apply it. svn path=/trunk/; revision=50456
2013-07-08Download, build, and install pkg-config before GLib, courtesy of theGuy Harris1-23/+26
"use your internal version of GLib" flag for pkg-config's configure script. This simplifies things a little bit. Fix an indentation error while we're at it. svn path=/trunk/; revision=50453
2013-07-06We need Cairo if we're building on 10.5 *or* if we're building *for*Guy Harris1-7/+31
10.5 on a later OS. Fix the download path for libpng, and update the version to the currently-available version. svn path=/trunk/; revision=50425
2013-07-06Use consistent 4-space no-tab indentation.Guy Harris1-265/+265
svn path=/trunk/; revision=50421
2013-07-06Don't install the GNU autotools on Snow Leopard and earlier; they wereGuy Harris1-7/+12
shipped with those versions of OS X, and I had some problems with the newer versions on Snow Leopard (the Makefile was doing weird stuff that caused build failures in wsutil, moving .Tlo files to .Plo files; I didn't investigate futher). svn path=/trunk/; revision=50418
2013-07-06Add a "-t <target>" flag to set the deployment target OS version; thatGuy Harris1-23/+96
causes a -mmacosx-version-min flag to be used, to keep the compiler and linker from using features not supported by that OS version, and causes the support libraries to be built against the SDK for that OS version, so they don't request library versions later than the one shipped with that version. svn path=/trunk/; revision=50402
2013-07-05Get rid of extra blank line.Guy Harris1-1/+0
svn path=/trunk/; revision=50391
2013-07-05Add a -u flag to uninstall the support tools and libraries.Guy Harris1-80/+335
svn path=/trunk/; revision=50390
2013-07-05LIBFFI_CFLAGS and LIBFFI_LIBS are defined only to suppress the attemptGuy Harris1-5/+3
to run pkg-config to get their values; they should be set equal to the values that would be returned by pkg-config for libffi with the --cflags and --libs arguments, respectively. They should *NOT* include the values of CFLAGS and LDFLAGS supplied in the environment; those should be handled separately. svn path=/trunk/; revision=50389
2013-07-04Use xcrun --show-sdk-path to find out where the system include files areGuy Harris1-6/+6
hidden, rather than a "compile a program" hack. svn path=/trunk/; revision=50383
2013-06-27Actually, that's not a clang bug; my test case had a typo. It's still aGuy Harris1-2/+7
case where clang is complaining about code that's OK, it's just not OK in a way that lets clang determine that it is. svn path=/trunk/; revision=50196
2013-06-27Don't assume the system include files are under /usr/include; trick theGuy Harris1-3/+18
compiler into saying where they are, and use that. Patch a bug in PortAudio pa_stable_v19_20111121 that clang found. svn path=/trunk/; revision=50186
2013-06-26Another clang issue to work around:Guy Harris1-1/+6
libgcrypt expects gnu89-style semantics for "inline"; GCC defaults to gnu89, but clang defaults to gnu99. svn path=/trunk/; revision=50175
2013-06-26Suppress -Wformat-nonliteral when building GLib, to avoid a clang bugGuy Harris1-2/+5
where it issues bogus warnings. svn path=/trunk/; revision=50174
2013-06-19From Dirk J via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8821Evan Huus1-3/+5
if no make options are given to the macosx-setup.sh script by the user, the script sets the number of parallel make jobs to 1.5x CPU cores. Bonus enhancement: print the "export PKG_CONFIG_PATH" information in autogen.sh on OsX, so people don't have to remember it. svn path=/trunk/; revision=50070
2013-06-17From Dirk Jagdmann via bug 7525: macosx-setup.sh improvements.Gerald Combs1-191/+273
svn path=/trunk/; revision=49995
2013-05-13Allow for building 32-bit versions of the libraries used by wireshark.Michael Tüxen1-6/+12
This allows to build a 32-bit version of wireshark. svn path=/trunk/; revision=49263
2013-03-26Use more recent versions of various libs.Michael Tüxen1-10/+10
svn path=/trunk/; revision=48573
2013-02-02Current version of pkg-config is 0.27.Guy Harris1-6/+2
Update some comments. svn path=/trunk/; revision=47435
2013-01-222.24.5 is not 2.24.25. HTH.Guy Harris1-1/+1
svn path=/trunk/; revision=47207
2013-01-22Rename MACOSX_VERSION to DARWIN_MAJOR_VERSION to reflect what itGuy Harris1-18/+162
actually is (it's not an OS X version number, e.g. 10.7 for Leopard, it's a Darwin version number, e.g. 9 for Leopard). Add comments before checks to indicate what we're checking for. Put in a big long comment giving details about the issues I ran into when trying to make this work on Leopard. Fail if you try to run this on anything before Snow Leopard - note that I said "trying" in the previous comment, and, yes, it was a very trying experience.... Bump the libpng version - 1.5.12 isn't available any more. Add some comments explaining why the code for Leopard was downloading and installing libpng and libpixman. Add some code to handle packages where older versions weren't compressed with xz and newer versions were. Add a hack to avoid finding the version of libpng that comes with X11 when trying to build Cairo on Leopard. svn path=/trunk/; revision=47206
2012-09-08Fix some issues that showed up when building on Mountain Lion, andGuy Harris1-1/+28
update the README.macos file. svn path=/trunk/; revision=44810
2012-08-29At least with the version of Xcode that comes with Leopard,Guy Harris1-1/+13
/usr/include/ffi/fficonfig.h doesn't define MACOSX, which causes the build of GLib to fail. If we don't find "#define.*MACOSX" in /usr/include/ffi/fficonfig.h, explictly define it. svn path=/trunk/; revision=44693
2012-08-13Expand the "why we need to build Cairo in some cases" comment, and putGuy Harris1-8/+10
it before the checks for whether to build Cairo. svn path=/trunk/; revision=44471
2012-08-13Build cairo on Leopard too.Michael Tüxen1-2/+4
svn path=/trunk/; revision=44468
2012-08-13Update libpng version.Michael Tüxen1-1/+1
svn path=/trunk/; revision=44467
2012-08-12Fix an apparently out-of-date comment.Guy Harris1-2/+0
svn path=/trunk/; revision=44458
2012-08-12Patching configure.in files and regenerating them is a bag of hurt, asGuy Harris1-18/+10
it can depend on, among other things, having the the relevant .pc files in one of the directories in PKG_CONFIG_PATH. Instead, just don't request a fat build of PortAudio. svn path=/trunk/; revision=44457
2012-08-11Add some patches to make PortAudio build with the macosx-setup.shGuy Harris1-0/+22
script. svn path=/trunk/; revision=44446
2012-06-19Add a comment to prevent acidentally bumping lua version to 5.2 again.Jörg Mayer1-0/+2
svn path=/trunk/; revision=43366
2012-06-19Downgrade Lua from 5.2.1 to 5.1.5: Lua 5.2 is API incompatibleJörg Mayer1-1/+1
with Lua 5.1. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7373 svn path=/trunk/; revision=43358
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 12:54:18 +0000