diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-02-25 09:17:00 -0500 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-02-25 17:28:04 +0000 |
| commit | b6aae8d5c470aa681b70f33cad064dbb7045b3b7 (patch) | |
| tree | 700f0a67042d77d7cc735c1870500e493e05c0c7 | |
| parent | 605d9bb8e23f754aefd0838af57d5bcb749698c1 (diff) | |
Change libsmi url and Lua version in macosx-setup.sh
The libsmi url in macosx-setup.sh was dead, it's now an https site not ftp.
Also we were pulling down Lua 5.1.5 but should be pullsing down 5.2.3.
Lastly, macosx-setup cerates macosx-support-libs directory, which needs
to be ignored.
Change-Id: I79dc833dbc54fda8b237c5ada64f3564ce4f4cde
Reviewed-on: https://code.wireshark.org/review/360
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | macosx-setup.sh | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 7f694d2c9d..35363e6b39 100644 --- a/.gitignore +++ b/.gitignore @@ -201,6 +201,7 @@ ui/qt/config.pri .DS_Store cscope.* tags +macosx-support-libs packaging/macosx/COPYING.txt packaging/macosx/Info.plist packaging/macosx/osx-dmg.sh diff --git a/macosx-setup.sh b/macosx-setup.sh index 293809e839..23b79c7715 100755 --- a/macosx-setup.sh +++ b/macosx-setup.sh @@ -111,9 +111,8 @@ LIBGPG_ERROR_VERSION=1.10 # LIBGCRYPT_VERSION=1.5.0 GNUTLS_VERSION=2.12.19 -# Stay with Lua 5.1 when updating until the code has been changed -# to support 5.2 -LUA_VERSION=5.1.5 +# Default to 5.2 now, unless user overrides it later +LUA_VERSION=5.2.3 PORTAUDIO_VERSION=pa_stable_v19_20111121 # # XXX - they appear to have an unversioned gzipped tarball for the @@ -1181,7 +1180,7 @@ fi if [ "$LIBSMI_VERSION" -a ! -f libsmi-$LIBSMI_VERSION-done ] ; then echo "Downloading, building, and installing libsmi:" - [ -f libsmi-$LIBSMI_VERSION.tar.gz ] || curl -L -O ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/libsmi-$LIBSMI_VERSION.tar.gz || exit 1 + [ -f libsmi-$LIBSMI_VERSION.tar.gz ] || curl -L -O https://www.ibr.cs.tu-bs.de/projects/libsmi/download/libsmi-$LIBSMI_VERSION.tar.gz || exit 1 gzcat libsmi-$LIBSMI_VERSION.tar.gz | tar xf - || exit 1 cd libsmi-$LIBSMI_VERSION CFLAGS="$CFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" LDFLAGS="$LDFLAGS $VERSION_MIN_FLAGS $SDKFLAGS" ./configure || exit 1 |