diff -u gcj-4.6-4.6.4/debian/control.m4 gcj-4.6-4.6.4/debian/control.m4 --- gcj-4.6-4.6.4/debian/control.m4 +++ gcj-4.6-4.6.4/debian/control.m4 @@ -66,7 +66,7 @@ realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP ')dnl -Build-Conflicts: binutils-gold +Build-Conflicts: binutils-gold (<= 2.23.52.20130620-1) ifelse(regexp(SRCNAME, `gnat'),0,`dnl Homepage: http://gcc.gnu.org/ ', regexp(SRCNAME, `gdc'),0,`dnl diff -u gcj-4.6-4.6.4/debian/rules.parameters gcj-4.6-4.6.4/debian/rules.parameters --- gcj-4.6-4.6.4/debian/rules.parameters +++ gcj-4.6-4.6.4/debian/rules.parameters @@ -2,15 +2,15 @@ GCC_VERSION := 4.6.4 NEXT_GCC_VERSION := 4.6.5 BASE_VERSION := 4.6 -SOURCE_VERSION := 4.6.4-2 -DEB_VERSION := 4.6.4-2 -DEB_EVERSION := 1:4.6.4-2 +SOURCE_VERSION := 4.6.4-2+plugwash1 +DEB_VERSION := 4.6.4-2+plugwash1 +DEB_EVERSION := 1:4.6.4-2+plugwash1 GDC_BASE_VERSION := DEB_GDC_VERSION := DEB_SOVERSION := 4.6 DEB_SOEVERSION := 1:4.6 DEB_LIBGCC_SOVERSION := 1:4.6 -DEB_LIBGCC_VERSION := 1:4.6.4-2 +DEB_LIBGCC_VERSION := 1:4.6.4-2+plugwash1 DEB_STDCXX_SOVERSION := 4.6 DEB_GCJ_SOVERSION := 4.6 PKG_GCJ_EXT := 12 diff -u gcj-4.6-4.6.4/debian/rules.conf gcj-4.6-4.6.4/debian/rules.conf --- gcj-4.6-4.6.4/debian/rules.conf +++ gcj-4.6-4.6.4/debian/rules.conf @@ -309,7 +309,7 @@ endif AUTO_BUILD_DEP := m4, libtool, -AUTO_BUILD_DEP += autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), +AUTO_BUILD_DEP += autoconf2.64, automake1.11, ifneq ($(DEB_CROSS),yes) LIBC_BUILD_DEP := libc6.1-dev (>= $(libc_dev_ver)) [alpha ia64] | libc0.3-dev (>= $(libc_dev_ver)) [hurd-i386] | libc0.1-dev (>= $(libc_dev_ver)) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= $(libc_dev_ver)) diff -u gcj-4.6-4.6.4/debian/changelog gcj-4.6-4.6.4/debian/changelog --- gcj-4.6-4.6.4/debian/changelog +++ gcj-4.6-4.6.4/debian/changelog @@ -1,3 +1,27 @@ +gcj-4.6 (4.6.4-2+rpi1) jessie-staging; urgency=low + + * Modified to compile code optimized for the Raspberry Pi (ARMv6+VFP). + * Disable testsuite + * Hack "distribution" to Debian for now, more recent gcc versions are getting + better fixes but it's not worth it for a legacy version like this. + + -- Peter Michael Green Sat, 21 Dec 2013 21:38:54 +0000 + +gcj-4.6 (4.6.4-2+plugwash1) UNRELEASED; urgency=medium + + * Patch for proposing to Debian BTS and use in Raspbian, no intent to NMU in + Debian. + * Switch arround build depends/conflicts so they are satisfiable in current + sid (Closes: 713126) + + Remove automake (>= 1:1.11), automake (<< 1:1.12) from build-depends + + add automake1.11 to build-depends + + Version the build-conflicts on binutils-gold as (<= 2.23.52.20130620-1) + (the last real version of the package) so it doesn't hit the virtual + package now provided by binutils. + * Remove freetype/ from freetype includes as the files have moved. + + -- Peter Michael Green Sat, 21 Dec 2013 01:02:36 +0000 + gcj-4.6 (4.6.4-2) unstable; urgency=low * Sync packaging and updates with gcc-4.6 4.6.4-2. diff -u gcj-4.6-4.6.4/debian/rules2 gcj-4.6-4.6.4/debian/rules2 --- gcj-4.6-4.6.4/debian/rules2 +++ gcj-4.6-4.6.4/debian/rules2 @@ -351,9 +351,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else # armel ifeq ($(distribution),Debian) @@ -365,9 +365,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else with_arm_arch = armv5t # starting with quantal endif @@ -378,7 +378,7 @@ endif CONFARGS += --with-float=$(float_abi) ifeq ($(with_arm_thumb),yes) - CONFARGS += --with-mode=thumb + #CONFARGS += --with-mode=thumb endif endif diff -u gcj-4.6-4.6.4/debian/rules.patch gcj-4.6-4.6.4/debian/rules.patch --- gcj-4.6-4.6.4/debian/rules.patch +++ gcj-4.6-4.6.4/debian/rules.patch @@ -342,6 +342,8 @@ debian_patches += armhf-triplet endif +debian_patches += freetype-includes + #debian_patches += address-clauses-timed-entry-calls series_stamp = $(stampdir)/02-series-stamp diff -u gcj-4.6-4.6.4/debian/rules.defs gcj-4.6-4.6.4/debian/rules.defs --- gcj-4.6-4.6.4/debian/rules.defs +++ gcj-4.6-4.6.4/debian/rules.defs @@ -8,7 +8,7 @@ builddir = $(PWD)/build stampdir = stamps -distribution := $(shell lsb_release -is) +distribution := Debian distrelease := $(shell lsb_release -cs) # On non official archives, "lsb_release -cs" default to "n/a". Assume @@ -979,7 +979,7 @@ # run testsuite --------------- with_check := yes # if you don't want to run the gcc testsuite, uncomment the next line -#with_check := disabled by hand +with_check := disabled by plugwash ifeq ($(with_base_only),yes) with_check := no endif diff -u gcj-4.6-4.6.4/debian/control gcj-4.6-4.6.4/debian/control --- gcj-4.6-4.6.4/debian/control +++ gcj-4.6-4.6.4/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc], libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x], lib64gcc1 [i386 powerpc sparc s390], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], - m4, libtool, autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), + m4, libtool, autoconf2.64, automake1.11, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.21.1) | binutils-multiarch (>= 2.21.1), binutils-hppa64 (>= 2.21.1) [hppa], @@ -15,7 +15,7 @@ libcloog-ppl-dev (>= 0.16), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt Build-Depends-Indep: -Build-Conflicts: binutils-gold +Build-Conflicts: binutils-gold (<= 2.23.52.20130620-1) Homepage: http://gcc.gnu.org/ XS-Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.6/ XS-Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.6 only in patch2: unchanged: --- gcj-4.6-4.6.4.orig/debian/patches/freetype-includes.diff +++ gcj-4.6-4.6.4/debian/patches/freetype-includes.diff @@ -0,0 +1,30 @@ +--- gcj-4.6-4.6.4/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2009-01-06 22:44:05.000000000 +0000 ++++ gcj-4.6-4.6.4.new/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2013-12-21 02:55:11.000000000 +0000 +@@ -42,8 +42,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include "jcl.h" + #include "gdkfont.h" + #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h" +--- gcj-4.6-4.6.4/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2007-08-04 10:53:49.000000000 +0000 ++++ gcj-4.6-4.6.4.new/src/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c 2013-12-21 15:27:06.000000000 +0000 +@@ -39,10 +39,10 @@ + #include + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #include "gdkfont.h" + #include "gtkpeer.h" + #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"