[vlc-commits] contrib: gsm: enforce CFLAGS

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jun 20 11:34:13 2012 +0200| [d3c89a4f2f30bfd13882eb4b9496c5be041c40f6] | committer: Rafaël Carré

contrib: gsm: enforce CFLAGS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3c89a4f2f30bfd13882eb4b9496c5be041c40f6
---

 contrib/src/gsm/rules.mak |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/contrib/src/gsm/rules.mak b/contrib/src/gsm/rules.mak
index c7cba7a..38553d3 100644
--- a/contrib/src/gsm/rules.mak
+++ b/contrib/src/gsm/rules.mak
@@ -11,14 +11,11 @@ gsm: libgsm_$(GSM_VERSION).tar.gz .sum-gsm
 	$(UNPACK)
 	mv gsm-1.0-* libgsm_$(GSM_VERSION)
 	$(APPLY) $(SRC)/gsm/gsm-cross.patch
+	sed -e 's/^CFLAGS.*=/CFLAGS+=/' -i.orig libgsm_$(GSM_VERSION)/Makefile
 	$(MOVE)
-ifdef HAVE_DARWIN_OS
-	(cd $@; sed -e 's%-O2%-O2\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%# LDFLAGS >=%LDFLAGS >-= $(EXTRA_LDFLAGS)%' -e 's%gcc%$(CC)%' -i.orig  Makefile)
-endif
-	(cd $@; sed -i -e 's%-O2%-O2 -fPIC%' Makefile)
 
 .gsm: gsm
-	cd $< && $(HOSTVARS) $(MAKE)
+	cd $< && $(HOSTVARS_PIC) $(MAKE)
 	mkdir -p "$(PREFIX)/include/gsm" "$(PREFIX)/lib"
 	cp $</inc/gsm.h "$(PREFIX)/include/gsm/"
 	cp $</lib/libgsm.a "$(PREFIX)/lib/"