diff options
author | asau <asau> | 2010-04-24 21:27:36 +0000 |
---|---|---|
committer | asau <asau> | 2010-04-24 21:27:36 +0000 |
commit | a33064ac0ef9001caa02a6030d7d152ed080b2c7 (patch) | |
tree | b27f99c727457f1433444b459c05dd4dd06e6364 /devel/hdf5 | |
parent | 52da27a61557ccfee9bde55c84fbf0ac2b0c8ff5 (diff) | |
download | pkgsrc-a33064ac0ef9001caa02a6030d7d152ed080b2c7.tar.gz |
Don't reverse CPPFLAGS.
Submitted by Taylor Campbell in PR 42757
Diffstat (limited to 'devel/hdf5')
-rw-r--r-- | devel/hdf5/distinfo | 6 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-ab | 23 | ||||
-rw-r--r-- | devel/hdf5/patches/patch-ac | 20 |
3 files changed, 38 insertions, 11 deletions
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo index 88139a6cdba..df03f29bfb1 100644 --- a/devel/hdf5/distinfo +++ b/devel/hdf5/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.25 2009/11/15 15:50:50 drochner Exp $ +$NetBSD: distinfo,v 1.26 2010/04/24 21:27:36 asau Exp $ SHA1 (hdf5-1.6.10.tar.gz) = ccac439841977ab4e460fcb4c1fc2c2692a841d7 RMD160 (hdf5-1.6.10.tar.gz) = 7fd773f80265b5d8afc5c5765c499c22bd22f0c8 Size (hdf5-1.6.10.tar.gz) = 7435318 bytes SHA1 (patch-aa) = 8e02e2b5decde21bb7d223f3870330832db399ba -SHA1 (patch-ab) = aa4911184b72d4818f6e65d3adf86110db9bd379 -SHA1 (patch-ac) = 77e3762e4e41274550cb1a25f4a1c2ffaa45dcdf +SHA1 (patch-ab) = 8bb87d50b6c54f9fb2de8f9d21fb28e326b1e55d +SHA1 (patch-ac) = 46d224106ee34e2550cec708feffc802d6997bca SHA1 (patch-ad) = 0b58c169e0d12cc25fc6206fc49086a89d2836b7 SHA1 (patch-ba) = 1ba84ee22c3307100a2c8d3df4dfb2037be8e773 SHA1 (patch-bb) = bcfd87df515d64471f881d4d10c894d89a6bc56e diff --git a/devel/hdf5/patches/patch-ab b/devel/hdf5/patches/patch-ab index 88d8f174b7d..58d9deae57a 100644 --- a/devel/hdf5/patches/patch-ab +++ b/devel/hdf5/patches/patch-ab @@ -1,12 +1,27 @@ -$NetBSD: patch-ab,v 1.8 2007/09/25 01:22:15 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.9 2010/04/24 21:27:36 asau Exp $ Adds missing -lsocket needed on solaris for socket(), bind(), and friends. +Unreverses order of CPPFLAGS. ---- configure.in.orig 2007-08-16 12:13:34.000000000 -0400 -+++ configure.in 2007-09-24 08:44:58.668063000 -0400 -@@ -675,4 +675,5 @@ +--- configure.in.orig 2009-11-10 21:02:05.000000000 +0300 ++++ configure.in 2010-04-25 01:12:31.000000000 +0400 +@@ -668,6 +668,7 @@ + if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then dnl ...for Solaris + AC_CHECK_LIB([socket], [socket]) AC_CHECK_LIB([nsl], [xdr_int]) fi + +@@ -2172,9 +2173,9 @@ + d="-I${ROOT}/${d}" + ;; + esac +- TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS" ++ TEMP_CPPFLAGS="$TEMP_CPPFLAGS $d" + done +- CPPFLAGS=$TEMP_CPPFLAGS ++ CPPFLAGS="$TEMP_CPPFLAGS" + fi + + dnl ---------------------------------------------------------------------- diff --git a/devel/hdf5/patches/patch-ac b/devel/hdf5/patches/patch-ac index 00a68960584..b9c89400657 100644 --- a/devel/hdf5/patches/patch-ac +++ b/devel/hdf5/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.10 2008/09/11 10:27:52 adam Exp $ +$NetBSD: patch-ac,v 1.11 2010/04/24 21:27:36 asau Exp $ ---- configure.orig 2008-02-01 04:08:54.000000000 +0100 -+++ configure -@@ -8822,6 +8822,77 @@ fi +--- configure.orig 2009-11-10 21:11:34.000000000 +0300 ++++ configure 2010-04-25 01:14:37.000000000 +0400 +@@ -8808,6 +8808,77 @@ if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then @@ -80,3 +80,15 @@ $NetBSD: patch-ac,v 1.10 2008/09/11 10:27:52 adam Exp $ { echo "$as_me:$LINENO: checking for xdr_int in -lnsl" >&5 echo $ECHO_N "checking for xdr_int in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_xdr_int+set}" = set; then +@@ -32292,9 +32363,9 @@ + d="-I${ROOT}/${d}" + ;; + esac +- TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS" ++ TEMP_CPPFLAGS="$TEMP_CPPFLAGS $d" + done +- CPPFLAGS=$TEMP_CPPFLAGS ++ CPPFLAGS="$TEMP_CPPFLAGS" + fi + + |