diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2015-11-09 00:27:33 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2015-11-09 02:02:38 (GMT) |
| commit | 85d472be18f64d77ba9237cd11602a4c83690288 (patch) | |
| tree | caeff8e769b4f34988d8102d1677a96329bca6f5 /src | |
| parent | c299dc4ce34e3260fb49d8891c8d97ac7558db7e (diff) | |
| download | mxe-85d472be18f64d77ba9237cd11602a4c83690288.zip mxe-85d472be18f64d77ba9237cd11602a4c83690288.tar.gz mxe-85d472be18f64d77ba9237cd11602a4c83690288.tar.bz2 | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ucl-1-fixes.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/src/ucl-1-fixes.patch b/src/ucl-1-fixes.patch new file mode 100644 index 0000000..34a1ee3 --- /dev/null +++ b/src/ucl-1-fixes.patch @@ -0,0 +1,52 @@ +This file is part of MXE. +See index.html for further information. + +From 34ee29b2233764519fecf3a9c5d7ed36ad680215 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sun, 8 Nov 2015 23:58:55 +0100 +Subject: [PATCH] do not use winmm + + * do not link against winmm + * comment out call to timeGetTime (defined in winmm) + +winmm was used only to measure performance in an example. +--- + acc/acclib/uclock.ch | 2 +- + configure | 8 -------- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/acc/acclib/uclock.ch b/acc/acclib/uclock.ch +index d20dc9c..2de1f31 100644 +--- 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 +index 8f7e300..13bc5b4 100755 +--- 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 + + + +-- +1.7.10.4 + |