fixed config to no download/compile third-parties every time

build.macos32x86/common/Makefile.extra

@@ -21,4 +21,7 @@ $(THIRDPARTYDIR):
 	mkdir -p $(THIRDPARTYDIR)
 
 $(THIRDPARTYOUTDIR): $(THIRDPARTYDIR)
-	mkdir -p $(THIRDPARTYOUTDIR)
+	mkdir -p $(THIRDPARTYOUTDIR)
+
+$(THIRDPARTYINSTALLDIR):
+	mkdir -p $(THIRDPARTYINSTALLDIR)

build.macos32x86/pharo.cog.spur/Makefile

@@ -10,7 +10,7 @@ COGDEFS:=-DPharoVM=1
 APPNAME:=Pharo
 APPNAMEDEF:=$(APPNAME)
 USEPLUGINASDYLIB:=TRUE
-THIRDPARTYLIBS:=pkgconfig libssh2 libgit2 pixman libpng cairo
+THIRDPARTYLIBS:=pkgconfig freetype2 libssh2 libgit2 pixman libpng cairo
 
 # Now include the Makefile proper, which is common to all Mac OS builds.
 #
@@ -19,7 +19,7 @@ include ../common/Makefile.app
 # third-party libraries
 #
 include ../third-party/pkgconfig/Makefile.lib
-# include ../third-party/freetype2/Makefile.lib # this is already there because of the dependency on FT2Plugin
+include ../third-party/freetype2/Makefile.lib
 include ../third-party/libssh2/Makefile.lib
 include ../third-party/libgit2/Makefile.lib
 include ../third-party/pixman/Makefile.lib

build.macos32x86/third-party/cairo/Makefile.lib

@@ -10,14 +10,14 @@ CAIROLIB:=$(THIRDPARTYINSTALLDIR)/$(CAIROLIBNAME)
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) cairo
 EXTRALIBS:=$(EXTRALIBS) $(CAIROLIB)
 PLUGINREQS:=$(THIRDPARTYLIBS)
 
-$(CAIRODIR): $(THIRDPARTYDIR)
+$(CAIRODIR)/configure: $(THIRDPARTYDIR)
 	curl -L $(CAIROURL) | tar x -C $(THIRDPARTYDIR)
+	touch $(CAIRODIR)/configure
 
-$(CAIROLIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(CAIRODIR) pkgconfig
+$(CAIROLIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(CAIRODIR)/configure pkgconfig
 	cd $(CAIRODIR) \
 		&& ./configure \
 			--prefix='$(THIRDPARTYOUTDIR)' \

build.macos32x86/third-party/freetype2/Makefile.lib

@@ -11,13 +11,13 @@ FREETYPE2LIB:=$(THIRDPARTYINSTALLDIR)/$(FREETYPE2LIBNAME)
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR) $(THIRDPARTYINCLUDEDIR)/freetype2
 EXTRALIBS:=$(EXTRALIBS) $(FREETYPE2LIB)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) freetype2
 PLUGINREQS:=$(PLUGINREQS) $(THIRDPARTYLIBS)
 
-$(FREETYPE2DIR): $(THIRDPARTYDIR)
+$(FREETYPE2DIR)/configure: $(THIRDPARTYDIR)
 	curl $(FREETYPE2URL) | tar x -C $(THIRDPARTYDIR)
+	touch $(FREETYPE2DIR)/configure
 
-$(FREETYPE2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(FREETYPE2DIR)
+$(FREETYPE2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(FREETYPE2DIR)/configure
 	cd $(FREETYPE2DIR) \
 		&& ./configure --prefix='$(THIRDPARTYOUTDIR)' CFLAGS='-arch i386' LDFLAGS='-arch i386 ' \
 		&& make \

build.macos32x86/third-party/libgit2/Makefile.lib

@@ -10,14 +10,14 @@ LIBGIT2LIB:=$(THIRDPARTYINSTALLDIR)/$(LIBGIT2LIBNAME)
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) libgit2
 EXTRALIBS:=$(EXTRALIBS) $(LIBGIT2LIB)
 PLUGINREQS:=$(THIRDPARTYLIBS)
 
-$(LIBGIT2DIR): $(THIRDPARTYDIR)
+$(LIBGIT2DIR)/CMakeLists.txt: $(THIRDPARTYDIR)
 	curl -L $(LIBGIT2URL) | tar x -C $(THIRDPARTYDIR)
+	touch $(LIBGIT2DIR)/CMakeLists.txt
 
-$(LIBGIT2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBGIT2DIR)
+$(LIBGIT2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBGIT2DIR)/CMakeLists.txt
 	cd $(LIBGIT2DIR) \
 		&& cmake \
 			-DCMAKE_INSTALL_PREFIX=$(THIRDPARTYOUTDIR) \

build.macos32x86/third-party/libpng/Makefile.lib

@@ -10,14 +10,14 @@ LIBPNGLIB:=$(THIRDPARTYINSTALLDIR)/$(LIBPNGLIBNAME)
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) libpng
 EXTRALIBS:=$(EXTRALIBS) $(LIBPNGLIB)
 PLUGINREQS:=$(THIRDPARTYLIBS)
 
-$(LIBPNGDIR): $(THIRDPARTYDIR)
+$(LIBPNGDIR)/configure: $(THIRDPARTYDIR)
 	curl -L $(LIBPNGURL) | tar x -C $(THIRDPARTYDIR)
