From a65099bbe401707176af28aee5547b19624d169c Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 5 Jul 2013 13:23:48 +0200
Subject: [PATCH] libsolv_build: fix build on gcc 2 Haiku

* Fix the "UseHeaders" invocation for libsolvext to use the correct
  directory.
* Reorder things slightly, merely for aesthetical reasons.
---
 src/build/libsolv/Jamfile | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/build/libsolv/Jamfile b/src/build/libsolv/Jamfile
index f73f7fa00d..07e4b45a64 100644
--- a/src/build/libsolv/Jamfile
+++ b/src/build/libsolv/Jamfile
@@ -6,16 +6,6 @@ local libsolvSourceDirectory = [ FDirName $(libsolvSourceBaseDirectory) src ] ;
 local libsolvextSourceDirectory
 	= [ FDirName $(libsolvSourceBaseDirectory) ext ] ;
 
-UseHeaders $(libsolvSourceDirectory) ;
-
-local libsolvSources = [ FGristFiles
-	bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c
-	solver.c solverdebug.c repo_solv.c repo_write.c evr.c pool.c
-	queue.c repo.c repodata.c repopage.c util.c policy.c solvable.c
-	transaction.c rules.c problems.c
-	chksum.c md5.c sha1.c sha2.c solvversion.c selection.c
-	] ;
-
 local libsolvMajor = 0 ;
 local libsolvMinor = 3 ;
 local libsolvPatch = 0 ;
@@ -45,6 +35,16 @@ SubDirCcFlags -Wno-sign-compare -Wno-missing-prototypes ;
 
 # libsolv
 
+UseHeaders $(libsolvSourceDirectory) ;
+
+local libsolvSources = [ FGristFiles
+	bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c
+	solver.c solverdebug.c repo_solv.c repo_write.c evr.c pool.c
+	queue.c repo.c repodata.c repopage.c util.c policy.c solvable.c
+	transaction.c rules.c problems.c
+	chksum.c md5.c sha1.c sha2.c solvversion.c selection.c
+	] ;
+
 LOCATE on $(libsolvSources) = $(libsolvSourceDirectory) ;
 Depends $(libsolvSources) : [ BuildFeatureAttribute libsolv : sources ] ;
 
@@ -55,16 +55,15 @@ BuildPlatformSharedLibrary libsolv_build.so
 	$(libsolvSources)
 	;
 
-UseHeaders $(libsolvSourceDirectory) ;
+# libsolvext
+
+UseHeaders $(libsolvextSourceDirectory) ;
 
 local libsolvextSources = [ FGristFiles
 	solv_xfopen.c testcase.c
 	repo_haiku.cpp
 	] ;
 
-
-# libsolvext
-
 LOCATE on $(libsolvextSources) = $(libsolvextSourceDirectory) ;
 Depends $(libsolvextSources) : [ BuildFeatureAttribute libsolv : sources ] ;