diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-05-20 00:52:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-05-20 00:56:28 +0200 |
| commit | 97b643ac862d0d6d0a305a7fd82fd20dfb3dbf72 (patch) | |
| tree | 39d968d088d48f30b69ccae8a16398865469fbfd /external | |
| parent | d4085dbf35c95cd030bc4b74c7235e90d7c2bff4 (diff) | |
libetonyek: fix windows build
Putting source files into sub-directories is not really supported by
autotools apparently.
Change-Id: I6f0ff7e0ee0c2c4b59fb670a3cbaa9723b655d1f
Diffstat (limited to 'external')
| -rw-r--r-- | external/libetonyek/ExternalProject_libetonyek.mk | 1 | ||||
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 1 | ||||
| -rw-r--r-- | external/libetonyek/win_build.patch.1 | 13 |
3 files changed, 15 insertions, 0 deletions
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 3de8605e52bf..4fd48b1b5f58 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -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)" \ diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 01f35c35fd7e..4706d028639c 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -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: diff --git a/external/libetonyek/win_build.patch.1 b/external/libetonyek/win_build.patch.1 new file mode 100644 index 000000000000..261167bec96c --- /dev/null +++ b/external/libetonyek/win_build.patch.1 @@ -0,0 +1,13 @@ +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 |