[mingw-antlr] enable 64bit build

[sailer]

commit 5b09cbd7b2d5ce67a224b4557e93306d46b80345
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Fri Aug 3 18:05:08 2012 +0200

    enable 64bit build

 mingw-antlr.patch |    4 ++-
 mingw-antlr.spec  |   70 ++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 20 deletions(-)
---
diff --git a/mingw-antlr.patch b/mingw-antlr.patch
index 9273538..42dece2 100644
--- a/mingw-antlr.patch
+++ b/mingw-antlr.patch
@@ -1813,9 +1813,11 @@ new file mode 100644
 index 0000000..08144b9
 --- /dev/null
 +++ b/lib/cpp/src/Makefile.am
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,44 @@
 +AM_CXXFLAGS = @CXXFLAGS@
 +
++INCLUDES = -I$(top_srcdir)
++
 +lib_LTLIBRARIES = libantlr2.la
 +
 +if WIN32
diff --git a/mingw-antlr.spec b/mingw-antlr.spec
index 9d12eaa..ae036a0 100644
--- a/mingw-antlr.spec
+++ b/mingw-antlr.spec
@@ -1,13 +1,11 @@
-%global __strip %{_mingw32_strip}
-%global __objdump %{_mingw32_objdump}
-%define __debug_install_post %{_mingw32_debug_install_post}
+%{?mingw_package_header}
 
 %global mingw_pkg_name antlr
 
 Summary:		MinGW Windows ANTLR C++ run-time library
 Name:			mingw-%{mingw_pkg_name}
 Version:		2.7.7
-Release:		9%{?dist}
+Release:		10%{?dist}
 License:		Public Domain
 URL:			http://www.antlr.org/
 Group:			Development/Libraries
@@ -48,7 +46,23 @@ Requires:		mingw32-%{mingw_pkg_name} = %{version}-%{release}
 %description -n mingw32-%{mingw_pkg_name}-static
 Static version of the MinGW Windows ANTLR run-time library.
 
-%{?_mingw32_debug_package}
+# Mingw64
+%package -n mingw64-%{mingw_pkg_name}
+Summary:		%{summary}
+
+%description -n mingw64-%{mingw_pkg_name}
+ANTLR is a parser generator. This package contains the MinGW Windows
+run-time library for ANTLR C++ parsers.
+
+%package -n mingw64-%{mingw_pkg_name}-static
+Summary:		Static Version of the MinGW Windows ANTLR C++ run-time library
+Group:			Development/Libraries
+Requires:		mingw32-%{mingw_pkg_name} = %{version}-%{release}
+
+%description -n mingw64-%{mingw_pkg_name}-static
+Static version of the MinGW Windows ANTLR run-time library.
+
+%{?mingw_debug_package}
 
 %prep
 %setup -q -n %{mingw_pkg_name}-%{version}
@@ -60,7 +74,7 @@ find . -name "*.jar" -exec rm -f {} \;
 sed -i 's/\r//' LICENSE.txt
 
 %build
-%{_mingw32_configure} --without-examples
+%{mingw_configure} --without-examples
 pushd lib/cpp
 touch NEWS
 rm -f {,antlr,src}/Makefile{.in,}
@@ -69,35 +83,53 @@ aclocal -I m4
 autoconf
 autoheader
 automake -a -c
-%{_mingw32_configure} --enable-static
-make %{?_smp_mflags}
+%{mingw_configure} --enable-static
+%{mingw_make} %{?_smp_mflags}
 popd
 
 %install
 pushd lib/cpp
-make install DESTDIR=$RPM_BUILD_ROOT
+%{mingw_make} install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/libantlr2.la
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/libantlr2.la
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/libantlr2.la
 
 mkdir $RPM_BUILD_ROOT%{_bindir}
-install -p -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_mingw32_bindir}/antlr-config
-ln -s %{_mingw32_bindir}/antlr-config $RPM_BUILD_ROOT%{_bindir}/%{_mingw32_target}-antlr-config
+install -p -m 755 build_win32/scripts/antlr-config $RPM_BUILD_ROOT%{mingw32_bindir}/antlr-config
+install -p -m 755 build_win64/scripts/antlr-config $RPM_BUILD_ROOT%{mingw64_bindir}/antlr-config
+ln -s %{mingw32_bindir}/antlr-config $RPM_BUILD_ROOT%{_bindir}/%{mingw32_target}-antlr-config
+ln -s %{mingw64_bindir}/antlr-config $RPM_BUILD_ROOT%{_bindir}/%{mingw64_target}-antlr-config
 
 %files -n mingw32-%{mingw_pkg_name}
 %doc LICENSE.txt
-%{_mingw32_includedir}/%{mingw_pkg_name}
-%{_mingw32_bindir}/antlr-config
-%{_mingw32_bindir}/libantlr2-0.dll
-%{_mingw32_libdir}/libantlr2.dll.a
-%{_mingw32_libdir}/pkgconfig/antlr2.pc
-%{_bindir}/%{_mingw32_target}-antlr-config
+%{mingw32_includedir}/%{mingw_pkg_name}
+%{mingw32_bindir}/antlr-config
+%{mingw32_bindir}/libantlr2-0.dll
+%{mingw32_libdir}/libantlr2.dll.a
+%{mingw32_libdir}/pkgconfig/antlr2.pc
+%{_bindir}/%{mingw32_target}-antlr-config
 
 %files -n mingw32-%{mingw_pkg_name}-static
-%{_mingw32_libdir}/libantlr2.a
+%{mingw32_libdir}/libantlr2.a
+
+%files -n mingw64-%{mingw_pkg_name}
+%doc LICENSE.txt
+%{mingw64_includedir}/%{mingw_pkg_name}
+%{mingw64_bindir}/antlr-config
+%{mingw64_bindir}/libantlr2-0.dll
+%{mingw64_libdir}/libantlr2.dll.a
+%{mingw64_libdir}/pkgconfig/antlr2.pc
+%{_bindir}/%{mingw64_target}-antlr-config
+
+%files -n mingw64-%{mingw_pkg_name}-static
+%{mingw64_libdir}/libantlr2.a
 
 
 %changelog
+* Fri Aug  3 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.7.7-10
+- enable 64bit build
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild