summaryrefslogtreecommitdiffstats
path: root/system/unison/01-change-ocamllibdir-for-ocaml-40.patch
diff options
context:
space:
mode:
author Luiz Carlos Ramos <lramos.prof@yahoo.com.br>2014-10-23 04:37:57 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2014-10-23 04:37:57 +0700
commit51d72ba0f58856690e01f62659e7fbb21e517303 (patch)
tree21e199b72625b80be36643709fe42e0db24d943e /system/unison/01-change-ocamllibdir-for-ocaml-40.patch
parent48174e5106ce6ddfae434104f118895fce97135c (diff)
downloadslackbuilds-51d72ba0f58856690e01f62659e7fbb21e517303.tar.gz
slackbuilds-51d72ba0f58856690e01f62659e7fbb21e517303.tar.xz
system/unison: Fix build with OCAML 4.0.
This requires the update of lablgtk which fixed the ld.conf. Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/unison/01-change-ocamllibdir-for-ocaml-40.patch')
-rw-r--r--system/unison/01-change-ocamllibdir-for-ocaml-40.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/system/unison/01-change-ocamllibdir-for-ocaml-40.patch b/system/unison/01-change-ocamllibdir-for-ocaml-40.patch
new file mode 100644
index 0000000000..b200ff87a5
--- /dev/null
+++ b/system/unison/01-change-ocamllibdir-for-ocaml-40.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.OCaml 2011-04-16 17:35:38.000000000 -0300
++++ b/Makefile.OCaml 2014-09-25 13:18:43.239151396 -0300
+@@ -71,8 +71,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1
+ #
+ # This should be set to an appropriate value automatically, depending
+ # on whether the lablgtk library is available
+-LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
+-LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2
++LABLGTKLIB=$(OCAMLLIBDIR)/site-lib/lablgtk
++LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2
+ ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
+ ## at the moment and we don't want to confuse people by building it by default
+ ifeq ($(OSARCH),osx)
+@@ -92,7 +92,7 @@ buildexecutable::
+
+ INCLFLAGS=-I lwt -I ubase -I system
+ CAMLFLAGS+=$(INCLFLAGS)
+-CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM)
++CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM) -I $(LABLGTK2LIB)
+
+ ifeq ($(OSARCH),win32)
+ # Win32 system