Mercurial > mxe-octave
annotate src/dbus-1-fixes.patch @ 5531:eae508c12529
Add build rule for build-octave (bug #49503).
* src/build-octave.mk: Add new build rule for build-octave which can be used for
cross-building binary packages that depend on Octave as a build tool.
* dist-files.mk: Add new file to list.
* index.html: Add new package to list.
* src/of-communications.mk, src/of-image.mk, src/of-mapping.mk,
src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk,
src/of-windows.mk: Add optional dependency on build-octave.
* configure.ac: Add new configure switch "--disable-system-octave" that is
needed to build the build-octave package.
* Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the
default build tools and build it only if a package explicitly depends on it.
Display warning about missing native Octave version only if necessary.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Tue, 08 Sep 2020 23:04:38 +0200 |
| parents | 4c5a70572b2b |
| children |
| rev | line source |
|---|---|
| 5000 | 1 This file is part of MXE. See LICENSE.md for licensing information. |
| 2 | |
| 3 Contains ad hoc patches for cross building. | |
| 4 | |
| 5 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | |
| 6 From: darealshinji <djcj@gmx.de> | |
| 7 Date: Mon, 3 Jul 2017 01:55:45 +0200 | |
| 8 Subject: [PATCH 1/1] Avoid multiple definitions of DllMain in static builds | |
| 9 | |
| 10 | |
| 11 diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c | |
| 12 index 1111111..2222222 100644 | |
| 13 --- a/dbus/dbus-sysdeps-thread-win.c | |
| 14 +++ b/dbus/dbus-sysdeps-thread-win.c | |
| 15 @@ -69,6 +69,8 @@ _dbus_win_get_dll_hmodule (void) | |
| 16 #define hinst_t HINSTANCE | |
| 17 #endif | |
| 18 | |
| 19 +#ifndef DBUS_STATIC_BUILD | |
| 20 + | |
| 21 BOOL WINAPI DllMain (hinst_t, DWORD, LPVOID); | |
| 22 | |
| 23 /* We need this to free the TLS events on thread exit */ | |
| 24 @@ -107,6 +109,8 @@ DllMain (hinst_t hinstDLL, | |
| 25 return TRUE; | |
| 26 } | |
| 27 | |
| 28 +#endif /* !DBUS_STATIC_BUILD */ | |
| 29 + | |
| 30 DBusCMutex * | |
| 31 _dbus_platform_cmutex_new (void) | |
| 32 { |