diff --git a/Dockerfile b/Dockerfile index b8aa08f9..681ca297 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,12 @@ RUN apt-get update && \ ruby \ wget \ ruby-dev && \ - wget http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.6.tar.gz && \ - sha512sum onig-5.9.6.tar.gz | grep 4a181ea6f0e1a018bbaf6c87e666dfffd1ef4b8f5dcead07fa0b6564a76174e7e01854173924668433ae74c455dbced6a0e1b43e9066f0499b4a57e855e1a2b2 && \ + wget https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz -O onig-5.9.6.tar.gz && \ + sha512sum onig-5.9.6.tar.gz | grep e58f14849e2b692c79d4a36ca632ee25b4b77eaa19a1298d6ec65e2577dd4dc47eaed3e8ab9a34269d53cee59e5bdf2ab3a43eca2c70bca2667ec5415e2408fb && \ tar zxvf onig-5.9.6.tar.gz && \ - (cd onig-5.9.6 && \ + (cd oniguruma-5.9.6 && \ + touch NEWS ChangeLog && \ + autoreconf -i && \ ./configure --prefix=/usr/local && \ make && \ make install ) && \ @@ -32,7 +34,7 @@ RUN apt-get update && \ make check && \ make install && \ make distclean ) && \ - (cd onig-5.9.6 && \ + (cd oniguruma-5.9.6 && \ make uninstall ) && \ apt-get purge -y \ build-essential \ @@ -44,7 +46,7 @@ RUN apt-get update && \ ruby \ ruby-dev && \ apt-get autoremove -y && \ - rm -rf onig-5.9.6 && \ + rm -rf oniguruma-5.9.6 && \ rm -rf /var/lib/apt/lists/* /var/lib/gems ENTRYPOINT ["/usr/local/bin/jq"] diff --git a/compile-ios.sh b/compile-ios.sh index a2965c51..5d71dc35 100755 --- a/compile-ios.sh +++ b/compile-ios.sh @@ -12,8 +12,8 @@ NJOBS="-j`sysctl -n hw.ncpu || echo 1`" # Get oniguruma rm -rf $PWD/build/ios onig-5.9.5 echo "Downloading oniguruma 5.9.5" -curl http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.5.tar.gz | tar xz -cd onig-5.9.5 +curl -L https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz | tar xz +cd oniguruma-5.9.5 # So, we need to remake the configure scripts so that the arm64 architecture # exists in config.sub. In order to keep autoreconf from failing, create