summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ucl-1-fixes.patch52
-rw-r--r--src/ucl.mk25
2 files changed, 77 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
+
diff --git a/src/ucl.mk b/src/ucl.mk
new file mode 100644
index 0000000..d374a2f
--- /dev/null
+++ b/src/ucl.mk
@@ -0,0 +1,25 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := ucl
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 1.03
+$(PKG)_CHECKSUM := b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
+$(PKG)_SUBDIR := ucl-$($(PKG)_VERSION)
+$(PKG)_FILE := ucl-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL := http://www.oberhumer.com/opensource/ucl/download/$($(PKG)_FILE)
+$(PKG)_DEPS := gcc
+
+define $(PKG)_UPDATE
+ $(WGET) -q -O- 'http://www.oberhumer.com/opensource/ucl/' | \
+ $(SED) -n 's,.*ucl-\([0-9][^"]*\)\.tar.*,\1,p' | \
+ head -1
+endef
+
+define $(PKG)_BUILD
+ cd '$(1)' && \
+ ./configure \
+ $(MXE_CONFIGURE_OPTS)
+ $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS=-no-undefined
+ $(MAKE) -C '$(1)' -j 1 install
+endef