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.
This commit is contained in:
+13
-14
@@ -6,16 +6,6 @@ local libsolvSourceDirectory = [ FDirName $(libsolvSourceBaseDirectory) src ] ;
|
|||||||
local libsolvextSourceDirectory
|
local libsolvextSourceDirectory
|
||||||
= [ FDirName $(libsolvSourceBaseDirectory) ext ] ;
|
= [ 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 libsolvMajor = 0 ;
|
||||||
local libsolvMinor = 3 ;
|
local libsolvMinor = 3 ;
|
||||||
local libsolvPatch = 0 ;
|
local libsolvPatch = 0 ;
|
||||||
@@ -45,6 +35,16 @@ SubDirCcFlags -Wno-sign-compare -Wno-missing-prototypes ;
|
|||||||
|
|
||||||
# libsolv
|
# 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) ;
|
LOCATE on $(libsolvSources) = $(libsolvSourceDirectory) ;
|
||||||
Depends $(libsolvSources) : [ BuildFeatureAttribute libsolv : sources ] ;
|
Depends $(libsolvSources) : [ BuildFeatureAttribute libsolv : sources ] ;
|
||||||
|
|
||||||
@@ -55,16 +55,15 @@ BuildPlatformSharedLibrary libsolv_build.so
|
|||||||
$(libsolvSources)
|
$(libsolvSources)
|
||||||
;
|
;
|
||||||
|
|
||||||
UseHeaders $(libsolvSourceDirectory) ;
|
# libsolvext
|
||||||
|
|
||||||
|
UseHeaders $(libsolvextSourceDirectory) ;
|
||||||
|
|
||||||
local libsolvextSources = [ FGristFiles
|
local libsolvextSources = [ FGristFiles
|
||||||
solv_xfopen.c testcase.c
|
solv_xfopen.c testcase.c
|
||||||
repo_haiku.cpp
|
repo_haiku.cpp
|
||||||
] ;
|
] ;
|
||||||
|
|
||||||
|
|
||||||
# libsolvext
|
|
||||||
|
|
||||||
LOCATE on $(libsolvextSources) = $(libsolvextSourceDirectory) ;
|
LOCATE on $(libsolvextSources) = $(libsolvextSourceDirectory) ;
|
||||||
Depends $(libsolvextSources) : [ BuildFeatureAttribute libsolv : sources ] ;
|
Depends $(libsolvextSources) : [ BuildFeatureAttribute libsolv : sources ] ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user