Remove braindamaged flag stripping to respect CC properly

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 34 insertions, 19 deletions

diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog
index 96b8fe58c798..6d6c054d7775 100644
--- a/sci-libs/hdf/ChangeLog
+++ b/sci-libs/hdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/hdf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.23 2012/01/21 11:41:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.24 2012/01/21 12:00:52 xarthisius Exp $
+
+  21 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  files/4.2.6-autotools.patch:
+  Remove braindamaged flag stripping to respect CC properly
 
   21 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
   files/4.2.6-autotools.patch, hdf-4.2.6.ebuild:
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index ae7d2ff624e2..920888028e71 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 4.2.6-autotools.patch 3815 RMD160 332a70f75b760bb55735c7e2e2ade6563ab67cd2 SHA1 2166b5cc6a3cbcf476364031cac4df29f83ea125 SHA256 78c5b7bf33ac00f243f8f58fcaaeebdd2b7576bdb80b347687bbee215050cddb
+AUX 4.2.6-autotools.patch 4178 RMD160 69435c47a5719cf5ec0d428c0519a7d78883c411 SHA1 5092aba176d1cd75a166b679e01df94b963d7965 SHA256 75474d558d62214167b4690fa6a0d1f9826a64332e81e1bdd4fbe4788facad3b
 DIST HDF4.2r4.tar.gz 3914118 RMD160 13274858f1fa0c339fab83b1f9c37314bd10d624 SHA1 000fa1be9c355c490cceed786feeb269a0d355a7 SHA256 39695c85e15c391e589cfdcb98ecc9a72fbb7447f0575bff4d030d53a62e689d
 DIST hdf-4.2.6.tar.bz2 3088411 RMD160 9b8b9ccba7f84085cff2c64090d5f7c0abf7acad SHA1 914eedbd8d4714f8bc0cc10bbbad5ad7fe1e375c SHA256 9ddfc10f8703dda17f7ccf942c50f56ffd0c7b1066dd5b34ca493a799577a05f
 DIST hdf-4.2_p4-patches.tar.bz2 6914 RMD160 de251f3f54c635187d507743a2bb9afb70052dfa SHA1 02575337706c2a3e4256702be7e461c40fdba026 SHA256 e04ece17fab9739f145099ee78e926ca790177033bfa102f12b328b66bbac390
 EBUILD hdf-4.2.6.ebuild 1280 RMD160 a871e6815cff4efcd08dcb5dcdc674903903851c SHA1 3f912f496398f54338af61b3a4575725c91b597b SHA256 752906b275c360abab0b553113d1bf2dde87f5823a1cdba9928c1bbf153a3e08
 EBUILD hdf-4.2_p4.ebuild 2183 RMD160 b82091e343046b908e46ebae898068cf25c5a06f SHA1 ec0a6e68623c3edd447bcd8e180d825fce7b3089 SHA256 925fdcb74ec84b238e87c587feccf10a0e2b23e2bc3fa10c051da557ce287edc
-MISC ChangeLog 4790 RMD160 72ee3efa5f3748bbacdcc3acd815aea96c04e7c3 SHA1 e1c7120646e4fa4169e03342a0cf9878274d8733 SHA256 ebd0204699cf7f2d2a830ef56a9826922dbe07579c162f1eb23b9ff3214a69e6
+MISC ChangeLog 4936 RMD160 f5592434388a5dafd5862480d392e4e4d54f79ed SHA1 12b0a5c4e51c45f67d62b0681051f407efb2ef0f SHA256 0b7d7c194750462571988469129d1c21e0da4e4b3bd29c8202d68f287e276a57
 MISC metadata.xml 760 RMD160 4ef5d149f44169242bf9425d6c0b3a2e512fe0a1 SHA1 4c0c294751b93851300fd03ea9121f6d9f36a8d2 SHA256 a753e7be3b3935681d6aa925d90c6eff98d764b8a8dbf30ed0dfc4046df39def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPGqRWAAoJEF0huFKJUZL54iMP/04++cuzXoDQRmLbW06wwFXo
