|
From: <sv...@va...> - 2010-06-07 12:40:27
|
Author: sewardj Date: 2010-06-07 13:32:10 +0100 (Mon, 07 Jun 2010) New Revision: 11155 Log: Build system changes for MacOSX 10.6. (Part of a patch to add support for MacOSX 10.6, by Greg Parker, updated by Alexander Potapenko. See https://bugs.kde.org/show_bug.cgi?id=205241#c27) Modified: branches/MACOSX106/Makefile.am branches/MACOSX106/configure.in branches/MACOSX106/coregrind/Makefile.am Modified: branches/MACOSX106/Makefile.am =================================================================== --- branches/MACOSX106/Makefile.am 2010-06-07 11:32:31 UTC (rev 11154) +++ branches/MACOSX106/Makefile.am 2010-06-07 12:32:10 UTC (rev 11155) @@ -48,7 +48,8 @@ glibc-2.2-LinuxThreads-helgrind.supp \ glibc-2.X-drd.supp \ exp-ptrcheck.supp \ - darwin9.supp darwin9-drd.supp + darwin9.supp darwin9-drd.supp \ + darwin10.supp darwin10-drd.supp DEFAULT_SUPP_FILES = @DEFAULT_SUPP@ # We include all the base .supp files in the distribution, but not Modified: branches/MACOSX106/configure.in =================================================================== --- branches/MACOSX106/configure.in 2010-06-07 11:32:31 UTC (rev 11154) +++ branches/MACOSX106/configure.in 2010-06-07 12:32:10 UTC (rev 11155) @@ -259,6 +259,9 @@ *darwin*) AC_MSG_RESULT([ok (${host_os})]) VGCONF_OS="darwin" + AC_DEFINE([DARWIN_10_5], 100500, [DARWIN_VERS value for Mac OS X 10.5]) + AC_DEFINE([DARWIN_10_6], 100600, [DARWIN_VERS value for Mac OS X 10.6]) + AC_DEFINE([DARWIN_10_7], 100700, [DARWIN_VERS value for Mac OS X 10.7]) AC_MSG_CHECKING([for the kernel version]) kernel=`uname -r` @@ -266,21 +269,27 @@ # Nb: for Darwin we set DEFAULT_SUPP here. That's because Darwin # has only one relevant version, the OS version. The `uname` check # is a good way to get that version (i.e. "Darwin 9.6.0" is Mac OS - # X 10.5.6, and "Darwin 10.x" would presumably be Mac OS X 10.6.x - # Snow Leopard and darwin10.supp), and we don't know of an macros - # similar to __GLIBC__ to get that info. + # X 10.5.6, and "Darwin 10.x" is Mac OS X 10.6.x Snow Leopard), + # and we don't know of an macros similar to __GLIBC__ to get that info. # # XXX: `uname -r` won't do the right thing for cross-compiles, but # that's not a problem yet. case "${kernel}" in 9.*) AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) + AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" ;; + 10.*) + AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) + AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) + DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" + ;; *) AC_MSG_RESULT([unsupported (${kernel})]) - AC_MSG_ERROR([Valgrind works on Darwin 9.x (Mac OS X 10.5)]) + AC_MSG_ERROR([Valgrind works on Darwin 9.x and 10.x (Mac OS X 10.5 and 10.6)]) ;; esac ;; Modified: branches/MACOSX106/coregrind/Makefile.am =================================================================== --- branches/MACOSX106/coregrind/Makefile.am 2010-06-07 11:32:31 UTC (rev 11154) +++ branches/MACOSX106/coregrind/Makefile.am 2010-06-07 12:32:10 UTC (rev 11155) @@ -115,11 +115,13 @@ /usr/include/mach/vm_map.defs endif -# Be careful w.r.t. parellel builds. See section 27.9 of the automake info +# Be careful w.r.t. parallel builds. See section 27.9 of the automake info # page, "Handling Tools that Produce many Outputs". -$(mach_user_srcs): $(mach_defs) +$(abs_builddir)/m_mach: + mkdir -p $@ +$(mach_user_srcs): $(mach_defs) $(abs_builddir)/m_mach (cd m_mach && mig $(mach_defs)) -$(mach_hdrs): $(mach_defs) $(mach_user_srcs) +$(mach_hdrs): $(mach_defs) $(mach_user_srcs) $(abs_builddir)/m_mach (cd m_mach && mig $(mach_defs)) #---------------------------------------------------------------------------- |