diff -Nru perl-5.14.2/debian/changelog perl-5.14.2/debian/changelog --- perl-5.14.2/debian/changelog 2012-06-18 22:48:03.000000000 +0100 +++ perl-5.14.2/debian/changelog 2012-11-02 19:00:26.000000000 +0000 @@ -1,3 +1,16 @@ +perl (5.14.2-12+rpi2) wheezy-staging; urgency=low + + * Hack config.pm so perl related stuff is built with the regular system + compiler rather than explicitly with gcc 4.7. + + -- Peter Michael Green Fri, 02 Nov 2012 18:59:43 +0000 + +perl (5.14.2-12+rpi1) wheezy; urgency=low + + * switch to gcc-4.7 to avoid ICE + + -- Peter Michael Green Mon, 25 Jun 2012 21:41:39 +0000 + perl (5.14.2-12) unstable; urgency=low * Re-enable thread tests on kFreeBSD now that libc breakage has been diff -Nru perl-5.14.2/debian/config.debian perl-5.14.2/debian/config.debian --- perl-5.14.2/debian/config.debian 2012-06-18 22:48:03.000000000 +0100 +++ perl-5.14.2/debian/config.debian 2012-06-25 23:42:05.000000000 +0100 @@ -94,6 +94,7 @@ eval /bin/bash Configure \ -Dusethreads \ -Duselargefiles \ + -Dcc=gcc-4.7 \ -Dccflags=\'$ccflags\' \ -Dldflags=\'$ldflags\' \ -Dlddlflags=\'-shared $ldflags\' \ diff -Nru perl-5.14.2/debian/control perl-5.14.2/debian/control --- perl-5.14.2/debian/control 2012-06-18 22:48:03.000000000 +0100 +++ perl-5.14.2/debian/control 2012-06-25 23:10:44.000000000 +0100 @@ -7,7 +7,7 @@ Homepage: http://dev.perl.org/perl5/ Build-Depends: file, cpio (>= 2.6-5), libdb-dev, libgdbm-dev, netbase [!hurd-any], gcc (>= 4:4.2), procps [!hurd-any], zlib1g-dev | libz-dev, libbz2-dev, - dpkg-dev (>= 1.16.0) + dpkg-dev (>= 1.16.0), gcc-4.7 Build-Conflicts: libterm-readline-gnu-perl (<< 1.17), libfile-sharedir-perl Vcs-Git: git://anonscm.debian.org/perl/perl.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=perl/perl.git diff -Nru perl-5.14.2/debian/rules perl-5.14.2/debian/rules --- perl-5.14.2/debian/rules 2012-06-18 22:48:05.000000000 +0100 +++ perl-5.14.2/debian/rules 2012-11-02 18:58:19.000000000 +0000 @@ -435,6 +435,10 @@ (cd $(build)/$$p; find usr -type f -print | xargs -r md5sum) \ >$(build)/$$p/DEBIAN/md5sums; \ done + + #hack: set c compiler back to cc in installed config.pm + sed -i s/gcc-4.7/cc/ $(build)/perl-base/usr/lib/perl/5.14.2/Config.pm + # dpkg-shlibdeps needs to be run only after all the shlibs are present for p in `./perl.static -l -00ne 'print $$1 if /^Architecture:\s+any/m \ and /^Package:\s+(.*)/m' debian/control`; \