[haiku-commits] BRANCH HaikuPM-github.package-management [9abd3e6] in src: system/boot/loader/file_systems/packagefs add-ons/kernel/file_systems/packagefs system/boot/platform/generic add-ons/kernel/file_systems/btrfs

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 6 May 2013 20:15:34 +0200 (CEST)

added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 7c6bff17340e2f6697a22f1ce56c18fa009d4d2e
new head: 9abd3e6f53602c5fc3ad5676992bc27d40640e1b
overview: https://github.com/haiku/HaikuPM/compare/7c6bff1...9abd3e6

----------------------------------------------------------------------------

9abd3e6: Fix race condition during build of some file systems.
  
  * make sure the zlib package is available before trying to use zlib.h

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Commit:      9abd3e6f53602c5fc3ad5676992bc27d40640e1b
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Mon May  6 18:01:40 2013 UTC

----------------------------------------------------------------------------

4 files changed, 15 insertions(+)
src/add-ons/kernel/file_systems/btrfs/Jamfile         | 3 +++
src/add-ons/kernel/file_systems/packagefs/Jamfile     | 2 ++
src/system/boot/loader/file_systems/packagefs/Jamfile | 7 +++++++
src/system/boot/platform/generic/Jamfile              | 3 +++

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/file_systems/btrfs/Jamfile 
b/src/add-ons/kernel/file_systems/btrfs/Jamfile
index dee198e..dc246b4 100644
--- a/src/add-ons/kernel/file_systems/btrfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/btrfs/Jamfile
@@ -5,6 +5,9 @@ UsePrivateHeaders shared storage ;
 UsePrivateKernelHeaders ;
 UseBuildFeatureHeaders zlib ;
 
+Includes [ FGristFiles Inode.cpp ]
+       : [ BuildFeatureAttribute zlib : headers ] ;
+
 KernelAddon btrfs :
        kernel_interface.cpp
        Attribute.cpp
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile 
b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index 2fc47ee..70c5732 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -75,6 +75,8 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
        ZlibDecompressor.cpp
 ;
 
+Includes [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES) ]
+       : [ BuildFeatureAttribute zlib : headers ] ;
 
 local libSharedSources =
        NaturalCompare.cpp
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile 
b/src/system/boot/loader/file_systems/packagefs/Jamfile
index e75ce5d..bae8160 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -44,3 +44,10 @@ BootStaticLibrary boot_packagefs :
 
        : -fno-pic
 ;
+
+Includes [ 
+               FGristFiles PackageDataReader.cpp PackageDataReaderImpl.cpp 
+               ReaderImplBase.cpp ZlibCompressionBase.cpp ZlibDecompressor.cpp 
+       ] 
+       : [ BuildFeatureAttribute zlib : headers ] ;
+
diff --git a/src/system/boot/platform/generic/Jamfile 
b/src/system/boot/platform/generic/Jamfile
index 7cdf24a..0ffd7b2 100644
--- a/src/system/boot/platform/generic/Jamfile
+++ b/src/system/boot/platform/generic/Jamfile
@@ -11,3 +11,6 @@ BootStaticLibrary boot_platform_generic :
        video_splash.cpp
        : -fno-pic
 ;
+
+Includes [ FGristFiles video_splash.cpp ] 
+       : [ BuildFeatureAttribute zlib : headers ] ;


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management [9abd3e6] in src: system/boot/loader/file_systems/packagefs add-ons/kernel/file_systems/packagefs system/boot/platform/generic add-ons/kernel/file_systems/btrfs - HaikuPM-github . package-management