vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue May 5 17:07:55 2015 +0200| [9514c503a269c5dba1062870319ea9da1f93e466] | committer: Jean-Baptiste Kempf
Contribs: don't build gpg-error executable > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9514c503a269c5dba1062870319ea9da1f93e466 --- contrib/src/gpg-error/no-executable.patch | 22 ++++++++++++++++++++++ contrib/src/gpg-error/rules.mak | 1 + 2 files changed, 23 insertions(+) diff --git a/contrib/src/gpg-error/no-executable.patch b/contrib/src/gpg-error/no-executable.patch new file mode 100644 index 0000000..da7b8cc --- /dev/null +++ b/contrib/src/gpg-error/no-executable.patch @@ -0,0 +1,22 @@ +--- libgpg-error/Makefile.am.orig 2015-05-05 16:59:07.513558034 +0200 ++++ libgpg-error/Makefile.am 2015-05-05 16:59:18.150414495 +0200 +@@ -39,7 +39,7 @@ + doc = + endif + +-SUBDIRS = m4 src $(doc) tests po $(lang_subdirs) ++SUBDIRS = m4 src $(doc) $(lang_subdirs) + + + dist-hook: gen-ChangeLog +--- libgpg-error/src/Makefile.am.orig 2014-10-25 14:42:43.000000000 +0200 ++++ libgpg-error/src/Makefile.am 2015-05-05 16:59:40.887486960 +0200 +@@ -31,7 +31,7 @@ + + localedir = $(datadir)/locale + +-bin_PROGRAMS = gpg-error ++bin_PROGRAMS = + + if HAVE_W32_SYSTEM + noinst_PROGRAMS = gen-w32-lock-obj diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak index acfcea8..4a4c642 100644 --- a/contrib/src/gpg-error/rules.mak +++ b/contrib/src/gpg-error/rules.mak @@ -13,6 +13,7 @@ ifdef HAVE_WIN32 $(APPLY) $(SRC)/gpg-error/windres-make.patch endif $(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch + $(APPLY) $(SRC)/gpg-error/no-executable.patch $(MOVE) cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h ifdef HAVE_IOS _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
