vlc | branch: master | Rafaël Carré <[email protected]> | Wed Jun 20 11:42:33 2012 +0200| [42a7f46de26cdc465e50d33ddb3587b6bccffe83] | committer: Rafaël Carré
contrib: gpg-error: use CPPFLAGS when processing errno.h > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42a7f46de26cdc465e50d33ddb3587b6bccffe83 --- contrib/src/gpg-error/cppflags.patch | 11 +++++++++++ contrib/src/gpg-error/rules.mak | 2 ++ 2 files changed, 13 insertions(+) diff --git a/contrib/src/gpg-error/cppflags.patch b/contrib/src/gpg-error/cppflags.patch new file mode 100644 index 0000000..c168e5a --- /dev/null +++ b/contrib/src/gpg-error/cppflags.patch @@ -0,0 +1,11 @@ +--- libgpg-error/src/Makefile.am.orig 2012-06-20 11:39:51.650987881 +0200 ++++ libgpg-error/src/Makefile.am 2012-06-20 11:40:09.266987882 +0200 +@@ -138,7 +138,7 @@ + # It is correct to use $(CPP). We want the host's idea of the error codes. + mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers) + $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@ +- $(CPP) $(extra_cppflags) _$@ | grep GPG_ERR_ | \ ++ $(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \ + $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ + -rm _$@ + diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak index 92cfe09..9e948a5 100644 --- a/contrib/src/gpg-error/rules.mak +++ b/contrib/src/gpg-error/rules.mak @@ -12,9 +12,11 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error ifdef HAVE_WIN32 $(APPLY) $(SRC)/gpg-error/windres-make.patch endif + $(APPLY) $(SRC)/gpg-error/cppflags.patch $(MOVE) .gpg-error: libgpg-error + $(RECONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-nls --disable-shared --disable-languages cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
