proxysql: use vendored re2

follow-up to 33614fda223ffee95787f9babeae1d6904d93a08

ajs124 85fa2ee2 76c3be5e

-13
-2
pkgs/servers/sql/proxysql/default.nix
··· 26 26 , perl 27 27 , python3 28 28 , prometheus-cpp 29 - , re2 30 29 , zlib 31 30 , texinfo 32 31 }: ··· 117 116 { f = "lz4"; p = lz4; } 118 117 { f = "pcre"; p = pcre; } 119 118 { f = "prometheus-cpp"; p = prometheus-cpp; } 120 - { f = "re2"; p = re2; } 121 119 ] 122 120 )} 123 121
-11
pkgs/servers/sql/proxysql/makefiles.patch
··· 143 143 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch 144 144 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch 145 145 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch 146 - @@ -321,10 +289,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a 147 - 148 - 149 - re2/re2/obj/libre2.a: 150 - - cd re2 && rm -rf re2-*/ || true 151 - - cd re2 && tar -zxf re2-*.tar.gz 152 - -# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile 153 - -# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch 154 - cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch 155 - ifeq ($(UNAME_S),Darwin) 156 - cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile 157 146 @@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a 158 147 159 148