i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Cleanup and fixes following previous commits.

Browse Source 
* Hashing semantics for the new build repositories are different than
   the old ones, so update those (if the x86 build was not broken before
   it is now...)
 * OptionalPackages has been updated slightly (removed libtool and git_cvs
   from the default images, as they are rarely used nowadays and would pull
   in a bunch of dependencies we don't really care for either)
 * Removed lib:libqrencode from Haiku package requires (qrencode_kdl is a
   static library, the userland libqrencode is not used anywhere in the tree,
   as far as I can tell)
 * Fix build of JPEG2000 translator after update
 * Decouple fluidsynth build machinery and remove from image now that it
   is no longer used
 * Update repository URL in Repositories preflet
This commit is contained in:
Augustin Cavalier
2017-11-25 21:15:10 +01:00
parent 36f675968e
commit 5f8613a22c
11 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
+1 -1
View File
@@ -602,7 +602,7 @@ rule ArchitectureSetupWarnings architecture
EnableWerror src add-ons translators hvif ;
EnableWerror src add-ons translators ico ;
EnableWerror src add-ons translators jpeg ;
EnableWerror src add-ons translators jpeg2000 ;
# EnableWerror src add-ons translators jpeg2000 ;
EnableWerror src add-ons translators pcx ;
EnableWerror src add-ons translators png ;
EnableWerror src add-ons translators ppm ;
build/jam/BuildFeatures
+9 -19
View File
@@ -440,25 +440,15 @@ if [ IsPackageAvailable libicns_devel ] {
# Jasper
if [ IsPackageAvailable jasper_devel ] {
if $(HAIKU_PACKAGING_ARCH) = x86_64 {
ExtractBuildFeatureArchives jasper :
file: base jasper
runtime: lib
file: devel jasper_devel
depends: base
library: $(developLibDir)/libjasper.so.4
headers: $(developHeadersDir) $(developHeadersDir)/jasper
;
} else {
ExtractBuildFeatureArchives jasper :
file: base jasper
runtime: lib
file: devel jasper_devel
depends: base
library: $(developLibDir)/libjasper.so.1
headers: $(developHeadersDir) $(developHeadersDir)/jasper
;
}
ExtractBuildFeatureArchives jasper :
file: base jasper
runtime: lib
file: devel jasper_devel
depends: base
library: $(developLibDir)/libjasper.so.4
headers: $(developHeadersDir) $(developHeadersDir)/jasper
;
EnableBuildFeatures jasper ;
} else {
Echo "Jasper support not available on $(TARGET_PACKAGING_ARCH)" ;
build/jam/OptionalPackages
+1 -7
View File
@@ -87,7 +87,7 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
# Development
if [ IsOptionalHaikuImagePackageAdded Development ] {
# auto tools and perl
AddHaikuImagePackages autoconf automake libtool perl texinfo ;
AddHaikuImagePackages autoconf automake perl texinfo ;
# some other build tools
AddHaikuImagePackages pkgconfig scons ;
@@ -149,12 +149,6 @@ if [ IsOptionalHaikuImagePackageAdded FFMpeg-devel ] {
# Git
if [ IsOptionalHaikuImagePackageAdded Git ] {
AddHaikuImagePackages git git_arch git_daemon git_email git_svn ;
# git_cvs depends on cvsps, which does not build with gcc2. So it is not
# available on gcc2-only builds.
if $(TARGET_PACKAGING_ARCHS) != x86_gcc2 {
AddHaikuImagePackages git_cvs ;
}
}
build/jam/RepositoryRules
+6 -3
View File
@@ -160,9 +160,12 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
# build package list checksum file
local packagesChecksumFile
= $(repository:G=repository-package-checksum)-checksum ;
local thisPackageRepositoryFile = [ Glob [ FDirName
$(HAIKU_BUILD_RULES_DIR) repositories HaikuPorts ] :
$(HAIKU_PACKAGING_ARCH) ] ;
MakeLocate $(packagesChecksumFile) : $(repositoriesDir) ;
Depends $(packagesChecksumFile) : $(packageListFile) ;
ChecksumFileSHA256 $(packagesChecksumFile) : $(packageListFile) ;
Depends $(packagesChecksumFile) : $(thisPackageRepositoryFile) ;
ChecksumFileSHA256 $(packagesChecksumFile) : $(thisPackageRepositoryFile) ;
local repositoryInfo = $(repository:G=repository-info)-info ;
local repositoryFile = $(repository:G=repository-cache) ;
@@ -260,7 +263,7 @@ actions RepositoryConfig1
version=`cat "$(2[3]:E)"`
fi
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) $(HAIKU_REPOSITORY_URL) $(2[2]) $(1)
$(2[1]) $(2[2]) $(1)
}
build/jam/images/definitions/regular
-1
View File
@@ -90,7 +90,6 @@ rule HaikuImageGetPrivateSystemLibs
{
return [ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
libalm.so
libfluidsynth.so@gcc2
libilmimf.so
libpackage-add-on-libsolv.so
libroot-addon-icu.so
src/add-ons/translators/jpeg2000/JPEG2000Translator.h
+5 -2
View File
@@ -52,6 +52,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseTranslator.h"
#include "jasper/jasper.h"
// jasper includes stdbool
#undef bool
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "JPEG2000Translator"
@@ -135,11 +138,11 @@ public:
virtual status_t DerivedIdentify(BPositionIO* inSource,
const translation_format* inFormat, BMessage* ioExtension,
translator_info* outInfo, uint32 outType);
virtual status_t DerivedTranslate(BPositionIO* inSource,
const translator_info* inInfo, BMessage* ioExtension,
uint32 outType, BPositionIO* outDestination, int32 baseType);
virtual BView* NewConfigView(TranslatorSettings* settings);
src/data/package_infos/x86/haiku
-1
View File
@@ -93,7 +93,6 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_X86_LIBPNG_ENABLED
lib:libpng >= 16.0
#endif
lib:libqrencode
#ifdef HAIKU_BUILD_FEATURE_X86_TIFF_ENABLED
lib:libtiff >= 5.2
#endif
src/data/package_infos/x86_64/haiku
-1
View File
@@ -92,7 +92,6 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBPNG_ENABLED
lib:libpng >= 16.0
#endif
lib:libqrencode
#ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED
lib:libtiff >= 5.2
#endif
src/data/package_infos/x86_gcc2/haiku
-1
View File
@@ -93,7 +93,6 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED
lib:libpng16 >= 16.0
#endif
lib:libqrencode
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED
lib:libtiff >= 5.2
#endif
src/libs/Jamfile
-2
View File
@@ -4,7 +4,6 @@ SubInclude HAIKU_TOP src libs agg ;
SubInclude HAIKU_TOP src libs alm ;
SubInclude HAIKU_TOP src libs bsd ;
SubInclude HAIKU_TOP src libs compat ;
SubInclude HAIKU_TOP src libs fluidsynth ;
SubInclude HAIKU_TOP src libs glut ;
SubInclude HAIKU_TOP src libs gnu ;
SubInclude HAIKU_TOP src libs icon ;
@@ -20,4 +19,3 @@ SubInclude HAIKU_TOP src libs termcap ;
SubInclude HAIKU_TOP src libs udis86 ;
SubInclude HAIKU_TOP src libs uuid ;
SubInclude HAIKU_TOP src libs util ;
src/preferences/repositories/constants.h
+1 -1
View File
@@ -38,7 +38,7 @@ typedef struct {
static const Repository kDefaultRepos[] = {
{ "Haiku", "https://packages.haiku-os.org/haiku/master/" B_HAIKU_ABI_NAME
"/current"},
{ "HaikuPorts", "https://packages.haiku-os.org/haikuports/master/repo/"
{ "HaikuPorts", "https://eu.hpkg.haiku-os.org/haikuports/master/repository/"
B_HAIKU_ABI_NAME "/current" }
};