d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mxe/src/ucl-1-fixes.patch

47 lines
1.2 KiB
Diff
Raw Normal View History

Copyright headers: point to LICENSE.md and shorten The following script was applied: sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE') sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \ $(git grep -l 'part of MXE.*See index.html') before='This file is part of MXE. See index.html for further information.' after='This file is part of MXE. See LICENSE.md for licensing information.' sed "s/$before/$after/" -i $(git grep -l 'part of MXE') Then git grep 'index.html for further information' revealed two other files. One of them was patched manually (patch.mk). Makefile has text "See index.html for further information" unrelated to licensing. See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
2016-08-22 20:52:34 +01:00
This file is part of MXE. See LICENSE.md for licensing information.
ucl: fix shared build libtool could not find -lwinmm and produced the following message: *** Warning: linker path does not have real file for library -lwinmm. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libwinmm and none of the candidates passed a file format test *** using a file magic. Last file checked: /usr/lib/mxe/usr/lib/gcc/i686-w64-mingw32.shared/5.2.0/../../../../i686-w64-mingw32.shared/lib//libwinmm.a *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. *** Since this library must not contain undefined symbols, *** because either the platform does not support them or *** it was explicitly requested with -no-undefined, *** libtool will only create a static version of it. After that, it created a static library instead of shared one. Even -no-undefined did not help.
2015-11-09 00:27:33 +00:00
various packages: refresh patches brings patches into common format to reduce noise in diffs
2017-11-18 08:44:18 +00:00
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
ucl: fix shared build libtool could not find -lwinmm and produced the following message: *** Warning: linker path does not have real file for library -lwinmm. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libwinmm and none of the candidates passed a file format test *** using a file magic. Last file checked: /usr/lib/mxe/usr/lib/gcc/i686-w64-mingw32.shared/5.2.0/../../../../i686-w64-mingw32.shared/lib//libwinmm.a *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. *** Since this library must not contain undefined symbols, *** because either the platform does not support them or *** it was explicitly requested with -no-undefined, *** libtool will only create a static version of it. After that, it created a static library instead of shared one. Even -no-undefined did not help.
2015-11-09 00:27:33 +00:00
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 8 Nov 2015 23:58:55 +0100
various packages: run `make refresh-patches` with numbering
2017-11-18 13:44:43 +00:00
Subject: [PATCH 1/1] do not use winmm
ucl: fix shared build libtool could not find -lwinmm and produced the following message: *** Warning: linker path does not have real file for library -lwinmm. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libwinmm and none of the candidates passed a file format test *** using a file magic. Last file checked: /usr/lib/mxe/usr/lib/gcc/i686-w64-mingw32.shared/5.2.0/../../../../i686-w64-mingw32.shared/lib//libwinmm.a *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. *** Since this library must not contain undefined symbols, *** because either the platform does not support them or *** it was explicitly requested with -no-undefined, *** libtool will only create a static version of it. After that, it created a static library instead of shared one. Even -no-undefined did not help.
2015-11-09 00:27:33 +00:00
* do not link against winmm
* comment out call to timeGetTime (defined in winmm)
winmm was used only to measure performance in an example.
diff --git a/acc/acclib/uclock.ch b/acc/acclib/uclock.ch
various packages: refresh patches brings patches into common format to reduce noise in diffs
2017-11-18 08:44:18 +00:00
index 1111111..2222222 100644
ucl: fix shared build libtool could not find -lwinmm and produced the following message: *** Warning: linker path does not have real file for library -lwinmm. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libwinmm and none of the candidates passed a file format test *** using a file magic. Last file checked: /usr/lib/mxe/usr/lib/gcc/i686-w64-mingw32.shared/5.2.0/../../../../i686-w64-mingw32.shared/lib//libwinmm.a *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. *** Since this library must not contain undefined symbols, *** because either the platform does not support them or *** it was explicitly requested with -no-undefined, *** libtool will only create a static version of it. After that, it created a static library instead of shared one. Even -no-undefined did not help.
2015-11-09 00:27:33 +00:00
--- a/acc/acclib/uclock.ch
+++ b/acc/acclib/uclock.ch
@@ -157,7 +157,7 @@ ACCLIB_PUBLIC(void, acc_uclock_read) (acc_uclock_handle_p h, acc_uclock_p c)
#elif (__ACCLIB_UCLOCK_USE_CLOCK)
c->ticks.t32 = clock();
#elif (__ACCLIB_UCLOCK_USE_WINMM)
- c->ticks.t32 = timeGetTime();
+ //c->ticks.t32 = timeGetTime();
#elif (__ACCLIB_UCLOCK_USE_GETRUSAGE)
struct rusage ru;
if (getrusage(RUSAGE_SELF, &ru) != 0) c->ticks.rd = 0;
diff --git a/configure b/configure
various packages: refresh patches brings patches into common format to reduce noise in diffs
2017-11-18 08:44:18 +00:00
index 1111111..2222222 100755
ucl: fix shared build libtool could not find -lwinmm and produced the following message: *** Warning: linker path does not have real file for library -lwinmm. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libwinmm and none of the candidates passed a file format test *** using a file magic. Last file checked: /usr/lib/mxe/usr/lib/gcc/i686-w64-mingw32.shared/5.2.0/../../../../i686-w64-mingw32.shared/lib//libwinmm.a *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. *** Since this library must not contain undefined symbols, *** because either the platform does not support them or *** it was explicitly requested with -no-undefined, *** libtool will only create a static version of it. After that, it created a static library instead of shared one. Even -no-undefined did not help.
2015-11-09 00:27:33 +00:00
--- a/configure
+++ b/configure
@@ -31409,14 +31409,6 @@ done
-if test "X$GCC" = Xyes; then
-case $host_os in
-cygwin* | mingw* | pw32*)
- LIBS="$LIBS -lwinmm" ;;
-*)
- ;;
-esac
-fi