[Libreoffice-commits] core.git: external/libgltf

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk                    |    1 
 external/libgltf/patches/remove_config_h_in_dependencies.patch |   12 ++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 3bebda9cd3269d684a3b430e25f17951deaf3d3d
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Wed Jun 25 23:26:49 2014 +0200

    libgltf: remove dependencies of config.h.in
    
    It seems something is wrong with the files in the
    libgltf tarball (maybe wrong timestamps?), because
    config.h.in is always regenerated by make (autoheader).
    It causes build problems so just remove the deps for this time.
    
    Change-Id: I404c29673987d7c8f75ec8fe4978173593c75a2f

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 90f6ee2..e8c5133 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/libgltf_configure.patch \
+	external/libgltf/patches/remove_config_h_in_dependencies.patch \
 	external/libgltf/patches/init_scene_set_handle.patch \
 	external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch \
 	external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch \
diff --git a/external/libgltf/patches/remove_config_h_in_dependencies.patch b/external/libgltf/patches/remove_config_h_in_dependencies.patch
new file mode 100644
index 0000000..fae09e7
--- /dev/null
+++ b/external/libgltf/patches/remove_config_h_in_dependencies.patch
@@ -0,0 +1,12 @@
+diff -ur libgltf.org/Makefile.in libgltf/Makefile.in
+--- libgltf.org/Makefile.in	2014-06-25 23:16:52.417528674 +0200
++++ libgltf/Makefile.in	2014-06-25 23:16:56.493528501 +0200
+@@ -419,7 +419,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in: 
+ 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ 	rm -f stamp-h1
+ 	touch $@