Merge pull request #32 from rmcgibbo/disable-shared

rmcgibbo · rmcgibbo · commit 1d745bfe0231 · 2016-02-09T21:30:09.000-08:00
--disable-shared builds in the docker images
diff --git a/docker/build_scripts/build_utils.sh b/docker/build_scripts/build_utils.sh
@@ -31,7 +31,7 @@ function do_python_build {
         local unicode_flags="--enable-unicode=ucs4"
     fi
     # -Wformat added for https://bugs.python.org/issue17547 on Python 2.6
-    CFLAGS="-Wformat" LDFLAGS="-Wl,-rpath /opt/$py_ver/lib" ./configure --prefix=/opt/$py_ver --enable-shared $unicode_flags > /dev/null
+    CFLAGS="-Wformat" LDFLAGS="-Wl,-rpath /opt/$py_ver/lib" ./configure --prefix=/opt/$py_ver --disable-shared $unicode_flags > /dev/null
     make -j2 > /dev/null
     make install > /dev/null
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function do_python_build {`
`31`	`31`	`local unicode_flags="--enable-unicode=ucs4"`
`32`	`32`	`fi`
`33`	`33`	`# -Wformat added for https://bugs.python.org/issue17547 on Python 2.6`
`34`		`- CFLAGS="-Wformat" LDFLAGS="-Wl,-rpath /opt/$py_ver/lib" ./configure --prefix=/opt/$py_ver --enable-shared $unicode_flags > /dev/null`
	`34`	`+ CFLAGS="-Wformat" LDFLAGS="-Wl,-rpath /opt/$py_ver/lib" ./configure --prefix=/opt/$py_ver --disable-shared $unicode_flags > /dev/null`
`35`	`35`	`make -j2 > /dev/null`
`36`	`36`	`make install > /dev/null`
`37`	`37`	`}`