diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-09-03 02:37:40 (GMT) |
|---|---|---|
| committer | MXE <mxe@mxe.cc> | 2014-09-03 02:38:34 (GMT) |
| commit | 465d3acd221aa454bd3e49fd38fcd79341bb9856 (patch) | |
| tree | 046d212d6fd95f0b3f158c35c3b7feb6abf70dee | |
| parent | b7f91395260dff15aab7436423b47200d36e106e (diff) | |
| download | mxe-465d3acd221aa454bd3e49fd38fcd79341bb9856.zip mxe-465d3acd221aa454bd3e49fd38fcd79341bb9856.tar.gz mxe-465d3acd221aa454bd3e49fd38fcd79341bb9856.tar.bz2 | |
dlfcn-win32: update
Fixes #464 and #498.
| -rw-r--r-- | src/dlfcn-win32-1-configure-fixes.patch | 35 | ||||
| -rw-r--r-- | src/dlfcn-win32.mk | 14 |
2 files changed, 7 insertions, 42 deletions
diff --git a/src/dlfcn-win32-1-configure-fixes.patch b/src/dlfcn-win32-1-configure-fixes.patch deleted file mode 100644 index 80832d4..0000000 --- a/src/dlfcn-win32-1-configure-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From: Timothy Gu <timothygu99@gmail.com> -Subject: [PATCH 1/2] configure: make script return 0 if successfully executed - -diff -Naur dlfcn-win32-r19.orig/configure dlfcn-win32-r19/configure ---- dlfcn-win32-r19.orig/configure 2009-01-11 13:31:27.000000000 -0800 -+++ dlfcn-win32-r19/configure 2013-11-23 20:13:14.429342371 -0800 -@@ -186,7 +186,7 @@ - echo "strip: $strip" - echo "static: $static" - echo "shared: $shared" --enabled shared && { -+if (enabled shared); then - echo "msvc: $msvc"; - echo "strip: $stripping"; --} -+fi - -From: Timothy Gu <timothygu99@gmail.com> -Subject: [PATCH 2/2] configure: update $libdir and $incdir after parsing opts - -diff -Naur dlfcn-win32-r19.orig/configure dlfcn-win32-r19/configure ---- dlfcn-win32-r19.orig/configure 2009-01-11 13:31:27.000000000 -0800 -+++ dlfcn-win32-r19/configure 2013-11-23 20:15:43.777338541 -0800 -@@ -111,6 +111,8 @@ - esac - done - -+libdir="${PREFIX}/lib" -+incdir="${PREFIX}/include" - ar="${cross_prefix}${ar}" - cc_default="${cross_prefix}${cc_default}" - ranlib="${cross_prefix}${ranlib}" diff --git a/src/dlfcn-win32.mk b/src/dlfcn-win32.mk index a375e0f..290437a 100644 --- a/src/dlfcn-win32.mk +++ b/src/dlfcn-win32.mk @@ -3,16 +3,16 @@ PKG := dlfcn-win32 $(PKG)_IGNORE := -$(PKG)_VERSION := 19 -$(PKG)_CHECKSUM := a0033e37a547c52059d0bf8664a96ecdeeb66419 -$(PKG)_SUBDIR := $(PKG)-r$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 -$(PKG)_URL := http://$(PKG).googlecode.com/files/$($(PKG)_FILE) +$(PKG)_VERSION := 1.0.0 +$(PKG)_CHECKSUM := 2e02ffff3cd3a6871bce03d485394bd309d8eaa4 +$(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)_DEPS := gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'http://code.google.com/p/dlfcn-win32/downloads/list?sort=-uploaded' | \ - $(SED) -n 's,.*dlfcn-win32-r\([0-9][^<]*\)\.tar.*,\1,p' | \ + $(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 |