From d5acb5a3ec0252900847e5d2f5444d4ba51e2f24 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 25 Jul 2017 15:45:00 +1000
Subject: add libtool dep for native packages using autotools

Partially built autotools suite can cause race condition
when plugins/native is included

fixes #1851
---
 plugins/native/libtool.mk | 1 -
 src/libtool.mk            | 2 ++
 src/pkgconf.mk            | 1 +
 src/protobuf.mk           | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/native/libtool.mk b/plugins/native/libtool.mk
index d4ee284..e183cb4 100644
--- a/plugins/native/libtool.mk
+++ b/plugins/native/libtool.mk
@@ -1,7 +1,6 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 PKG                  := libtool
-$(PKG)_TARGETS       := $(BUILD)
 $(PKG)_DEPS_$(BUILD) := autoconf automake
 
 define $(PKG)_BUILD_$(BUILD)
diff --git a/src/libtool.mk b/src/libtool.mk
index 34c3642..1ac02d8 100644
--- a/src/libtool.mk
+++ b/src/libtool.mk
@@ -1,5 +1,6 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
+# this pkg is the base for both src/libltdl and plugins/native/libtool
 PKG             := libtool
 $(PKG)_WEBSITE  := https://www.gnu.org/software/libtool/
 $(PKG)_DESCR    := GNU Libtool
@@ -10,6 +11,7 @@ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
+$(PKG)_TARGETS  := $(BUILD)
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://ftp.gnu.org/gnu/libtool/?C=M;O=D' | \
diff --git a/src/pkgconf.mk b/src/pkgconf.mk
index 5b46267..409e020 100644
--- a/src/pkgconf.mk
+++ b/src/pkgconf.mk
@@ -10,6 +10,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/$(PKG)/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS     :=
+$(PKG)_DEPS_$(BUILD) := libtool
 
 $(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, pkgconf/pkgconf, master)
 
diff --git a/src/protobuf.mk b/src/protobuf.mk
index 30bfd97..116289d 100644
--- a/src/protobuf.mk
+++ b/src/protobuf.mk
@@ -10,7 +10,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := gcc googlemock googletest zlib
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
-$(PKG)_DEPS_$(BUILD) := googlemock googletest
+$(PKG)_DEPS_$(BUILD) := googlemock googletest libtool
 
 define $(PKG)_UPDATE
     $(call MXE_GET_GITHUB_TAGS, google/protobuf, v)
-- 
cgit v0.12