package ocaml-lablgtk2: portability fixes and disable parallel build

This commit is contained in:
Tony Theodore 2012-12-14 19:53:38 +11:00
parent 4be9b86135
commit 55b926f378
2 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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