i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix build problems of btrfs and packagefs for x86_64."

Browse Source 
This reverts commit f272e63f393449d3a816970ca632764895a78cd6.
This commit is contained in:
Oliver Tappe
2013-09-02 12:03:05 +02:00
parent 83462cc28d
commit 0cb3f70926
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/btrfs/Jamfile
+1
View File
@@ -18,4 +18,5 @@ KernelAddon btrfs :
DirectoryIterator.cpp DirectoryIterator.cpp
Inode.cpp Inode.cpp
Volume.cpp Volume.cpp
: kernel_libz.a
; ;
src/add-ons/kernel/file_systems/packagefs/Jamfile
+2 -2
View File
@@ -6,7 +6,7 @@ UsePrivateKernelHeaders ;
UsePrivateHeaders package shared storage ; UsePrivateHeaders package shared storage ;
local subDirs = local subDirs =
indices indices
nodes nodes
package package
@@ -123,7 +123,7 @@ KernelAddon packagefs
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
$(libSharedSources) $(libSharedSources)
: $(TARGET_KERNEL_LIBSUPC++) : $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a
; ;
src/system/kernel/Jamfile
-2
View File
@@ -128,7 +128,6 @@ KernelLd kernel_$(TARGET_ARCH) :
kernel_lib_posix.o kernel_lib_posix.o
kernel_lib_posix_arch_$(TARGET_ARCH).o kernel_lib_posix_arch_$(TARGET_ARCH).o
kernel_misc.o kernel_misc.o
kernel_zlib.o
$(TARGET_KERNEL_LIBSUPC++) $(TARGET_KERNEL_LIBSUPC++)
@@ -171,7 +170,6 @@ if $(HAIKU_ARCH) = x86_64 {
kernel_lib_posix.o kernel_lib_posix.o
kernel_lib_posix_arch_$(TARGET_ARCH).o kernel_lib_posix_arch_$(TARGET_ARCH).o
kernel_misc.o kernel_misc.o
kernel_zlib.o
$(TARGET_KERNEL_LIBSUPC++) $(TARGET_KERNEL_LIBSUPC++)
src/system/kernel/lib/zlib/Jamfile
+2 -2
View File
@@ -17,7 +17,7 @@ LOCATE on [ FGristFiles $(zlibSources) ] = $(zlibSourceDirectory) ;
Depends [ FGristFiles $(zlibSources) ] Depends [ FGristFiles $(zlibSources) ]
: [ BuildFeatureAttribute zlib : sources ] ; : [ BuildFeatureAttribute zlib : sources ] ;
KernelMergeObject kernel_zlib.o : KernelStaticLibrary kernel_libz.a :
$(zlibSources) $(zlibSources)
: $(TARGET_KERNEL_PIC_CCFLAGS) : -fno-pic
; ;