summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2012-09-18 21:44:16 (GMT)
committerMark Brand <mabrand@mabrand.nl>2012-09-18 21:44:16 (GMT)
commite66d6725dfce3ff98eee2fc9f3b42b6a037d8e5e (patch)
treebd0602ea626365f99d073c06813097324c323ec0 /src
parente06403840e82d9cff014ac5db33307c04bf603c1 (diff)
downloadmxe-e66d6725dfce3ff98eee2fc9f3b42b6a037d8e5e.zip
mxe-e66d6725dfce3ff98eee2fc9f3b42b6a037d8e5e.tar.gz
mxe-e66d6725dfce3ff98eee2fc9f3b42b6a037d8e5e.tar.bz2
Revert "add package ocaml-flexdll"
This reverts commit 53ea6fa0b10a97c3323174582cfa84caffcd266a.
Diffstat (limited to 'src')
-rw-r--r--src/ocaml-flexdll-1-fixes.patch57
-rwxr-xr-xsrc/ocaml-flexdll-test.c44
-rw-r--r--src/ocaml-flexdll.mk43
3 files changed, 0 insertions, 144 deletions
diff --git a/src/ocaml-flexdll-1-fixes.patch b/src/ocaml-flexdll-1-fixes.patch
deleted file mode 100644
index dd5c983..0000000
--- a/src/ocaml-flexdll-1-fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 78c4c5447fb711713ac56774f0751485b25df4bd Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Sat, 23 Jun 2012 22:25:50 +0200
-Subject: [PATCH] modifications for cross-compilation
-
-part of this patch is taken from
-http://code.google.com/p/flexdll/issues/detail?id=2
-
-diff --git a/Makefile b/Makefile
-index 81b2214..7a15574 100644
---- a/Makefile
-+++ b/Makefile
-@@ -43,12 +43,12 @@ MSVCC64 = $(MSVCC_ROOT)/amd64/cl.exe /nologo /MD -D_CRT_SECURE_NO_DEPRECATE /GS-
- CYGCC = gcc
- OCAMLOPT = ocamlopt
- #OCAMLOPT = FLEXLINKFLAGS=-real-manifest ocamlopt
--#LINKFLAGS = unix.cmxa
-+LINKFLAGS = unix.cmxa
-
- #ifeq ($(SYSTEM), win64)
- #LINKFLAGS=
- #else
--LINKFLAGS = -ccopt "-link version_res.o"
-+#LINKFLAGS = -ccopt "-link version_res.o"
- #endif
-
- support:
-@@ -62,7 +62,7 @@ build_mingw64: flexdll_mingw64.o flexdll_initer_mingw64.o
-
- OBJS = version.ml coff.ml cmdline.ml create_dll.ml reloc.ml
-
--flexlink.exe: $(OBJS) version_res.o
-+flexlink.exe: $(OBJS)
- @echo Building flexlink.exe with TOOLCHAIN=$(TOOLCHAIN)
- rm -f flexlink.exe
- $(OCAMLOPT) -w -105 -o flexlink.exe $(LINKFLAGS) $(OBJS)
-diff --git a/reloc.ml b/reloc.ml
-index 1ac7e38..1187f39 100644
---- a/reloc.ml
-+++ b/reloc.ml
-@@ -977,7 +977,7 @@ let setup_toolchain () =
- !dirs @
- [
- Filename.dirname (get_output1 (!gcc ^ " -print-libgcc-file-name"));
-- get_output1 (!gcc ^ " -print-sysroot") ^ "/mingw/lib";
-+ (*get_output1 (!gcc ^ " -print-sysroot") ^ "/mingw/lib";*)
- ];
- default_libs :=
- ["-lmingw32"; "-lgcc"; "-lmoldname"; "-lmingwex"; "-lmsvcrt";
---
-1.7.9.5
-
diff --git a/src/ocaml-flexdll-test.c b/src/ocaml-flexdll-test.c
deleted file mode 100755
index 3e231ca..0000000
--- a/src/ocaml-flexdll-test.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************
- FlexDLL
- Alain Frisch
-
- Copyright 2007 Institut National de Recherche en Informatique et
- en Automatique.
-
-******************************************************************/
-
-/* An example (main program) */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "flexdll.h"
-
-typedef void torun();
-
-void api(char *msg){ printf("API: %s\n", msg); }
-
-int main(int argc, char **argv)
-{
- void *sym;
- void *handle;
- int i;
- torun *torun;
-
- printf("INIT\n"); fflush(stdout);
- flexdll_dump_exports(NULL);
- printf("OK\n"); fflush(stdout);
- for (i = 1; i < argc; i++) {
- printf("** Loading %s\n", argv[i]);
- handle = flexdll_dlopen(argv[i], FLEXDLL_RTLD_GLOBAL);
- if (NULL == handle) { printf("error: %s\n", flexdll_dlerror()); exit(2); }
- printf("** handle = %p\n", handle);
- flexdll_dump_exports(handle);
- flexdll_dump_relocations(handle);
-
- if (NULL == handle) { printf("error: %s\n", flexdll_dlerror()); exit(2); }
-
- torun = flexdll_dlsym(handle, "torun");
- if (torun) torun();
- }
- exit(0);
-}
diff --git a/src/ocaml-flexdll.mk b/src/ocaml-flexdll.mk
deleted file mode 100644
index 92d196b..0000000
--- a/src/ocaml-flexdll.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# zlib
-PKG := ocaml-flexdll
-$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 585f066f890c7dca95be7541b4647128335f7df9
-#$(PKG)_CHECKSUM := 76e3d9a8d1182d8ff315793c3ffbbc8e49c92888
-$(PKG)_SUBDIR := flexdll
-$(PKG)_FILE := flexdll-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := http://alain.frisch.fr/flexdll/$($(PKG)_FILE)
-$(PKG)_DEPS := gcc
-
-define $(PKG)_UPDATE
- wget -q -O- 'http://alain.frisch.fr/flexdll/' | \
- $(SED) -n 's,.*flexdll-\([0-9][^>]*\)\.tar.gz.*,\1,ip' | \
- head -1
-endef
-
-define $(PKG)_BUILD
- $(MAKE) -C '$(1)' -j '$(JOBS)' \
- CHAINS=mingw \
- MINGW_PREFIX=$(TARGET) \
- all
- mkdir -p '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll'
- cd '$(1)' && mv flexlink.exe flexlink
- cd '$(1)' && strip --remove-section=.comment --remove-section=.note flexlink
- cd '$(1)' && $(INSTALL) -m 0755 flexdll.h '$(PREFIX)/$(TARGET)/include'
- cd '$(1)' && $(INSTALL) -m 0755 flexlink flexdll_mingw.o \
- flexdll_initer_mingw.o \
- '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll'
- # create flexdll scripts
- cd '$(PREFIX)/bin' && ln -sf '$(PREFIX)/$(TARGET)/lib/ocaml/flexdll/flexlink'
- (echo '#!/bin/sh'; \
- echo 'exec flexlink -I $(PREFIX)/$(TARGET)/lib -chain mingw -nocygpath "$$@"') \
- > '$(PREFIX)/bin/$(TARGET)-flexlink'
- chmod 0755 '$(PREFIX)/bin/$(TARGET)-flexlink'
-
- echo "testing flexlink..."
- $(MAKE) -C '$(1)/test' -j '$(JOBS)' dump.exe plug1.dll plug2.dll CC=$(TARGET)-gcc O=o FLEXLINK=$(TARGET)-flexlink
- #works if wine is installed :
- #cd '$(1)/test' && ./dump.exe plug1.dll plug2.dll
-endef