[gentoo-commits] gentoo-x86 commit in media-gfx/sam2p/files: sam2p-0.49.1-gcc48.patch

[Alexis Ballier (aballier)]

aballier    13/08/27 21:00:58

  Added:                sam2p-0.49.1-gcc48.patch
  Log:
  Fix build with gcc 4.8, bug #463434 by  Philipp
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.1                  media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sam2p/files/sam2p-0.49.1-gcc48.patch?rev=1.1&content-type=text/plain

Index: sam2p-0.49.1-gcc48.patch
===================================================================
Index: ccdep.pl
===================================================================
--- ccdep.pl	(revision 123)
+++ ccdep.pl	(revision 125)
@@ -137,13 +137,20 @@
 
 my @DS=find_ds();
 my @DSQ=map{shq$_}@DS;
-my $R="$GCCP -DOBJDEP -M -MG -E 2>&1 @DSQ";
-$R=backtick($R);
+my $DIAG=" -fno-diagnostics-show-caret";
+my $Q="$GCCP -DOBJDEP$DIAG -M -MG -E 2>&1 @DSQ";
+my $R=backtick($Q);
+if ($R=~/\berror: .*-fno-diagnostics-show-caret\b/) {
+  # gcc-4.6 and earlier don't have this flag, and they fail.
+  $Q=~s@ -fno-diagnostics-show-caret(?=\s)@@;
+  $DIAG="";
+  $R=backtick($Q);
+}
 
 if ($R!~/: warning: #warning\b/) {
   # config2.h:314:4: warning: #warning REQUIRES: c_lgcc3.o
   # Dat: g++-3.3 ignores #warning with -M -MG -E
-  $R.="\n".backtick("$GCCP -DOBJDEP -E 2>&1 >/dev/null @DSQ");
+  $R.="\n".backtick("$GCCP -DOBJDEP$DIAG -E 2>&1 >/dev/null @DSQ");
 }
 
 ## die $R;
--- rule.hpp	2013-04-18 12:14:20.385333527 +0200
+++ rule.hpp	2013-04-18 12:14:35.818870070 +0200
@@ -88,7 +88,7 @@
       PR_PNGAuto=15,
       PR_PNGAutoMaybe=25,
       PR_PNGAutoBadUnsigned=45,
-      PR_PNGAutoBadSigned=55,
+      PR_PNGAutoBadSigned=55
     END_STATIC_ENUM()
     pr_t Predictor;