Kaydet (Commit) 97b643ac authored tarafından Michael Stahl's avatar Michael Stahl

libetonyek: fix windows build

Putting source files into sub-directories is not really supported by
autotools apparently.

Change-Id: I6f0ff7e0ee0c2c4b59fb670a3cbaa9723b655d1f
üst d4085dbf
......@@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
$(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
......
......@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/assert.patch \
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
))
# vim: set noet sw=4 ts=4:
Fix the windows build - fix libtool
--- libetonyek/ltmain.sh.orig 2015-05-20 00:47:55.378800000 +0200
+++ libetonyek/ltmain.sh 2015-05-20 00:47:33.648000000 +0200
@@ -3722,6 +3722,8 @@
sleep 2
done
fi
+ # Cygwin ar.exe does not create directories for the objects!
+ mkdir -p $f_ex_an_ar_dir/contexts
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
if test "$lock_old_archive_extraction" = yes; then
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment