Add a feature for expat.
* Icon-O-Matic and Cortex are dependent on the feature. * remove expat lib from the build and from the tree. * expat package is added to regular builds.
This commit is contained in:
@@ -537,6 +537,23 @@ if [ IsPackageAvailable ncurses_devel ] {
|
||||
}
|
||||
|
||||
|
||||
# expat
|
||||
if [ IsPackageAvailable expat_devel ] {
|
||||
ExtractBuildFeatureArchives expat :
|
||||
file: base expat
|
||||
runtime: lib
|
||||
file: devel expat_devel
|
||||
depends: base
|
||||
library: $(developLibDir)/libexpat.so.1
|
||||
headers: $(developHeadersDir)
|
||||
;
|
||||
|
||||
EnableBuildFeatures expat ;
|
||||
} else {
|
||||
Echo "expat support not available on $(TARGET_PACKAGING_ARCH)" ;
|
||||
}
|
||||
|
||||
|
||||
# GPL add-ons
|
||||
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
|
||||
EnableBuildFeatures gpl ;
|
||||
|
||||
@@ -17,7 +17,7 @@ SYSTEM_APPS += [ FFilterByBuildFeatures
|
||||
CodyCam
|
||||
GLInfo@mesa
|
||||
HaikuDepot
|
||||
Icon-O-Matic Installer LaunchBox
|
||||
Icon-O-Matic@expat Installer LaunchBox
|
||||
Magnify Mail MediaConverter MediaPlayer MidiPlayer
|
||||
PackageInstaller People PoorMan PowerStatus
|
||||
RemoteDesktop
|
||||
@@ -50,7 +50,7 @@ SYSTEM_PREFERENCES += [ FFilterByBuildFeatures
|
||||
] ;
|
||||
|
||||
SYSTEM_DEMOS += [ FFilterByBuildFeatures
|
||||
Chart Clock Cortex FontDemo GLTeapot@mesa
|
||||
Chart Clock Cortex@expat FontDemo GLTeapot@mesa
|
||||
$(HAIKU_INCLUDE_TRADEMARKS)Haiku3d@mesa Mandelbrot OverlayImage Pairs
|
||||
PatchBay Playground Pulse Sudoku
|
||||
] ;
|
||||
|
||||
Reference in New Issue
Block a user