diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
| commit | c46eae0f3572fbe7af42e5d40648b7b4a1d1317b (patch) | |
| tree | 84e748e6477734c4826b4d6b34152b1958e5627a /pkgs/servers/sql/proxysql/makefiles.patch | |
| parent | 9297b620bb86624e6cf4b6ae54fc4ae1da98bb83 (diff) | |
| parent | e8ad54f562b4621c7c080b4a3ddbafe4735bcb86 (diff) | |
| download | nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.gz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.bz2 nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.lz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.xz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.zst nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers/sql/proxysql/makefiles.patch')
| -rw-r--r-- | pkgs/servers/sql/proxysql/makefiles.patch | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index 04e469ae1352..6a6d003a6088 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -143,17 +143,6 @@ index 710e070b..fd1352f6 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -321,10 +289,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a - - - re2/re2/obj/libre2.a: -- cd re2 && rm -rf re2-*/ || true -- cd re2 && tar -zxf re2-*.tar.gz --# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile --# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch - cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch - ifeq ($(UNAME_S),Darwin) - cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile @@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a |