summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-08-11 11:39:25 (GMT)
committerTony Theodore <tonyt@logyst.com>2016-08-11 11:41:17 (GMT)
commit89f845177f7a38a61674bc7127eaed020f5dd359 (patch)
tree84da486b462d2fd2125d74c4422970ab30766402
parent4374d5b3c6e1d00be98b33637f112d07c09b858c (diff)
downloadmxe-89f845177f7a38a61674bc7127eaed020f5dd359.zip
mxe-89f845177f7a38a61674bc7127eaed020f5dd359.tar.gz
mxe-89f845177f7a38a61674bc7127eaed020f5dd359.tar.bz2
dlfcn-win32: update to master branch
fixes #1451 patch fixed in: https://github.com/dlfcn-win32/dlfcn-win32/pull/26
-rw-r--r--src/dlfcn-win32-1.fixes.patch25
-rw-r--r--src/dlfcn-win32.mk16
2 files changed, 6 insertions, 35 deletions
diff --git a/src/dlfcn-win32-1.fixes.patch b/src/dlfcn-win32-1.fixes.patch
deleted file mode 100644
index fca8b88..0000000
--- a/src/dlfcn-win32-1.fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-From f46d92e319ba2ce4d5fe46e4293a7f7fbb67935e Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Sun, 15 Nov 2015 13:23:50 +0000
-Subject: [PATCH] configure: remove /tmp/test.dll /tmp/test.c
-
-
-diff --git a/configure b/configure
-index 91f7d07..e3473fe 100755
---- a/configure
-+++ b/configure
-@@ -160,7 +160,7 @@ void function(void)
- { LoadLibrary(NULL); }
- EOF
- echo testing compiler: $cc -shared -o /tmp/test.dll /tmp/test.c
--$cc -shared -o /tmp/test.dll /tmp/test.c
-+$cc -shared -o /tmp/test.dll /tmp/test.c && rm /tmp/test.dll /tmp/test.c
-
- test "$?" != 0 && {
- echo "$cc could not create shared file with Windows API functions.";
---
-2.1.4
-
diff --git a/src/dlfcn-win32.mk b/src/dlfcn-win32.mk
index 2daaea5..5109815 100644
--- a/src/dlfcn-win32.mk
+++ b/src/dlfcn-win32.mk
@@ -3,18 +3,14 @@
PKG := dlfcn-win32
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.0.0
-$(PKG)_CHECKSUM := 36f2e7ef1f1ba04f6ce682a71937eaddd3d6994f09e29df2c7578ec524e47450
-$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz
-$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION := e19bf07
+$(PKG)_CHECKSUM := 6b31a8547547af27e5dfc092df1ea2c6ac562ce47b7ec08a0a4da4ed0b002767
+$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc
-define $(PKG)_UPDATE
- $(WGET) -q -O- 'https://github.com/dlfcn-win32/dlfcn-win32/releases' | \
- $(SED) -n 's,.*<a href="/dlfcn-win32/dlfcn-win32/archive/v\([0-9][^>]*\)\.tar.*,\1,p' | \
- head -1
-endef
+$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, dlfcn-win32/dlfcn-win32, master) | $(SED) 's/^\(.......\).*/\1/;'
define $(PKG)_BUILD
cd '$(1)' && ./configure \