Commit 4f7ff781 authored by Ned Deily's avatar Ned Deily

#10843: Update third-party library versions used in OS X 32-bit

        installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4
        (with FTS3/FTS4 and RTREE enabled), and ncursesw 5.5 (wide-char
        support enabled).
parent 916f2a86
...@@ -144,9 +144,9 @@ def library_recipes(): ...@@ -144,9 +144,9 @@ def library_recipes():
if DEPTARGET < '10.5': if DEPTARGET < '10.5':
result.extend([ result.extend([
dict( dict(
name="Bzip2 1.0.5", name="Bzip2 1.0.6",
url="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz", url="http://bzip.org/1.0.6/bzip2-1.0.6.tar.gz",
checksum='3c15a0c8d1d3ee1c46a1634d00617b1a', checksum='00b516f4704d4a7cb50a1d97e6e8e15b',
configure=None, configure=None,
install='make install CC=%s PREFIX=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%( install='make install CC=%s PREFIX=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
CC, CC,
...@@ -169,29 +169,33 @@ def library_recipes(): ...@@ -169,29 +169,33 @@ def library_recipes():
), ),
dict( dict(
# Note that GNU readline is GPL'd software # Note that GNU readline is GPL'd software
name="GNU Readline 5.1.4", name="GNU Readline 6.1.2",
url="http://ftp.gnu.org/pub/gnu/readline/readline-5.1.tar.gz" , url="http://ftp.gnu.org/pub/gnu/readline/readline-6.1.tar.gz" ,
checksum='7ee5a692db88b30ca48927a13fd60e46', checksum='fc2f7e714fe792db1ce6ddc4c9fb4ef3',
patchlevel='0', patchlevel='0',
patches=[ patches=[
# The readline maintainers don't do actual micro releases, but # The readline maintainers don't do actual micro releases, but
# just ship a set of patches. # just ship a set of patches.
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-001', 'http://ftp.gnu.org/pub/gnu/readline/readline-6.1-patches/readline61-001',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-002', 'http://ftp.gnu.org/pub/gnu/readline/readline-6.1-patches/readline61-002',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-003',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-004',
] ]
), ),
dict( dict(
name="SQLite 3.6.11", name="SQLite 3.7.4",
url="http://www.sqlite.org/sqlite-3.6.11.tar.gz", url="http://www.sqlite.org/sqlite-autoconf-3070400.tar.gz",
checksum='7ebb099696ab76cc6ff65dd496d17858', checksum='8f0c690bfb33c3cbbc2471c3d9ba0158',
configure_env=('CFLAGS="-Os'
' -DSQLITE_ENABLE_FTS3'
' -DSQLITE_ENABLE_FTS3_PARENTHESIS'
' -DSQLITE_ENABLE_RTREE'
' -DSQLITE_TCL=0'
'"'),
configure_pre=[ configure_pre=[
'--enable-threadsafe', '--enable-threadsafe',
'--enable-tempstore',
'--enable-shared=no', '--enable-shared=no',
'--enable-static=yes', '--enable-static=yes',
'--disable-tcl', '--disable-readline',
'--disable-dependency-tracking',
] ]
), ),
dict( dict(
...@@ -199,6 +203,7 @@ def library_recipes(): ...@@ -199,6 +203,7 @@ def library_recipes():
url="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz", url="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz",
checksum='e73c1ac10b4bfc46db43b2ddfd6244ef', checksum='e73c1ac10b4bfc46db43b2ddfd6244ef',
configure_pre=[ configure_pre=[
"--enable-widec",
"--without-cxx", "--without-cxx",
"--without-ada", "--without-ada",
"--without-progs", "--without-progs",
...@@ -225,6 +230,7 @@ def library_recipes(): ...@@ -225,6 +230,7 @@ def library_recipes():
), ),
]) ])
if not PYTHON_3:
result.extend([ result.extend([
dict( dict(
name="Sleepycat DB 4.7.25", name="Sleepycat DB 4.7.25",
...@@ -697,6 +703,9 @@ def buildRecipe(recipe, basedir, archList): ...@@ -697,6 +703,9 @@ def buildRecipe(recipe, basedir, archList):
configure_args.insert(0, configure) configure_args.insert(0, configure)
configure_args = [ shellQuote(a) for a in configure_args ] configure_args = [ shellQuote(a) for a in configure_args ]
if 'configure_env' in recipe:
configure_args.insert(0, recipe['configure_env'])
print "Running configure for %s"%(name,) print "Running configure for %s"%(name,)
runCommand(' '.join(configure_args) + ' 2>&1') runCommand(' '.join(configure_args) + ' 2>&1')
...@@ -752,9 +761,9 @@ def buildPython(): ...@@ -752,9 +761,9 @@ def buildPython():
shutil.rmtree(buildDir) shutil.rmtree(buildDir)
if os.path.exists(rootDir): if os.path.exists(rootDir):
shutil.rmtree(rootDir) shutil.rmtree(rootDir)
os.mkdir(buildDir) os.makedirs(buildDir)
os.mkdir(rootDir) os.makedirs(rootDir)
os.mkdir(os.path.join(rootDir, 'empty-dir')) os.makedirs(os.path.join(rootDir, 'empty-dir'))
curdir = os.getcwd() curdir = os.getcwd()
os.chdir(buildDir) os.chdir(buildDir)
......
...@@ -206,6 +206,11 @@ C-API ...@@ -206,6 +206,11 @@ C-API
Build Build
----- -----
- Issue #10843: Update third-party library versions used in OS X
32-bit installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4
(with FTS3/FTS4 and RTREE enabled), and ncursesw 5.5 (wide-char
support enabled).
- Issue #10820: Fix OS X framework installs to support version-specific - Issue #10820: Fix OS X framework installs to support version-specific
scripts (#10679). scripts (#10679).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment