From 0cb3f7092620ff73abc6daadd866a4e07117bd37 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 1 Sep 2013 14:30:28 +0200
Subject: [PATCH] Revert "Fix build problems of btrfs and packagefs for
 x86_64."

This reverts commit f272e63f393449d3a816970ca632764895a78cd6.
---
 src/add-ons/kernel/file_systems/btrfs/Jamfile     | 1 +
 src/add-ons/kernel/file_systems/packagefs/Jamfile | 4 ++--
 src/system/kernel/Jamfile                         | 2 --
 src/system/kernel/lib/zlib/Jamfile                | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/btrfs/Jamfile b/src/add-ons/kernel/file_systems/btrfs/Jamfile
index 4cdc5a4cda..dc246b44f9 100644
--- a/src/add-ons/kernel/file_systems/btrfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/btrfs/Jamfile
@@ -18,4 +18,5 @@ KernelAddon btrfs :
 	DirectoryIterator.cpp
 	Inode.cpp
 	Volume.cpp
+	: kernel_libz.a
 ;
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index ccbc4c51cc..d03b2a8236 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
@@ -123,7 +123,7 @@ KernelAddon packagefs
 	$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
 	$(libSharedSources)
 
-	: $(TARGET_KERNEL_LIBSUPC++)
+	: $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a
 ;
 
 
diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile
index d22a28bf7d..551317d75b 100644
--- a/src/system/kernel/Jamfile
+++ b/src/system/kernel/Jamfile
@@ -128,7 +128,6 @@ KernelLd kernel_$(TARGET_ARCH) :
 	kernel_lib_posix.o
 	kernel_lib_posix_arch_$(TARGET_ARCH).o
 	kernel_misc.o
-	kernel_zlib.o
 
 	$(TARGET_KERNEL_LIBSUPC++)
 
@@ -171,7 +170,6 @@ if $(HAIKU_ARCH) = x86_64 {
 		kernel_lib_posix.o
 		kernel_lib_posix_arch_$(TARGET_ARCH).o
 		kernel_misc.o
-		kernel_zlib.o
 
 		$(TARGET_KERNEL_LIBSUPC++)
 
diff --git a/src/system/kernel/lib/zlib/Jamfile b/src/system/kernel/lib/zlib/Jamfile
index c41149b950..8017d685c0 100644
--- a/src/system/kernel/lib/zlib/Jamfile
+++ b/src/system/kernel/lib/zlib/Jamfile
@@ -17,7 +17,7 @@ LOCATE on [ FGristFiles $(zlibSources) ] = $(zlibSourceDirectory) ;
 Depends [ FGristFiles $(zlibSources) ]
 	: [ BuildFeatureAttribute zlib : sources ] ;
 
-KernelMergeObject kernel_zlib.o :
+KernelStaticLibrary kernel_libz.a :
 	$(zlibSources)
-	: $(TARGET_KERNEL_PIC_CCFLAGS)
+	: -fno-pic
 	;