diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:25 +0200 |
| commit | 92a26320e7b9bbfe781e222a17c518443f63316a (patch) | |
| tree | db6e4fe7706ec8c065d7efe10e93b38ea1b149ba /pkgs/development/ocaml-modules/re2/Makefile.patch | |
| parent | 2006fd4fc5a20c72ab2166b2b4039307f4f54bcb (diff) | |
| parent | 85a05878846b75254f97b8690c18a470cfe982f0 (diff) | |
| download | nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.gz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.bz2 nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.lz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.xz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.zst nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules/re2/Makefile.patch')
| -rw-r--r-- | pkgs/development/ocaml-modules/re2/Makefile.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/development/ocaml-modules/re2/Makefile.patch b/pkgs/development/ocaml-modules/re2/Makefile.patch deleted file mode 100644 index fcb6eefe62b2..000000000000 --- a/pkgs/development/ocaml-modules/re2/Makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./lib/Makefile 2014-11-18 08:16:19.000000000 -0800 -+++ ./lib/Makefile 2015-05-23 14:48:31.000000000 -0700 -@@ -6,12 +6,12 @@ - all: libre2_stubs.a dllre2_stubs.so - - dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2) -- ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++ -+ ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++ - rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive - cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o - - stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h -- g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ -+ $(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ - -I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp - - #stubs.o: %.o: %.cpp %.h |