[haiku-commits] Re: haiku: hrev47256 - in src: system/boot/loader/file_systems/packagefs add-ons/kernel/file_systems/packagefs kits/network/libnetapi

  • From: Ingo Weinhold <ingo_weinhold@xxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 25 May 2014 09:53:04 +0200

On 24.05.2014 20:27, zooey@xxxxxxxxxxxxxxx wrote:
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile 
b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index 47e4b21..e79647a 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -6,7 +6,7 @@ UsePrivateKernelHeaders ;
  UsePrivateHeaders package shared storage ;


-local subDirs =
+local subDirs =
        indices
        nodes
        package
@@ -106,7 +106,8 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1 =

  Includes
        [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
-               $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
+               $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
+               ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
        : [ BuildFeatureAttribute zlib : headers ] ;

  local libSharedSources =
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile 
b/src/system/boot/loader/file_systems/packagefs/Jamfile
index 5a954a6..3b9433b 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -51,8 +51,6 @@ BootStaticLibrary boot_packagefs :
        : -fno-pic
  ;

-Includes [
-       FGristFiles ZlibCompressionBase.cpp package/hpkg/ZlibCompressor.h
-               shared/ZlibDecompressor.h
-       ]
+Includes [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
+               ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
        : [ BuildFeatureAttribute zlib : headers ] ;

It wasn't correct before, because "ZlibDecompressor.h" -- i.e. without the "shared/" -- should be listed, since the name must match exactly what jam finds in the "#include <...>" directives. Generally speaking, it is necessary to declare the dependency only for the files that directly include a zlib header.

That being said, there's a jam bug that causes depends or includes declarations not to work correctly in some situations. I don't know whether this applies here.

CU, Ingo


Other related posts: