Mercurial > mxe-octave

annotate src/ocaml-flexdll-1-fixes.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents d3677521718a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2703
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
1 This file is part of MXE.
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
2 See index.html for further information.
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
3
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
5
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
6 From 78c4c5447fb711713ac56774f0751485b25df4bd Mon Sep 17 00:00:00 2001
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
7 From: MXE
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
8 Date: Sat, 23 Jun 2012 22:25:50 +0200
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
9 Subject: [PATCH] modifications for cross-compilation
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
10
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
11 part of this patch is taken from
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
12 http://code.google.com/p/flexdll/issues/detail?id=2
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
13
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
14 diff --git a/Makefile b/Makefile
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
15 index 81b2214..7a15574 100644
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
16 --- a/Makefile
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
17 +++ b/Makefile
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
18 @@ -43,12 +43,12 @@ MSVCC64 = $(MSVCC_ROOT)/amd64/cl.exe /nologo /MD -D_CRT_SECURE_NO_DEPRECATE /GS-
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
19 CYGCC = gcc
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
20 OCAMLOPT = ocamlopt
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
21 #OCAMLOPT = FLEXLINKFLAGS=-real-manifest ocamlopt
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
22 -#LINKFLAGS = unix.cmxa
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
23 +LINKFLAGS = unix.cmxa
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
24
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
25 #ifeq ($(SYSTEM), win64)
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
26 #LINKFLAGS=
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
27 #else
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
28 -LINKFLAGS = -ccopt "-link version_res.o"
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
29 +#LINKFLAGS = -ccopt "-link version_res.o"
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
30 #endif
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
31
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
32 support:
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
33 @@ -62,7 +62,7 @@ build_mingw64: flexdll_mingw64.o flexdll_initer_mingw64.o
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
34
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
35 OBJS = version.ml coff.ml cmdline.ml create_dll.ml reloc.ml
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
36
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
37 -flexlink.exe: $(OBJS) version_res.o
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
38 +flexlink.exe: $(OBJS)
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
39 @echo Building flexlink.exe with TOOLCHAIN=$(TOOLCHAIN)
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
40 rm -f flexlink.exe
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
41 $(OCAMLOPT) -w -105 -o flexlink.exe $(LINKFLAGS) $(OBJS)
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
42 diff --git a/reloc.ml b/reloc.ml
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
43 index 1ac7e38..1187f39 100644
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
44 --- a/reloc.ml
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
45 +++ b/reloc.ml
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
46 @@ -977,7 +977,7 @@ let setup_toolchain () =
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
47 !dirs @
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
48 [
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
49 Filename.dirname (get_output1 (!gcc ^ " -print-libgcc-file-name"));
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
50 - get_output1 (!gcc ^ " -print-sysroot") ^ "/mingw/lib";
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
51 + (*get_output1 (!gcc ^ " -print-sysroot") ^ "/mingw/lib";*)
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
52 ];
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
53 default_libs :=
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
54 ["-lmingw32"; "-lgcc"; "-lmoldname"; "-lmingwex"; "-lmsvcrt";
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
55 --
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
56 1.7.9.5
d3677521718a add package ocaml-flexdll
William <r.3@libertysurf.fr>
parents:
diff changeset
57