diff options
| -rw-r--r-- | src/ocaml-cairo-test.ml | 2 | ||||
| -rw-r--r-- | src/ocaml-cairo.mk | 44 | ||||
| -rw-r--r-- | src/ocaml-camlimages.mk | 42 | ||||
| -rw-r--r-- | src/ocaml-findlib.mk | 80 | ||||
| -rw-r--r-- | src/ocaml-lablgl.mk | 78 |
5 files changed, 123 insertions, 123 deletions
diff --git a/src/ocaml-cairo-test.ml b/src/ocaml-cairo-test.ml index 19fdb20..e26e32f 100644 --- a/src/ocaml-cairo-test.ml +++ b/src/ocaml-cairo-test.ml @@ -22,7 +22,7 @@ let () = ~title:"transparency" ~position:`CENTER () in ignore(window#event#connect#after#expose - (on_expose_event window)); + (on_expose_event window)); ignore(window#connect#destroy GMain.quit); window#misc#set_app_paintable true; window#set_default_size ~width:590 ~height:80; diff --git a/src/ocaml-cairo.mk b/src/ocaml-cairo.mk index 01f0b42..e37bc2f 100644 --- a/src/ocaml-cairo.mk +++ b/src/ocaml-cairo.mk @@ -1,33 +1,33 @@ # This file is part of MXE. # See index.html for further information. -PKG := ocaml-cairo -$(PKG)_IGNORE := +PKG := ocaml-cairo +$(PKG)_IGNORE := $(PKG)_CHECKSUM := d5835620bea005d5d5239f889b10a922fda2520b -$(PKG)_SUBDIR := cairo-ocaml-$($(PKG)_VERSION) -$(PKG)_FILE := cairo-ocaml_$($(PKG)_VERSION).orig.tar.gz +$(PKG)_SUBDIR := cairo-ocaml-$($(PKG)_VERSION) +$(PKG)_FILE := cairo-ocaml_$($(PKG)_VERSION).orig.tar.gz # URL http://cgit.freedesktop.org/cairo-ocaml/snapshot/$($(PKG)_FILE) gives a different checksum at each download, so I use the debian version. -$(PKG)_URL := http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml/$($(PKG)_FILE) -$(PKG)_DEPS := ocaml-core ocaml-findlib ocaml-lablgtk2 +$(PKG)_URL := http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml/$($(PKG)_FILE) +$(PKG)_DEPS := ocaml-core ocaml-findlib ocaml-lablgtk2 define $(PKG)_UPDATE - wget -q -O- 'http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml' | \ - $(SED) -n 's,.*cairo-ocaml-\([0-9][^>]*\)\.orig\.tar.*,\1,ip' | \ - head -1 + wget -q -O- 'http://ftp.de.debian.org/debian/pool/main/c/cairo-ocaml' | \ + $(SED) -n 's,.*cairo-ocaml-\([0-9][^>]*\)\.orig\.tar.*,\1,ip' | \ + head -1 endef define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi -I support - cd '$(1)' && ./configure \ - --host $(TARGET) \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install - cd '$(1)' && cp -f META $(PREFIX)/$(TARGET)/lib/ocaml/cairo/ - # test - cp '$(2).ml' '$(1)/test.ml' - cd '$(1)' && '$(TARGET)-ocamlfind' opt -linkpkg \ - -package lablgtk2.auto-init \ - -package cairo.lablgtk2 \ - test.ml + cd '$(1)' && autoreconf -fi -I support + cd '$(1)' && ./configure \ + --host $(TARGET) \ + --build="`config.guess`" \ + --prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install + cd '$(1)' && cp -f META $(PREFIX)/$(TARGET)/lib/ocaml/cairo/ + # test + cp '$(2).ml' '$(1)/test.ml' + cd '$(1)' && '$(TARGET)-ocamlfind' opt -linkpkg \ + -package lablgtk2.auto-init \ + -package cairo.lablgtk2 \ + test.ml endef diff --git a/src/ocaml-camlimages.mk b/src/ocaml-camlimages.mk index 14b205e..054238b 100644 --- a/src/ocaml-camlimages.mk +++ b/src/ocaml-camlimages.mk @@ -1,34 +1,34 @@ # This file is part of MXE. # See index.html for further information. -PKG := ocaml-camlimages -$(PKG)_IGNORE := +PKG := ocaml-camlimages +$(PKG)_IGNORE := $(PKG)_CHECKSUM := 3ff44142386970003d3cff1446ad351b36759a8e -$(PKG)_SUBDIR := camlspotter-camlimages-c803efa9d5d3 -$(PKG)_FILE := v$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://bitbucket.org/camlspotter/camlimages/get/v$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := ocaml-findlib freetype libpng giflib tiff ocaml-lablgtk2 +$(PKG)_SUBDIR := camlspotter-camlimages-c803efa9d5d3 +$(PKG)_FILE := v$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://bitbucket.org/camlspotter/camlimages/get/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := ocaml-findlib freetype libpng giflib tiff ocaml-lablgtk2 define $(PKG)_UPDATE - wget -q -O- 'https://bitbucket.org/camlspotter/camlimages/downloads' | \ - $(SED) -n 's,.*camlimages-\([0-9][^>]*\)\.tar.*,\1,ip' | \ - head -1 + wget -q -O- 'https://bitbucket.org/camlspotter/camlimages/downloads' | \ + $(SED) -n 's,.*camlimages-\([0-9][^>]*\)\.tar.*,\1,ip' | \ + head -1 endef define $(PKG)_BUILD - cd '$(1)' && cp -f doc/old/* doc/ - cd '$(1)' && autoreconf -fi - cd '$(1)' && ./configure \ - --prefix '$(PREFIX)/$(TARGET)' \ - --build="`config.guess`" \ - --with-lablgtk2=yes \ - --host $(TARGET) \ - --disable-bytecode-library \ - --disable-shared + cd '$(1)' && cp -f doc/old/* doc/ + cd '$(1)' && autoreconf -fi + cd '$(1)' && ./configure \ + --prefix '$(PREFIX)/$(TARGET)' \ + --build="`config.guess`" \ + --with-lablgtk2=yes \ + --host $(TARGET) \ + --disable-bytecode-library \ + --disable-shared $(SED) -i 's,sed,$(SED),g' $(1)/Makefile $(SED) -i 's,sed,$(SED),g' $(1)/src/Makefile $(MAKE) -C '$(1)' -j 1 install - # test - cp '$(2).ml' '$(1)/test.ml' - cd '$(1)' && '$(TARGET)-ocamlfind' opt -linkpkg -package camlimages test.ml + # test + cp '$(2).ml' '$(1)/test.ml' + cd '$(1)' && '$(TARGET)-ocamlfind' opt -linkpkg -package camlimages test.ml endef diff --git a/src/ocaml-findlib.mk b/src/ocaml-findlib.mk index 31dac70..9fca362 100644 --- a/src/ocaml-findlib.mk +++ b/src/ocaml-findlib.mk @@ -1,54 +1,54 @@ # This file is part of mingw-cross-env. # See doc/index.html for further information. -PKG := ocaml-findlib -$(PKG)_IGNORE := +PKG := ocaml-findlib +$(PKG)_IGNORE := $(PKG)_CHECKSUM := 5d1a52b77145348ded29fefe13736694aabb1868 -$(PKG)_SUBDIR := findlib-$($(PKG)_VERSION) -$(PKG)_FILE := findlib-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://download.camlcity.org/download/$($(PKG)_FILE) -$(PKG)_DEPS := ocaml-core +$(PKG)_SUBDIR := findlib-$($(PKG)_VERSION) +$(PKG)_FILE := findlib-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://download.camlcity.org/download/$($(PKG)_FILE) +$(PKG)_DEPS := ocaml-core define $(PKG)_UPDATE - wget -q -O- 'http://download.camlcity.org/download' | \ - $(SED) -n 's,.*findlib-\([0-9][^>]*\)\.tar.*,\1,ip' | \ - sort | \ - tail -1 + wget -q -O- 'http://download.camlcity.org/download' | \ + $(SED) -n 's,.*findlib-\([0-9][^>]*\)\.tar.*,\1,ip' | \ + sort | \ + tail -1 endef define $(PKG)_BUILD - # build - rm -f $(1)/src/findlib/ocaml_args.ml - cd '$(1)' && \ + # build + rm -f $(1)/src/findlib/ocaml_args.ml + cd '$(1)' && \ PATH="$(PREFIX)/$(TARGET)/bin/ocaml-native:$(PATH)" \ ./configure \ - -config $(PREFIX)/$(TARGET)/etc/findlib.conf \ - -bindir $(PREFIX)/$(TARGET)/bin \ - -sitelib $(PREFIX)/$(TARGET)/lib/ocaml \ - -mandir $(PREFIX)/$(TARGET)/share/man \ - -with-toolbox \ - -no-topfind \ - - # no-topfind because it wants to be installed in /usr/bin, and creates blocking - # error - $(MAKE) -C '$(1)' -j '$(JOBS)' PATH="$(PREFIX)/$(TARGET)/bin/ocaml-native:$(PATH)" all - $(MAKE) -C '$(1)' -j '$(JOBS)' PATH="$(PREFIX)/$(TARGET)/bin/ocaml-native:$(PATH)" opt + -config $(PREFIX)/$(TARGET)/etc/findlib.conf \ + -bindir $(PREFIX)/$(TARGET)/bin \ + -sitelib $(PREFIX)/$(TARGET)/lib/ocaml \ + -mandir $(PREFIX)/$(TARGET)/share/man \ + -with-toolbox \ + -no-topfind \ - # Install findlib - $(MAKE) -C '$(1)' -j '$(JOBS)' install - cp -f $(PREFIX)/$(TARGET)/bin/ocamlfind $(PREFIX)/bin/$(TARGET)-ocamlfind - # Override etc/findlib.conf with our own version - rm -f $(PREFIX)/$(TARGET)/etc/findlib.conf - (echo 'stdlib="$(PREFIX)/$(TARGET)/lib/ocaml"'; \ - echo 'ldconf="$(PREFIX)/$(TARGET)/lib/ocaml/ld.conf"'; \ - echo 'destdir="$(PREFIX)/$(TARGET)/lib/ocaml"'; \ - echo 'path="$(PREFIX)/$(TARGET)/lib/ocaml"'; \ - echo 'ocamlc="$(TARGET)-ocamlc"'; \ - echo 'ocamlopt="$(TARGET)-ocamlopt"'; \ - echo 'ocamldep="$(TARGET)-ocamldep"') \ - > $(PREFIX)/$(TARGET)/etc/findlib.conf + # no-topfind because it wants to be installed in /usr/bin, and creates blocking + # error + $(MAKE) -C '$(1)' -j '$(JOBS)' PATH="$(PREFIX)/$(TARGET)/bin/ocaml-native:$(PATH)" all + $(MAKE) -C '$(1)' -j '$(JOBS)' PATH="$(PREFIX)/$(TARGET)/bin/ocaml-native:$(PATH)" opt - # test - cp '$(2).ml' '$(1)/test.ml' - cd '$(1)' && '$(TARGET)-ocamlfind' opt test.ml + # Install findlib + $(MAKE) -C '$(1)' -j '$(JOBS)' install + cp -f $(PREFIX)/$(TARGET)/bin/ocamlfind $(PREFIX)/bin/$(TARGET)-ocamlfind + # Override etc/findlib.conf with our own version + rm -f $(PREFIX)/$(TARGET)/etc/findlib.conf + (echo 'stdlib="$(PREFIX)/$(TARGET)/lib/ocaml"'; \ + echo 'ldconf="$(PREFIX)/$(TARGET)/lib/ocaml/ld.conf"'; \ + echo 'destdir="$(PREFIX)/$(TARGET)/lib/ocaml"'; \ + echo 'path="$(PREFIX)/$(TARGET)/lib/ocaml"'; \ + echo 'ocamlc="$(TARGET)-ocamlc"'; \ + echo 'ocamlopt="$(TARGET)-ocamlopt"'; \ + echo 'ocamldep="$(TARGET)-ocamldep"') \ + > $(PREFIX)/$(TARGET)/etc/findlib.conf + + # test + cp '$(2).ml' '$(1)/test.ml' + cd '$(1)' && '$(TARGET)-ocamlfind' opt test.ml endef diff --git a/src/ocaml-lablgl.mk b/src/ocaml-lablgl.mk index 2de59ad..239a16f 100644 --- a/src/ocaml-lablgl.mk +++ b/src/ocaml-lablgl.mk @@ -1,54 +1,54 @@ # This file is part of mingw-cross-env. # See doc/index.html for further information. -PKG := ocaml-lablgl -$(PKG)_IGNORE := +PKG := ocaml-lablgl +$(PKG)_IGNORE := $(PKG)_CHECKSUM := 996f0aba788f5fa1531587fb06d667b94237cc92 -$(PKG)_SUBDIR := lablGL -$(PKG)_FILE := lablgl-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$($(PKG)_FILE) -$(PKG)_DEPS := ocaml-findlib gtkglarea +$(PKG)_SUBDIR := lablGL +$(PKG)_FILE := lablgl-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$($(PKG)_FILE) +$(PKG)_DEPS := ocaml-findlib gtkglarea define $(PKG)_UPDATE - wget -q -O- 'http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html' | \ - $(SED) -n 's,.*lablgl-\([^>]*\)\.tar.*,\1,ip' | \ - head -1 + wget -q -O- 'http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html' | \ + $(SED) -n 's,.*lablgl-\([^>]*\)\.tar.*,\1,ip' | \ + head -1 endef define $(PKG)_BUILD - (echo 'CAMLC = $(TARGET)-ocamlc'; \ - echo 'CAMLOPT = $(TARGET)-ocamlopt'; \ - echo 'BINDIR = $(PREFIX)/$(TARGET)/bin'; \ - echo '#XINCLUDES = -I$(PREFIX)/$(TARGET)/X11R6/include'; \ - echo '#XLIBS = -lXext -lXmu -lX11'; \ - echo '#TKINCLUDES = -I(PREFIX)/$(TARGET)/include'; \ - echo 'GLINCLUDES = -DHAS_GLEXT_H -DGL_GLEXT_PROTOTYPES -DGLU_VERSION_1_3'; \ - echo 'GLLIBS = -lglu32 -lopengl32'; \ - echo 'GLUTLIBS = $(shell $(PREFIX)/bin/$(TARGET)-pkg-config --libs glut)'; \ - echo 'RANLIB = $(TARGET)-ranlib'; \ - echo 'TOOLCHAIN = unix'; \ - echo 'XB ='; \ - echo 'XE ='; \ - echo 'XS ='; \ - echo '# NB: The next two lines have a space after them.'; \ - echo 'MKLIB = $(TARGET)-ar rcs '; \ - echo 'MKDLL = $(TARGET)-ocamlmklib -o '; \ - echo 'LIBDIR = $(PREFIX)/$(TARGET)/lib/ocaml'; \ - echo 'DLLDIR = $(PREFIX)/$(TARGET)/lib/ocaml/stublibs'; \ - echo 'INSTALLDIR = $(PREFIX)/$(TARGET)/lib/ocaml/lablGL'; \ - echo '#TOGLDIR=Togl'; \ - echo '#COPTS = $RPM_OPT_FLAGS'; \ - echo 'OCAMLDLL ='; \ - echo 'LIBRARIAN = $(TARGET)-ocamlmklib'; \ + (echo 'CAMLC = $(TARGET)-ocamlc'; \ + echo 'CAMLOPT = $(TARGET)-ocamlopt'; \ + echo 'BINDIR = $(PREFIX)/$(TARGET)/bin'; \ + echo '#XINCLUDES = -I$(PREFIX)/$(TARGET)/X11R6/include'; \ + echo '#XLIBS = -lXext -lXmu -lX11'; \ + echo '#TKINCLUDES = -I(PREFIX)/$(TARGET)/include'; \ + echo 'GLINCLUDES = -DHAS_GLEXT_H -DGL_GLEXT_PROTOTYPES -DGLU_VERSION_1_3'; \ + echo 'GLLIBS = -lglu32 -lopengl32'; \ + echo 'GLUTLIBS = $(shell $(PREFIX)/bin/$(TARGET)-pkg-config --libs glut)'; \ + echo 'RANLIB = $(TARGET)-ranlib'; \ + echo 'TOOLCHAIN = unix'; \ + echo 'XB ='; \ + echo 'XE ='; \ + echo 'XS ='; \ + echo '# NB: The next two lines have a space after them.'; \ + echo 'MKLIB = $(TARGET)-ar rcs '; \ + echo 'MKDLL = $(TARGET)-ocamlmklib -o '; \ + echo 'LIBDIR = $(PREFIX)/$(TARGET)/lib/ocaml'; \ + echo 'DLLDIR = $(PREFIX)/$(TARGET)/lib/ocaml/stublibs'; \ + echo 'INSTALLDIR = $(PREFIX)/$(TARGET)/lib/ocaml/lablGL'; \ + echo '#TOGLDIR=Togl'; \ + echo '#COPTS = $RPM_OPT_FLAGS'; \ + echo 'OCAMLDLL ='; \ + echo 'LIBRARIAN = $(TARGET)-ocamlmklib'; \ echo 'VAR2DEF=$(TARGET)-ocamlrun $$(SRCDIR)/var2def'; \ echo 'VAR2SWITCH=$(TARGET)-ocamlrun $$(SRCDIR)/var2switch') \ - > $(1)/Makefile.config + > $(1)/Makefile.config cd '$(1)' && sed -i 's/ocamlc/$(TARGET)-ocamlc/g' src/Makefile cd '$(1)' && sed -i 's/camlp4o/$(TARGET)-camlp4o/g' src/Makefile - $(MAKE) -C '$(1)' -j '$(JOBS)' lib libopt install - (echo 'version="$($(PKG)_VERSION)"'; \ - echo 'directory="+lablGL"'; \ + $(MAKE) -C '$(1)' -j '$(JOBS)' lib libopt install + (echo 'version="$($(PKG)_VERSION)"'; \ + echo 'directory="+lablGL"'; \ echo 'archive(byte) = "lablgl.cma"'; \ - echo 'archive(native) = "lablgl.cmxa"') \ - > $(PREFIX)/$(TARGET)/lib/ocaml/lablGL/META + echo 'archive(native) = "lablgl.cmxa"') \ + > $(PREFIX)/$(TARGET)/lib/ocaml/lablGL/META endef |