+	touch $(LIBPNGDIR)/configure
 
-$(LIBPNGLIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBPNGDIR)
+$(LIBPNGLIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBPNGDIR)/configure
 	cd $(LIBPNGDIR) \
 		&& ./configure --prefix='$(THIRDPARTYOUTDIR)' CFLAGS='-arch i386' LDFLAGS='-arch i386' \
 		&& make \

build.macos32x86/third-party/libsdl2/Makefile.lib

@@ -10,14 +10,14 @@ LIBSDL2LIB:=$(THIRDPARTYINSTALLDIR)/$(LIBSDL2LIBNAME)
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) libsdl2
 EXTRALIBS:=$(EXTRALIBS) -undefined dynamic_lookup $(LIBSDL2LIB)
 PLUGINREQS:=$(PLUGINREQS) $(THIRDPARTYLIBS)
 
-$(LIBSDL2DIR): $(THIRDPARTYDIR)
+$(LIBSDL2DIR)/configure: $(THIRDPARTYDIR)
 	curl $(LIBSDL2URL) | tar x -C $(THIRDPARTYDIR)
+	touch $(LIBSDL2DIR)/configure
 
-$(LIBSDL2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBSDL2DIR)
+$(LIBSDL2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBSDL2DIR)/configure
 	cd $(LIBSDL2DIR) \
 		&& ./configure --prefix='$(THIRDPARTYOUTDIR)' CFLAGS='-arch i386' LDFLAGS='-arch i386' \
 		&& make \

build.macos32x86/third-party/libssh2/Makefile.lib

@@ -10,14 +10,14 @@ LIBSSH2LIB:=$(THIRDPARTYINSTALLDIR)/$(LIBSSH2LIBNAME)
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) libssh2
 EXTRALIBS:=$(EXTRALIBS) $(LIBSSH2LIB)
 PLUGINREQS:=$(THIRDPARTYLIBS)
 
-$(LIBSSH2DIR): $(THIRDPARTYDIR)
+$(LIBSSH2DIR)/configure: $(THIRDPARTYDIR)
 	curl -L $(LIBSSH2URL) | tar x -C $(THIRDPARTYDIR)
+	touch $(LIBSSH2DIR)/configure
 
-$(LIBSSH2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBSSH2DIR)
+$(LIBSSH2LIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(LIBSSH2DIR)/configure
 	cd $(LIBSSH2DIR) \
 		&& ./configure --prefix='$(THIRDPARTYOUTDIR)' CFLAGS='-arch i386' LDFLAGS='-arch i386' \
 		&& make \

build.macos32x86/third-party/pixman/Makefile.lib

@@ -10,14 +10,14 @@ PIXMANLIB:=$(THIRDPARTYINSTALLDIR)/$(PIXMANLIBNAME)
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) pixman
 EXTRALIBS:=$(EXTRALIBS) $(PIXMANLIB)
 PLUGINREQS:=$(THIRDPARTYLIBS)
 
-$(PIXMANDIR): $(THIRDPARTYDIR)
+$(PIXMANDIR)/configure: $(THIRDPARTYDIR)
 	curl -L $(PIXMANURL) | tar x -C $(THIRDPARTYDIR)
+	touch $(PIXMANDIR)/configure
 
-$(PIXMANLIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(PIXMANDIR)
+$(PIXMANLIB): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(PIXMANDIR)/configure
 	cd $(PIXMANDIR) \
 		&& ./configure --prefix='$(THIRDPARTYOUTDIR)' CFLAGS='-arch i386' LDFLAGS='-arch i386' \
 		&& make \

build.macos32x86/third-party/pkgconfig/Makefile.lib

@@ -10,18 +10,20 @@ PKGCONFIGLIB:=$(THIRDPARTYLIBDIR)/pkgconfig
 
 # ensure third-party library is built and recognised by plugins
 INCDIRS:=$(INCDIRS) $(THIRDPARTYINCLUDEDIR)
-THIRDPARTYLIBS:=$(THIRDPARTYLIBS) pkgconfig
 EXTRALIBS:=$(EXTRALIBS) $(PKGCONFIGLIB)
 PLUGINREQS:=$(THIRDPARTYLIBS)
 
 # export this values if pkg_config is included
 PKG_CONFIG:=$(PKGCONFIGBIN)
 PKG_CONFIG_PATH:=$(PKGCONFIGLIB)
 
-$(PKGCONFIGDIR): $(THIRDPARTYDIR)
+$(info $$THIRDPARTYLIBS: $THIRDPARTYLIBS)
+
+$(PKGCONFIGDIR)/configure: $(THIRwDPARTYDIR)
 	curl -L $(PKGCONFIGURL) | tar x -C $(THIRDPARTYDIR)
+	touch $(PKGCONFIGDIR)/configure
 
-$(PKGCONFIGBIN): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(PKGCONFIGDIR)
+$(PKGCONFIGBIN): $(THIRDPARTYINSTALLDIR) $(THIRDPARTYOUTDIR) $(PKGCONFIGDIR)/configure
 	cd $(PKGCONFIGDIR) \
 		&& ./configure --prefix='$(THIRDPARTYOUTDIR)' CFLAGS=' -std=gnu89 -arch i386' LDFLAGS='-arch i386' \
 		&& make \