[mingw32-dlfcn] Fixed the build with the mingw-w64 toolchain
Kalev Lember
kalev at fedoraproject.org
Mon Feb 27 20:08:32 UTC 2012
commit 39e8d52559e7095b86d6f0456ba178c41a13e2ac
Author: Kalev Lember <kalevlember at gmail.com>
Date: Mon Feb 27 22:07:50 2012 +0200
Fixed the build with the mingw-w64 toolchain
dlfcn-fix-static-lib.patch | 4 ++--
dlfcn_configure.patch | 8 ++++----
mingw32-dlfcn.spec | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/dlfcn-fix-static-lib.patch b/dlfcn-fix-static-lib.patch
index b7cdabb..28b9ca4 100644
--- a/dlfcn-fix-static-lib.patch
+++ b/dlfcn-fix-static-lib.patch
@@ -6,8 +6,8 @@
libdl.a: dlfcn.o
- ar cru libdl.a dlfcn.o
- ranlib libdl.a
-+ i686-pc-mingw32-ar cru libdl.a dlfcn.o
-+ i686-pc-mingw32-ranlib libdl.a
++ i686-w64-mingw32-ar cru libdl.a dlfcn.o
++ i686-w64-mingw32-ranlib libdl.a
libdl.dll: dlfcn.o
$(CC) $(SHFLAGS) -shared -o libdl.dll dlfcn.o
diff --git a/dlfcn_configure.patch b/dlfcn_configure.patch
index 8a0e7db..2bfb062 100644
--- a/dlfcn_configure.patch
+++ b/dlfcn_configure.patch
@@ -3,10 +3,10 @@ diff -ruNp dlfcn-win32-r11/config.mak dlfcn-win32-r11.new/config.mak
+++ dlfcn-win32-r11.new/config.mak 2009-01-02 12:08:15.000000000 -0200
@@ -0,0 +1,9 @@
+# Automatically generated by configure
-+PREFIX=/usr/i686-pc-mingw32/sys-root/mingw
-+libdir=/usr/i686-pc-mingw32/sys-root/mingw/lib
-+incdir=/usr/i686-pc-mingw32/sys-root/mingw/include
-+CC=i686-pc-mingw32-gcc
++PREFIX=/usr/i686-w64-mingw32/sys-root/mingw
++libdir=/usr/i686-w64-mingw32/sys-root/mingw/lib
++incdir=/usr/i686-w64-mingw32/sys-root/mingw/include
++CC=i686-w64-mingw32-gcc
+BUILD_SHARED=yes
+BUILD_STATIC=yes
+BUILD_MSVC=no
diff --git a/mingw32-dlfcn.spec b/mingw32-dlfcn.spec
index 3ca563a..55c6deb 100644
--- a/mingw32-dlfcn.spec
+++ b/mingw32-dlfcn.spec
@@ -60,10 +60,10 @@ Static version of the MinGW Windows dlfcn library.
%build
%{_mingw32_configure} \
--incdir=%{_mingw32_includedir} \
- --cc=i686-pc-mingw32-gcc \
+ --cc=i686-w64-mingw32-gcc \
--enable-shared=yes \
--enable-static=yes \
- --enable-strip=i686-pc-mingw32-strip
+ --enable-strip=i686-w64-mingw32-strip
make %{?_smp_mflags}
More information about the mingw
mailing list