Enable java, link with --large-address-aware

2 files changed, 24 insertions, 8 deletions

diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec
index 2086836..615812c 100644
--- a/cygwin-gcc.spec
+++ b/cygwin-gcc.spec
@@ -5,18 +5,14 @@
 %global gcc_version %{gcc_major}.%{gcc_minor}.%{gcc_micro}
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 2
+%global gcc_release 3
+# arch %%{ix86} x86_64 ia64 ppc ppc64 alpha
 %if 0
-%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
 %global build_ada 1
 %else
 %global build_ada 0
 %endif
 %global build_java 1
-%else
-%global build_ada 0
-%global build_java 0
-%endif
 %global __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
 Name:           cygwin-gcc
@@ -27,7 +23,6 @@ Summary:        Cygwin GCC cross-compiler
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
 Group:          Development/Languages
 URL:            http://gcc.gnu.org
-Source0:        ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  texinfo
@@ -68,6 +63,7 @@ Provides:       cygwin(cygssp-0.dll)
 Provides:       cygwin(cygffi-4.dll)
 %endif
 
+Source0:        ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.bz2
 Patch0:         config-rpath.patch
 Patch1:         gcc45-ada.diff
 Patch2:         gcc45-ehdebug.diff
@@ -80,6 +76,7 @@ Patch8:         gcc45-cross-libstdc.patch
 Patch9:         gcc45-cross-ecjx.patch
 Patch10:        gcc45-java-FIONREAD.diff
 Patch11:        classpath-0.98-awt.patch
+Patch12:        gcc45-peflags.diff
 
 
 %description
@@ -191,6 +188,7 @@ Cygwin cross-compiler for Java.
 %patch10 -p2 -b .java-fionread~
 %patch11 -p2 -b .awt~
 %endif
+%patch12 -p2 -b .peflags~
 
 echo %{gcc_version} > gcc/BASE-VER
 echo 'Fedora Cygwin %{gcc_version}-%{gcc_release}' > gcc/DEV-PHASE
@@ -251,7 +249,8 @@ CC="%{__cc} ${RPM_OPT_FLAGS}" \
 %endif
 %if %{build_java}
   --enable-libjava \
-  --enable-libgcj-sublibs --disable-java-awt --disable-dssi \
+  --enable-libgcj-sublibs --disable-jni --disable-java-awt \
+  --enable-default-preferences-peer=file \
   --with-ecj-jar=%{_datadir}/java/ecj.jar \
 %endif
   --with-bugurl=http://cygwinports.org
@@ -291,6 +290,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{_cygwin_target}-g[^+cfn]*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{_cygwin_target}-gc-analyze*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{_cygwin_target}-gcj-dbtool*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{_cygwin_target}-gcjh*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{_cygwin_target}-gnative2ascii*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{_cygwin_target}-j*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{_cygwin_target}-rebuild-gcj-db*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/%{_cygwin_target}-ffi*
@@ -493,6 +493,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 10 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.3-3
+- Enable --large-address-aware for executables by default.
+- Re-enable java subpackage.
+
 * Mon Jul 04 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 4.5.3-2
 - Rebuilt for http://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/gcc45-peflags.diff b/gcc45-peflags.diff
new file mode 100644
index 0000000..7b01c05
--- /dev/null
+++ b/gcc45-peflags.diff
@@ -0,0 +1,12 @@
+--- origsrc/gcc-4.5.3/gcc/config/i386/cygwin.h	2011-07-10 00:52:31.709323700 -0500
++++ src/gcc-4.5.3/gcc/config/i386/cygwin.h	2011-07-10 01:24:24.630654600 -0500
+@@ -126,7 +126,8 @@ along with GCC; see the file COPYING3.
+   %{shared|mdll: --enable-auto-image-base -e \
+     %{mno-cygwin:_DllMainCRTStartup@12} \
+     %{!mno-cygwin:__cygwin_dll_entry@12}}\
+-  %{!mno-cygwin:--dll-search-prefix=cyg -tsaware}"
++  %{!mno-cygwin:--dll-search-prefix=cyg \
++    %{!shared: %{!mdll: --large-address-aware --tsaware}}}"
+ 
+ /* Allocate space for all of the machine-spec-specific stuff.
+    Allocate enough space for cygwin -> mingw32  munging plus