[haiku-commits] haiku: hrev45659 - build/jam
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 10 May 2013 22:52:32 +0200 (CEST)
hrev45659 adds 2 changesets to branch 'master'
old head: 215954e3e3ecb87542f584694ba050c7d0520d80
new head: ef0c2a820bf1f11f12584307200b7a5cf95c9642
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=ef0c2a8+%5E215954e
----------------------------------------------------------------------------
16a3940: HaikuImage: added or removed targets for x86_64
* add vesa.accelerant, vesa driver, ps2, isa, bios, generic_x86 for x86_64 too
* only have reiserfs, firewire, agp_gart targets for x86
* reverted hrev43950, liblocale alias shouldn't be needed anymore
ef0c2a8: HaikuImage: use the same HaikuImage Jamfile for x86 and x86_64
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 10 insertions(+), 23 deletions(-)
Jamfile | 6 +-----
build/jam/HaikuImage | 27 +++++++++------------------
############################################################################
Commit: 16a3940ccafe1383e45ff081ada241ab9435daad
URL: http://cgit.haiku-os.org/haiku/commit/?id=16a3940
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Fri May 10 20:42:10 2013 UTC
HaikuImage: added or removed targets for x86_64
* add vesa.accelerant, vesa driver, ps2, isa, bios, generic_x86 for x86_64 too
* only have reiserfs, firewire, agp_gart targets for x86
* reverted hrev43950, liblocale alias shouldn't be needed anymore
----------------------------------------------------------------------------
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index e2a5d84..afc4aa6 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -104,6 +104,7 @@ SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
#via.accelerant vmware.accelerant
}@ # x86
] ;
+SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures vesa.accelerant@x86_64
] ;
SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
PCXTranslator PNGTranslator PPMTranslator
@@ -122,7 +123,7 @@ SYSTEM_ADD_ONS_MEDIA = [ FFilterByBuildFeatures
usb_webcam.media_addon
video_producer_demo.media_addon
video_window_demo.media_addon
- firewire_dv.media_addon
+ firewire_dv.media_addon@x86
#legacy.media_addon
equalizer.media_addon
vst_host.media_addon
@@ -157,6 +158,7 @@ SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures
s3 vesa #via vmware
}@ # x86
] ;
+SYSTEM_ADD_ONS_DRIVERS_GRAPHICS += [ FFilterByBuildFeatures vesa@x86_64 ] ;
SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ice1712 usb_midi ;
SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
x86 @{
@@ -180,11 +182,11 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
] ;
SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
- ata@ata pci ps2@x86 isa@x86
- ide@ide scsi config_manager agp_gart usb firewire acpi@x86
+ ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
+ ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86
] ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs nfs4
- attribute_overlay write_overlay ntfs reiserfs udf googlefs ;
+ attribute_overlay write_overlay ntfs reiserfs@x86 udf googlefs ;
# wifi firmware
for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
@@ -231,14 +233,14 @@ AddFilesToHaikuImage system add-ons kernel debugger
AddFilesToHaikuImage system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToHaikuImage system add-ons kernel generic
- : ata_adapter@ata bios@x86 dpc ide_adapter@ide
+ : ata_adapter@ata bios@x86,x86_64 dpc ide_adapter@ide
locked_pool mpu401 scsi_periph <module>tty ;
AddFilesToHaikuImage system add-ons kernel partitioning_systems
: amiga_rdb apple efi_gpt intel session ;
AddFilesToHaikuImage system add-ons kernel interrupt_controllers
: openpic@ppc ;
-if $(TARGET_ARCH) = x86 {
+if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
AddFilesToHaikuImage system add-ons kernel cpu : generic_x86 ;
}
@@ -254,7 +256,7 @@ AddDriversToHaikuImage :
console dprintf null
AddDriversToHaikuImage audio hmulti : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
AddDriversToHaikuImage audio old : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
AddDriversToHaikuImage midi :
$(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
-AddDriversToHaikuImage bus : usb_raw fw_raw ;
+AddDriversToHaikuImage bus : usb_raw fw_raw@x86 ;
AddDriversToHaikuImage disk floppy : pc_floppy@x86 ;
AddDriversToHaikuImage disk usb : usb_disk ;
AddDriversToHaikuImage disk usb : usb_floppy ;
@@ -301,22 +303,11 @@ if $(TARGET_ARCH) = x86 {
}
}
-# libbe.so now includes what used to be in liblocale.so
-# TODO: Remove this once all optional packages have been rebuilt (i.e. after
-# next release)!
-SYSTEM_LIBS_LIBBE_ALIASES = liblocale.so ;
-if $(TARGET_ARCH) = x86 {
- local lib ;
- for lib in $(SYSTEM_LIBS_LIBBE_ALIASES) {
- AddSymlinkToHaikuHybridImage system lib : libbe.so : $(lib) : :
true ;
- }
-}
SYSTEM_LIBS_ALIASES =
$(SYSTEM_LIBS_LIBNETWORK_ALIASES)
libnetapi.so
$(SYSTEM_LIBS_LIBGL_ALIASES)
- $(SYSTEM_LIBS_LIBBE_ALIASES)
;
OPTIONAL_LIBS_ALIASES =
############################################################################
Revision: hrev45659
Commit: ef0c2a820bf1f11f12584307200b7a5cf95c9642
URL: http://cgit.haiku-os.org/haiku/commit/?id=ef0c2a8
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Fri May 10 20:51:42 2013 UTC
HaikuImage: use the same HaikuImage Jamfile for x86 and x86_64
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index 942323c..3ea234b 100644
--- a/Jamfile
+++ b/Jamfile
@@ -173,11 +173,7 @@ SubDir HAIKU_TOP ;
UserBuildConfigRulePostBuildTargets ;
# specify the Haiku image and network boot archive contents
-if $(TARGET_ARCH) = x86_64 {
- include [ FDirName $(HAIKU_BUILD_RULES_DIR) Haiku64Image ] ;
-} else {
- include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
-}
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) NetBootArchive ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) FloppyBootImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootImage ] ;
Other related posts:
