New commits:
commit 67dda5d493a924b54420ea49dbd80d3bfee13934
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
curl: improve -DPIC in CFLAGS fix
Remove all occurrences of -DPIC
Prefer pure bash solution over spawning grep
Improves fix for #537
diff --git a/ftp/curl/BUILD b/ftp/curl/BUILD
index b1a7eb0..5c046dd 100755
--- a/ftp/curl/BUILD
+++ b/ftp/curl/BUILD
@@ -2,8 +2,8 @@ if [[ "$CURL_SSL" == "none" ]]; then
OPTS="--without-gnutls --without-nss --without-ssl $OPTS"
fi &&
-if echo "$CFLAGS" | grep -q -- '-DPIC'; then
- CFLAGS="${CFLAGS/-DPIC/}" &&
+if [[ "$CFLAGS" != "${CFLAGS//-DPIC/}" ]]; then
+ CFLAGS="${CFLAGS//-DPIC/}" &&
CPPFLAGS="$CPPFLAGS -DPIC "
fi &&
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 53ba4f3..41b2ead 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,7 @@
+2013-05-10 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: Remove all occurrences of -DPIC
+ Prefer pure bash solution over spawning grep
+
2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Fix -DPIC from CFLAGS -> CPPFLAGS (Bug #537)
[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (67dda5d493a924b54420ea49dbd80d3bfee13934),
Remko van der Vossen, 05/10/2013