-pva9l8bo+XkS/c5g6vYcQgReq2OmfGHxnMAFO8jJWX4PUxxlH89H94pRkQc58hWR
-d4FXGPiGOont8WDtMmfpDblA6KwLNH+n7ofscmyN1t/qOkGe173AXAOX7BLcIEqJ
-WGO8pMvWqTHUvmo/Hh7P+Twn2W5LgXtmxOSxqapDSoR9BnKVj9eXWFPaJRgLkhO5
-EmUYhhbbmdYnRm/YHK1SYtRiMI9Ou2mV5ymQasa+Z8jTkD7YmHUdKvf0Ga3Ut6qw
-zvmKkFWtI5GGeTVZyHVEwm715M7WpZtCIr9FXZ6IdsNAXVC53q/CsWpkf2yoSWu7
-83SPkgW6eIYtXq9yRFxwukPn8mCs/Hhg1dzGC6uNkh57B9LCLlVmbc8dXSVhNV+A
-wQV9WG76B7FnfWEFaKqY2vSQrdkYXbK4jsK4DfGaL9cqjoxUl5NXaOPwMC4ePl4J
-Yg9MSmBwAU44pP5c1o3lSII1QpDeGVj2AldZGw1IPZ7Xvg9hZDtnrCorrhOerVBS
-O2MOpb8g74Nakmav4HC7INXS/R9v/FVN33HIxuefNw35DyW4kNNqcxlea9b4j8tn
-9Y7tOrGrG26xwlA9NYzVTdxbb5Ft69HkJGYOME6TJX8X963FazBBGWKVhYIHjLFb
-V78shEvaymQwB1bPQ46M
-=eeZ2
+iQIcBAEBCAAGBQJPGqkBAAoJEF0huFKJUZL5Z6kQAIBxFM4ND4qBZTxzmxIM4qbc
+CAl4Td4vkNAO4I5SFnawXsd/3+fFoocl2pHen2MmQbD06yep58HConVOAXiUme+C
++w2gH/WCKy1ZA/+HxOSWPnLZg6YbLSHnm2lH/Z5vbaojbbEuMFj+z63lM/sLLlY+
+8vddNE/zoSokV5HEQHAQ/R/h+mq+BriUVWnqzSJDyAPADvBRYtT2JuYZknkeczun
+rgfagYfDpEq5jOwNSnOv5iDIF5QWjTaKbGXZfedsOzSUl1/07GEDhuQXaJSQZIP6
+VXaMb467SDM+qGpPip8ZlIR9g4ik9Gvn9xH2pp0SZKZ/FYbo3gGuGaq1sHPRRTdM
+dOdGzrjQSJ8xgOvezCam2mUfEorGjMRWkX4aRwVxs+coR7b14bImNtAhVPcJvGIX
+wamH4kt8FTexlSqTVgZVU9UEW/2OrBVNs73XP6HTBHefJDrqiVrlk4ZIeFtn7iHn
+JN9KiOWows2KEjqBlCmLORXrdoDJlSuSpDAUiNXxndocULXDb2b7CuxhuzhIGCPk
+y9lzBGiJnuaYO+ngvGkmwUEbBpmDQWEFXoWNTMnfGqxRkLEogC0k66tndB7FZO5Y
+3Tgfm4xzb6XvDkB2tANk5Fi4r61qb3LbiEdmxyR06N1Rhx1hRqBRSXUchjRVCVGS
+sclUTaXvyOfiBo0Oi9lC
+=3/ev
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf/files/4.2.6-autotools.patch b/sci-libs/hdf/files/4.2.6-autotools.patch
index 67b0d279d8c5..994bcd264ac4 100644
--- a/sci-libs/hdf/files/4.2.6-autotools.patch
+++ b/sci-libs/hdf/files/4.2.6-autotools.patch
@@ -30,7 +30,7 @@
  AC_ARG_WITH([szlib],
              [AC_HELP_STRING([--with-szlib=DIR],
                              [Use szlib library [default=no]])],,
-@@ -702,7 +687,7 @@
+@@ -702,7 +688,7 @@
  dnl ======================================================================
  dnl Libtool initialization
  dnl ======================================================================
@@ -39,7 +39,7 @@
  LT_OUTPUT
  
  dnl ======================================================================
-@@ -780,11 +765,6 @@
+@@ -780,11 +766,6 @@
  dnl ------------------------------------------------------------------------
  dnl Check to see if libtool has enabled shared libraries. Set a conditional
  dnl as some Makefiles will build based on availability of shared libraries.
@@ -51,7 +51,18 @@
  
  dnl ------------------------------------------------------------------------
  dnl Specify shared library extension the host machine should recognize.
-@@ -841,26 +821,7 @@
+@@ -814,10 +795,6 @@
+ dnl Report anything stripped as a flag in CFLAGS and 
+ dnl only the compiler in CC_VERSION.
+ CC_NOFLAGS=`echo $CC | sed 's/ -.*//'`
+-CFLAGS_TO_ADD=`echo $CC | grep - | sed 's/.* -/-/'`
+-if test -n $CFLAGS_TO_ADD; then
+-  CFLAGS="$CFLAGS_TO_ADD$CFLAGS"
+-fi
+ 
+ if `echo $CC_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
+   CC_VERSION="$CC_NOFLAGS"
+@@ -841,26 +818,7 @@
  dnl Strip anything that looks like a flag off of $F77
  dnl Report anything stripped as a flag in RFLAGS and 
  dnl only the compiler in F77_VERSION.