[mingw-crt] Update to 20120709 snapshot (contains full Cygwin support)
Erik van Pienbroek
epienbro at fedoraproject.org
Mon Jul 9 20:34:11 UTC 2012
commit 93789ce208623d4f8c12bdddc36d13e20651354b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Mon Jul 9 22:33:26 2012 +0200
Update to 20120709 snapshot (contains full Cygwin support)
- Update to 20120709 snapshot (contains full Cygwin support)
- Eliminated various manual kludges as upstream now installs their
files to the correct folders by default
.gitignore | 1 +
mingw-crt.spec | 31 +++++-----
mingw-w64-r5197.patch | 159 +++++++++++++++++++++++++++++++++++++++++++++++++
mingw-w64-r5199.patch | 62 +++++++++++++++++++
sources | 2 +-
5 files changed, 239 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61d6132..793bb1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/mingw-w64-src_20120224.tar.bz2
/mingw-w64-src_20120601.tar.bz2
/mingw-w64-src_20120705.tar.bz2
+/mingw-w64-src_20120709.tar.bz2
diff --git a/mingw-crt.spec b/mingw-crt.spec
index a1e2391..ff0f3b3 100644
--- a/mingw-crt.spec
+++ b/mingw-crt.spec
@@ -1,10 +1,10 @@
%{?mingw_package_header}
-%global snapshot_date 20120705
+%global snapshot_date 20120709
Name: mingw-crt
Version: 2.0.999
-Release: 0.7.trunk.%{snapshot_date}%{?dist}
+Release: 0.8.trunk.%{snapshot_date}%{?dist}
Summary: MinGW Windows cross-compiler runtime
License: Public Domain and ZPLv2.1
@@ -16,6 +16,10 @@ Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-src_%{snaps
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz
%endif
+# Upstream commit r5197 and r5199, Remove hardcoded host entry in the sysroot location
+Patch0: mingw-w64-r5197.patch
+Patch1: mingw-w64-r5199.patch
+
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 95
@@ -63,16 +67,13 @@ tar -xf %{S:0}
%setup -q -n mingw-w64-v%{version}
%endif
-# By default the configure script looks for $sysroot/$host/include
-# while we use $sysroot/mingw/include for this
-sed -i "s,\$host/include,mingw/include,g" mingw-w64-crt/configure*
-sed -i "s,\$(host)/include,mingw/include,g" mingw-w64-crt/Makefile.*
+%patch0 -p1
+%patch1 -p1
%build
pushd mingw-w64-crt
- MINGW32_CONFIGURE_ARGS="--host=%{mingw32_target} --prefix=%{mingw32_prefix} --with-sysroot=%{mingw32_sysroot}"
- MINGW64_CONFIGURE_ARGS="--host=%{mingw64_target} --prefix=%{mingw64_prefix} --with-sysroot=%{mingw64_sysroot} --disable-lib32"
+ MINGW64_CONFIGURE_ARGS="--disable-lib32"
%mingw_configure
%mingw_make %{?_smp_mflags}
popd
@@ -83,14 +84,9 @@ pushd mingw-w64-crt
%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
popd
-# The above installs in /usr/$target/sys-root/mingw/$target/lib
-# which is the wrong location. Move it to %%{mingw64_libdir}.
-mv $RPM_BUILD_ROOT%{mingw32_prefix}/%{mingw32_target}/lib $RPM_BUILD_ROOT%{mingw32_libdir}
-mv $RPM_BUILD_ROOT%{mingw64_prefix}/%{mingw64_target}/lib $RPM_BUILD_ROOT%{mingw64_libdir}
-
# Dunno what to do with these files
-rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/%{mingw32_target}/libsrc
-rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/%{mingw64_target}/libsrc
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/libsrc
+rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/libsrc
%files -n mingw32-crt
@@ -103,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/%{mingw64_target}/libsrc
%changelog
+* Mon Jul 9 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.8.trunk.20120709
+- Update to 20120709 snapshot (contains full Cygwin support)
+- Eliminated various manual kludges as upstream now installs their
+ files to the correct folders by default
+
* Thu Jul 5 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.7.trunk.20120705
- Update to 20120705 snapshot (contains various Cygwin changes)
diff --git a/mingw-w64-r5197.patch b/mingw-w64-r5197.patch
new file mode 100644
index 0000000..0504904
--- /dev/null
+++ b/mingw-w64-r5197.patch
@@ -0,0 +1,159 @@
+Index: trunk/mingw-w64-crt/configure
+===================================================================
+--- trunk/mingw-w64-crt/configure (revision 5196)
++++ trunk/mingw-w64-crt/configure (revision 5197)
+@@ -682,9 +682,9 @@
+ CFLAGS
+ CC
+ SED
+-TARGET_SYSTEM_ROOT
+ WITHSYSROOT_FALSE
+ WITHSYSROOT_TRUE
++TARGET_SYSTEM_ROOT
+ host_os
+ host_vendor
+ host_cpu
+@@ -1430,7 +1430,8 @@
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+- --with-sysroot=DIR Search for include within DIR/mingw.
++ --with-sysroot=DIR Search for headers within DIR/include (default:
++ prefix/include)
+
+ Some influential environment variables:
+ CC C compiler command
+@@ -2775,46 +2776,28 @@
+
+ # Check whether --with-sysroot was given.
+ if test "${with_sysroot+set}" = set; then :
+- withval=$with_sysroot; case $with_sysroot in #(
++ withval=$with_sysroot;
++else
++ with_sysroot=yes
++fi
++
++case $with_sysroot in #(
+ no) :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; } ;; #(
++ ;; #(
+ yes) :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none specified" >&5
+-$as_echo "none specified" >&6; }
+- as_fn_error $? "Please specify a directory to the --with-sysroot=DIR option" "$LINENO" 5
+- ;; #(
++ with_sysroot=$prefix/include ;; #(
+ *) :
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+-$as_echo "$with_sysroot" >&6; }
+- TARGET_SYSTEM_ROOT=$with_sysroot
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if sysroot contains an include directory" >&5
+-$as_echo_n "checking if sysroot contains an include directory... " >&6; }
+- if test -d $with_sysroot/$host/include; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "Sysroot directory does not contain $host/include" "$LINENO" 5
+- with_sysroot=no
+-
+-fi
+ ;;
+ esac
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
++$as_echo "$with_sysroot" >&6; }
++if test "x$with_sysroot" = xno; then :
+
+ else
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- TARGET_SYSTEM_ROOT=
+- with_sysroot=no
+-
++ TARGET_SYSTEM_ROOT=$with_sysroot
+ fi
+
+- if test $with_sysroot != no; then
++ if ${TARGET_SYSTEM_ROOT+:} false; then
+ WITHSYSROOT_TRUE=
+ WITHSYSROOT_FALSE='#'
+ else
+Index: trunk/mingw-w64-crt/Makefile.in
+===================================================================
+--- trunk/mingw-w64-crt/Makefile.in (revision 5196)
++++ trunk/mingw-w64-crt/Makefile.in (revision 5197)
+@@ -3267,7 +3267,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @WITHSYSROOT_FALSE at sysincludes =
+- at WITHSYSROOT_TRUE@sysincludes = -I at TARGET_SYSTEM_ROOT@/$(host)/include
++ at WITHSYSROOT_TRUE@sysincludes = -I at TARGET_SYSTEM_ROOT@/include
+ @WITHSYSROOT_FALSE at withsys =
+ @WITHSYSROOT_TRUE at withsys = --with-sysroot=@TARGET_SYSTEM_ROOT@
+ @UNDERSCORES_FALSE at cflags_underscores = -fno-leading-underscore
+Index: trunk/mingw-w64-crt/configure.ac
+===================================================================
+--- trunk/mingw-w64-crt/configure.ac (revision 5196)
++++ trunk/mingw-w64-crt/configure.ac (revision 5197)
+@@ -16,32 +16,19 @@
+ AC_MSG_CHECKING([for sysroot])
+ AC_ARG_WITH([sysroot],
+ [AS_HELP_STRING([--with-sysroot=DIR],
+- [Search for include within DIR/mingw.])],
+- [AS_CASE([$with_sysroot],
+- [no],[AC_MSG_RESULT([no])],
+- [yes],[AC_MSG_RESULT([none specified])
+- AC_MSG_ERROR([Please specify a directory to the --with-sysroot=DIR option])
+- ],[
+- AC_MSG_RESULT([$with_sysroot])
+- TARGET_SYSTEM_ROOT=$with_sysroot
+- AC_MSG_CHECKING([if sysroot contains an include directory])
+- AS_IF([test -d $with_sysroot/$host/include],
+- [AC_MSG_RESULT([yes])],
+- [
+- AC_MSG_RESULT([no])
+- AC_MSG_ERROR([Sysroot directory does not contain $host/include])
+- with_sysroot=no
+- ])
+- ])
+- ],
+- [
+- AC_MSG_RESULT([no])
+- TARGET_SYSTEM_ROOT=
+- with_sysroot=no
+- ])
+-AM_CONDITIONAL([WITHSYSROOT],[test $with_sysroot != no])
++ [Search for headers within DIR/include (default: prefix/include)])],
++ [],
++ [AS_VAR_SET([with_sysroot],[yes])])
++AS_CASE([$with_sysroot],
++ [no],[],
++ [yes],[AS_VAR_SET([with_sysroot],[$prefix/include])],
++ [])
++AC_MSG_RESULT([$with_sysroot])
++AS_VAR_IF([with_sysroot],[no],[],[AS_VAR_SET([TARGET_SYSTEM_ROOT],[$with_sysroot])])
+ AC_SUBST([TARGET_SYSTEM_ROOT])
++AM_CONDITIONAL([WITHSYSROOT],[AS_VAR_TEST_SET([TARGET_SYSTEM_ROOT])])
+
++
+ # Checks for programs.
+ # Checks for headers, libs, etc need to utilize the sysroot... no idea how
+ AC_NO_EXECUTABLES
+Index: trunk/mingw-w64-crt/Makefile.am
+===================================================================
+--- trunk/mingw-w64-crt/Makefile.am (revision 5196)
++++ trunk/mingw-w64-crt/Makefile.am (revision 5197)
+@@ -13,7 +13,7 @@
+ #AUTOMAKE_OPTIONS = color-tests
+
+ if WITHSYSROOT
+- sysincludes=-I at TARGET_SYSTEM_ROOT@/$(host)/include
++ sysincludes=-I at TARGET_SYSTEM_ROOT@/include
+ withsys=--with-sysroot=@TARGET_SYSTEM_ROOT@
+ else
+ sysincludes=
diff --git a/mingw-w64-r5199.patch b/mingw-w64-r5199.patch
new file mode 100644
index 0000000..1bbe713
--- /dev/null
+++ b/mingw-w64-r5199.patch
@@ -0,0 +1,62 @@
+Index: trunk/mingw-w64-crt/Makefile.in
+===================================================================
+--- trunk/mingw-w64-crt/Makefile.in (revision 5198)
++++ trunk/mingw-w64-crt/Makefile.in (revision 5199)
+@@ -3527,7 +3527,7 @@
+ #########
+ # Compiling 32-bit runtime
+ #
+- at LIB32_TRUE@lib32dir = $(prefix)/$(host)/@LIB32SUFFIXDIR@
++ at LIB32_TRUE@lib32dir = $(prefix)/@LIB32SUFFIXDIR@
+ @LIB32_TRUE at crt32dir = $(lib32dir)
+ @LIB32_TRUE at crt32_DATA = \
+ @LIB32_TRUE@ lib32/crt1.o lib32/crt2.o lib32/crt1u.o lib32/crt2u.o lib32/dllcrt1.o lib32/dllcrt2.o \
+@@ -3722,7 +3722,7 @@
+ #########################################################################
+ # Compiling 64-bit runtime
+ # #######################################################################
+- at LIB64_TRUE@lib64dir = $(prefix)/$(host)/@LIB64SUFFIXDIR@
++ at LIB64_TRUE@lib64dir = $(prefix)/@LIB64SUFFIXDIR@
+ @LIB64_TRUE at crt64dir = $(lib64dir)
+ @LIB64_TRUE at crt64_DATA = \
+ @LIB64_TRUE@ lib64/crt1.o lib64/crt2.o lib64/crt1u.o lib64/crt2u.o lib64/dllcrt1.o lib64/dllcrt2.o \
+@@ -4088,7 +4088,7 @@
+
+ # Don't compile these, but install as is:
+ #
+-libsrcdir = $(prefix)/$(host)/libsrc
++libsrcdir = $(prefix)/libsrc
+ libsrc_DATA = \
+ libsrc/agtctl_i.c libsrc/agtsvr_i.c libsrc/cdoex_i.c libsrc/cdoexm_i.c \
+ libsrc/cdosys_i.c libsrc/emostore_i.c libsrc/iisext_i.c libsrc/mtsadmin_i.c \
+Index: trunk/mingw-w64-crt/Makefile.am
+===================================================================
+--- trunk/mingw-w64-crt/Makefile.am (revision 5198)
++++ trunk/mingw-w64-crt/Makefile.am (revision 5199)
+@@ -288,7 +288,7 @@
+ # Compiling 32-bit runtime
+ #
+
+-lib32dir=$(prefix)/$(host)/@LIB32SUFFIXDIR@
++lib32dir=$(prefix)/@LIB32SUFFIXDIR@
+ crt32dir=$(lib32dir)
+
+ crt32_DATA = \
+@@ -585,7 +585,7 @@
+ # Compiling 64-bit runtime
+ # #######################################################################
+
+-lib64dir=$(prefix)/$(host)/@LIB64SUFFIXDIR@
++lib64dir=$(prefix)/@LIB64SUFFIXDIR@
+ crt64dir=$(lib64dir)
+
+ crt64_DATA = \
+@@ -1050,7 +1050,7 @@
+
+ # Don't compile these, but install as is:
+ #
+-libsrcdir=$(prefix)/$(host)/libsrc
++libsrcdir=$(prefix)/libsrc
+ libsrc_DATA = \
+ libsrc/agtctl_i.c libsrc/agtsvr_i.c libsrc/cdoex_i.c libsrc/cdoexm_i.c \
+ libsrc/cdosys_i.c libsrc/emostore_i.c libsrc/iisext_i.c libsrc/mtsadmin_i.c \
diff --git a/sources b/sources
index f68869e..88f0a14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-114cb4074bd6b20414ecc76942d9ac36 mingw-w64-src_20120705.tar.bz2
+6830d62327e8d1e7c09693d198b80537 mingw-w64-src_20120709.tar.bz2
More information about the scm-commits
mailing list