From beeaf379b101ed72a6d57941703d0638bd088deb Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 8 Jun 2013 00:55:12 +0200 Subject: [PATCH] HaikuDevel: Fix copying the build feature headers We have to use actual targets that cause the respective download and extract the packages. Otherwise the build fails when the packages haven't been extracted yet. --- build/jam/packages/HaikuDevel | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/build/jam/packages/HaikuDevel b/build/jam/packages/HaikuDevel index 843f986ae0..763b7815a7 100644 --- a/build/jam/packages/HaikuDevel +++ b/build/jam/packages/HaikuDevel @@ -71,10 +71,13 @@ AddHeaderDirectoryToPackage compatibility gnu : gnu ; AddHeaderDirectoryToPackage libs termcap : 3rdparty ; AddHeaderDirectoryToPackage libs tiff : 3rdparty ; -CopyDirectoryToPackage develop headers : - [ FDirName $(HAIKU_FREETYPE_DIR) develop headers 3rdparty ] ; -CopyDirectoryToPackage develop headers : $(HAIKU_JPEG_HEADERS) : 3rdparty ; -CopyDirectoryToPackage develop headers : $(HAIKU_LIBPNG_HEADERS) : 3rdparty ; +CopyDirectoryToPackage develop headers 3rdparty + : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) + : freetype2 : : isTarget ; +CopyDirectoryToPackage develop headers : $(HAIKU_JPEG_HEADERS_DEPENDENCY) + : 3rdparty : : isTarget ; +CopyDirectoryToPackage develop headers : $(HAIKU_LIBPNG_HEADERS_DEPENDENCY) + : 3rdparty : : isTarget ; # cpp headers if $(HAIKU_GCC_VERSION[1]) = 2 { @@ -85,10 +88,13 @@ if $(HAIKU_GCC_VERSION[1]) = 2 { # OpenGL headers if $(TARGET_ARCH) = x86 { + local mesaGlHeaders = [ FDirName $(HAIKU_MESA_HEADERS) GL ] ; + mesaGlHeaders = $(mesaGlHeaders:G=$(HAIKU_MESA_HEADERS_DEPENDENCY:G)) ; + Depends $(mesaGlHeaders) : $(HAIKU_MESA_HEADERS_DEPENDENCY) ; CopyDirectoryToPackage $(developDirTokens) headers os opengl - : [ FDirName $(HAIKU_MESA_HEADERS) GL ] ; + : $(mesaGlHeaders) : : : isTarget ; CopyDirectoryToPackage $(developDirTokens) headers os opengl - : [ FDirName $(HAIKU_GLU_HEADERS) GL ] ; + : $(HAIKU_GLU_HEADERS_DEPENDENCY) : : : isTarget ; } BuildHaikuPackage $(haikuDevelPackage) : haiku_devel ;