Wireshark-commits: [Wireshark-commits] rev 50467: / /trunk-1.10/macosx-support-lib-patches/: glib-g
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50467
User: guy
Date: 2013/07/09 10:43 AM
Log:
Copy over revisions from trunk:
------------------------------------------------------------------------
r50461 | guy | 2013-07-09 02:54:19 -0700 (Tue, 09 Jul 2013) | 2 lines
Fix uninstallation of Cairo - uninstall, don't install!
------------------------------------------------------------------------
r50460 | guy | 2013-07-09 02:31:45 -0700 (Tue, 09 Jul 2013) | 5 lines
Fix missing $ before variable name.
Look at the lua-*-done file to get the version number of the version of
Lua we installed.
------------------------------------------------------------------------
r50459 | guy | 2013-07-09 01:48:07 -0700 (Tue, 09 Jul 2013) | 5 lines
CPPFLAGS contains the flags for the C preprocessor; CXXFLAGS contains
the flags for the C++ compiler.
If we're building for 10.5, force a 32-bit build.
------------------------------------------------------------------------
r50458 | guy | 2013-07-09 01:47:05 -0700 (Tue, 09 Jul 2013) | 3 lines
Fix the uninstall procedure for Lua - the man pages are installed into
/usr/local/man/man1, not /usr/local/man.
------------------------------------------------------------------------
r50456 | guy | 2013-07-08 21:41:34 -0700 (Mon, 08 Jul 2013) | 17 lines
Use older versions of some libraries, and build 32-bit, when building
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.
------------------------------------------------------------------------
r50453 | guy | 2013-07-08 15:56:55 -0700 (Mon, 08 Jul 2013) | 6 lines
Download, build, and install pkg-config before GLib, courtesy of the
"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.
Directory: /trunk-1.10/macosx-support-lib-patches/
Changes Path Action
+13 -0 glib-gconvert.c.patch Added
Directory: /trunk-1.10/
Changes Path Action
+1 -0 Makefile.am Modified
+16 -1 configure.ac Modified
+286 -200 macosx-setup.sh Modified
