diff --git a/racket/src/native-libs/README.txt b/racket/src/native-libs/README.txt index ed1731b3e5..cad0672a69 100644 --- a/racket/src/native-libs/README.txt +++ b/racket/src/native-libs/README.txt @@ -77,12 +77,12 @@ may be wrong, in which case you'll need to fix it by hand. For Mac OS (i386 and x86_64 on Intel, ppc on PowerPC): The script assumes that "/Developer/SDKs/MacOSX10.5.sdk" (for 32-bit -builds) and "/Developer/SDKs/MacOSX10.6.sdk" (for 64-bit builds) are +builds) and "/Developer/SDKs/MacOSX10.9.sdk" (for 64-bit builds) are available. You can get the 10.5 SDK out of the ".dmg" for Xcode 3.2.6; mount it (don't run it), open -R "MacOSX10.5.pkg", and right click to run. -Probably you can get the 10.6 SDK in a similar way. +Probably you can get the 10.9 SDK in a similar way. If you wanted to build for 10.4, and if you're using gcc instead of Clang, then note that you'll need gcc-4.0 --- but the Pango version diff --git a/racket/src/native-libs/build.rkt b/racket/src/native-libs/build.rkt index f67d8168f2..bcc5a76b37 100644 --- a/racket/src/native-libs/build.rkt +++ b/racket/src/native-libs/build.rkt @@ -234,7 +234,7 @@ (list "CPPFLAGS" (~a "-m32" sdk-flags)) (list "LDFLAGS" (~a "-m32" sdk-flags)))] [else - (define sdk-flags (sdk 6)) + (define sdk-flags (sdk 9)) (list (list "CPPFLAGS" (~a "-m64" sdk-flags)) (list "LDFLAGS" (~a "-m64" sdk-flags)))])] @@ -460,7 +460,10 @@ [("glib") (config #:depends (append '("libffi" "gettext") (if win? '("libiconv") '())) #:configure (append '("--with-pcre=internal") - (if linux? '("--enable-libmount=no") '())) + (if linux? '("--enable-libmount=no") '()) + (if mac? + '("CFLAGS=-include Kernel/uuid/uuid.h") + '())) #:env (append path-flags ;; Disable Valgrind support, which particularly ;; goes wrong for 64-bit Windows builds. diff --git a/racket/src/native-libs/install.rkt b/racket/src/native-libs/install.rkt index 1185bf9132..9a11827401 100644 --- a/racket/src/native-libs/install.rkt +++ b/racket/src/native-libs/install.rkt @@ -175,7 +175,7 @@ "" #t #f - "1.2" ; version + "1.3" ; version (["libgtk-x11-2.0.0" "GTK+ is released under the GNU Library General Public License (GNU LGPL)."] ["libatk" "ATK is released under the GNU Library General Public License (GNU LGPL)."] "libgdk-x11-2.0.0" @@ -297,14 +297,10 @@ (lambda (o) (displayln pkg-name o) (newline o) - (displayln "This package is distributed under the GNU Lesser General Public" o) - (displayln "License (LGPL). This means that you can link this package into" o) - (displayln "proprietary applications, provided you follow the rules stated in the" o) - (displayln "LGPL. You can also modify this package; if you distribute a modified" o) - (displayln "version, you must distribute it under the terms of the LGPL, which in" o) - (displayln "particular means that you must release the source code for the" o) - (displayln "modified software. See http://www.gnu.org/copyleft/lesser.html" o) - (displayln "for more information." o) + (displayln "This package is distributed under the Apache 2.0 and MIT licenses. The" o) + (displayln "user can choose the license under which they will be using the" o) + (displayln "software. There may be other licenses within the distribution with" o) + (displayln "which the user must also comply." o) (for ([l (in-list lics)]) (newline o) (displayln l o))