diff options
| author | Tony Theodore <tonyt@logyst.com> | 2012-12-14 08:53:38 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2012-12-14 10:33:08 (GMT) |
| commit | 55b926f378eebcb15df90babf29fa0716861775e (patch) | |
| tree | b46b32e8e60ec0930b4c7b662a4da94307dc2640 /src | |
| parent | 4be9b8613568894e4ba3f2bba7fdae19b66d2fea (diff) | |
| download | mxe-55b926f378eebcb15df90babf29fa0716861775e.zip mxe-55b926f378eebcb15df90babf29fa0716861775e.tar.gz mxe-55b926f378eebcb15df90babf29fa0716861775e.tar.bz2 | |
package ocaml-lablgtk2: portability fixes and disable parallel build
Diffstat (limited to 'src')
| -rw-r--r-- | src/ocaml-lablgtk2-1-fixes.patch | 6 | ||||
| -rw-r--r-- | src/ocaml-lablgtk2.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ocaml-lablgtk2-1-fixes.patch b/src/ocaml-lablgtk2-1-fixes.patch index a99eed5..2bbcd12 100644 --- a/src/ocaml-lablgtk2-1-fixes.patch +++ b/src/ocaml-lablgtk2-1-fixes.patch @@ -710,7 +710,7 @@ index fda935e..54ae4b4 100755 - then \ - echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \ - fi` -+ ocamlfind install lablgtk2 ../META `find -type f` ++ ocamlfind install lablgtk2 ../META `find . -type f` $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%) @if test -f lablgtk.cmxa; \ then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi @@ -755,9 +755,9 @@ index 54ae4b4..aa09593 100755 # Install using ocamlfind findlib-install: mkdir -p "$(BINDIR)" -- ocamlfind install lablgtk2 ../META `find -type f` +- ocamlfind install lablgtk2 ../META `find . -type f` - $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%) -+ $(OCAMLFIND) install lablgtk2 ../META `find -type f` ++ $(OCAMLFIND) install lablgtk2 ../META `find . -type f` + $(RANLIB) $(CLIBS:%="`$(OCAMLFIND) query lablgtk2 | tr -d '\r'`"/%) @if test -f lablgtk.cmxa; \ - then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi diff --git a/src/ocaml-lablgtk2.mk b/src/ocaml-lablgtk2.mk index 9cc7785..1129365 100644 --- a/src/ocaml-lablgtk2.mk +++ b/src/ocaml-lablgtk2.mk @@ -17,12 +17,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi + cd '$(1)' && autoreconf -fi -I'$(PREFIX)/$(TARGET)/share/aclocal' cd '$(1)' && ./configure \ --host $(TARGET) \ --build "`config.guess`" \ --prefix $(PREFIX)/$(TARGET) - $(MAKE) -C '$(1)/src' -j '$(JOBS)' lablgtkopt + $(MAKE) -C '$(1)/src' -j 1 lablgtkopt $(MAKE) -C '$(1)/src' -j 1 install # test |