[haiku-commits] BRANCH HaikuPM-github.package-management [cc91b33] build/jam/repositories/HaikuPorts src/data/package_infos/x86 build/jam/repositories/HaikuPortsCross

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 21 Aug 2013 17:00:36 +0200 (CEST)

added 3 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 4ddd2c75dc73acba4297ea87b383b6504101011a
new head: cc91b333bede32fbf9dc43e1f21d609e89b2d3fa
overview: https://github.com/haiku/HaikuPM/compare/4ddd2c7...cc91b33

----------------------------------------------------------------------------

a510155: packagefs: PackageFSRoot: fix variable redeclaration

b35337e: Add repositories for x86
  
  Almost complete. bepdf is still missing, since it doesn't build with gcc
  4 and a few source packages are missing as well (binutils and gcc
  because haikuporter doesn't build them correctly ATM, mesa due to an
  oversight).

cc91b33: configure: update required legacy compiler version

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

----------------------------------------------------------------------------

6 files changed, 556 insertions(+), 3 deletions(-)
build/jam/repositories/HaikuPorts/x86            | 250 +++++++++++++++++++
build/jam/repositories/HaikuPortsCross/x86       |  74 ++++++
configure                                        |   2 +-
.../packagefs/volume/PackageFSRoot.cpp           |   4 +-
src/data/package_infos/x86/haiku                 | 197 +++++++++++++++
src/data/package_infos/x86/haiku_secondary       |  32 +++

############################################################################

Commit:      a5101559b58dec543441a0a8811b30912ed72c59
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Wed Aug 21 07:12:59 2013 UTC

packagefs: PackageFSRoot: fix variable redeclaration

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp 
b/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp
index 3eb967d..b8ee286 100644
--- a/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/volume/PackageFSRoot.cpp
@@ -256,7 +256,7 @@ PackageFSRoot::_AddPackage(Package* package)
                                = fResolvables.Lookup(resolvable->Name())) {
                        family->AddResolvable(resolvable, dependenciesToUpdate);
                } else {
-                       ResolvableFamily* family = new(std::nothrow) 
ResolvableFamily;
+                       family = new(std::nothrow) ResolvableFamily;
                        if (family == NULL)
                                return B_NO_MEMORY;
 
@@ -282,7 +282,7 @@ PackageFSRoot::_AddPackage(Package* package)
                                = fDependencies.Lookup(dependency->Name())) {
                        family->AddDependency(dependency);
                } else {
-                       DependencyFamily* family = new(std::nothrow) 
DependencyFamily;
+                       family = new(std::nothrow) DependencyFamily;
                        if (family == NULL)
                                return B_NO_MEMORY;
 

############################################################################

Commit:      b35337eb1e109ac808549a4f12140924852caa85
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Wed Aug 21 14:32:17 2013 UTC

Add repositories for x86

Almost complete. bepdf is still missing, since it doesn't build with gcc
4 and a few source packages are missing as well (binutils and gcc
because haikuporter doesn't build them correctly ATM, mesa due to an
oversight).

----------------------------------------------------------------------------

diff --git a/build/jam/repositories/HaikuPorts/x86 
b/build/jam/repositories/HaikuPorts/x86
new file mode 100644
index 0000000..d9f5712
--- /dev/null
+++ b/build/jam/repositories/HaikuPorts/x86
@@ -0,0 +1,250 @@
+RemotePackageRepository HaikuPorts
+       : x86
+       : http://haiku-files.org/files/repo
+       :
+       # architecture "any" packages
+       be_book-2008_10_26-1
+       ca_root_certificates-2012_12_29-1
+       texi2html-1.82-2
+       timgmsoundfont-2004_01_24-3
+       wqy_microhei-0.2.0~beta-3
+       :
+       # repository architecture packages
+       # primary architecture (x86)
+       apr-1.4.6-7
+       apr_devel-1.4.6-7
+       apr_util-1.4.1-4
+       apr_util_devel-1.4.1-4
+       autoconf-2.69-4
+       automake-1.13.1-4
+#      bepdf-1.1.1~beta5_2013_04_28-1
+       binutils-2.23.2_2013_04_09-1
+       bison-2.4.3-5
+       bzip2-1.0.6-3
+       cdrtools-3.01~a07-3
+       cmake-2.8.5-6
+       ctags-5.8-3
+       curl-7.26.0-5
+       curl_devel-7.26.0-5
+       cvs-1.12.13.1-5
+       doxygen-1.6.3-4
+       expat-2.0.1-7
+       expat_devel-2.0.1-7
+       ffmpeg-0.10.2-4
+       ffmpeg_devel-0.10.2-4
+       flex-2.5.35-6
+       freetype-2.4.9-3
+       freetype_devel-2.4.9-3
+       gcc-4.7.3_2013_08_12-1
+       gettext-0.18.1.1-5
+       gettext_libintl-0.18.1.1-5
+       git-1.8.3.4-1
+       git_arch-1.8.3.4-1
+       git_cvs-1.8.3.4-1
+       git_daemon-1.8.3.4-1
+       git_email-1.8.3.4-1
+       git_svn-1.8.3.4-1
+       glu-9.0.0-2
+       glu_devel-9.0.0-2
+       gperf-3.0.4-1
+       grep-2.14-5
+       groff-1.20.1-2
+       haikuwebkit-1.1.3_2013_08_09-2
+       haikuwebkit_devel-1.1.3_2013_08_09-2
+       htmldoc-1.8.27-3
+       icu-4.8.1.1-4
+       icu_devel-4.8.1.1-4
+       jam-2.5_2012_10_12-1
+       jpeg-9-3
+       jpeg_devel-9-3
+       jpeg_tools-9-3
+       keymapswitcher-1.2.7.10-1
+       libedit-2012_06_01_3.0-1
+       libiconv-1.13.1-6
+       libiconv_devel-1.13.1-6
+       libogg-1.3.0-2
+       libogg_devel-1.3.0-2
+       libpcre-8.21-5
+       libpng-1.5.12-3
+       libpng_devel-1.5.12-3
+       libsolv-0.3.0_haiku_2013_06_16-2
+       libsolv_devel-0.3.0_haiku_2013_06_16-2
+       libtheora-1.1.1-2
+       libtheora_devel-1.1.1-2
+       libtool-2.4-8
+       libtool_libltdl-2.4-8
+       libvorbis-1.3.2-2
+       libvorbis_devel-1.3.2-2
+       libvpx-1.0.0-2
+       libvpx_devel-1.0.0-2
+       libxml2-2.8.0-5
+       libxml2_devel-2.8.0-5
+       libxml2_python-2.8.0-5
+       m4-1.4.16-5
+       make-3.82-5
+       man-1.6g-2
+       mercurial-2.2.2-3
+       mesa-9.1.1-1
+       mesa_devel-9.1.1-1
+       mkdepend-1.7-3
+       nano-2.2.6-3
+       ncurses-5.9-10
+       ncurses_devel-5.9-10
+       neon-0.29.6-7
+       neon_devel-0.29.6-7
+       openssh-6.0p1-7
+       openssl-1.0.0j-3
+       openssl_devel-1.0.0j-3
+       p7zip-9.20.1-4
+       pe-2.4.3_hg602-5
+       perl-5.10.1-5
+       pkgconfig-0.27.1-1
+       python-2.6.8-5
+       readline-6.2-3
+       scons-2.2.0-1
+       sed-4.2.1-6
+       speex-1.2~rc1-2
+       speex_devel-1.2~rc1-2
+       sqlite-3.7.13-4
+       sqlite_devel-3.7.13-4
+       subversion-1.6.18-6
+       subversion_devel-1.6.18-6
+       tar-1.26-6
+       texinfo-4.13a-7
+       vision-0.9.7.r944-1
+       wpa_supplicant-2.0-3
+       xz_utils-5.0.4-1
+       yasm-1.2.0-3
+       zlib-1.2.8-3
+       zlib_devel-1.2.8-3
+
+       # secondary architecture (x86_gcc2)
+       binutils_x86_gcc2-2.17_2013_04_21-2
+       curl_x86_gcc2-7.26.0-5
+       curl_x86_gcc2_devel-7.26.0-5
+       expat_x86_gcc2-2.0.1-7
+       expat_x86_gcc2_devel-2.0.1-7
+       ffmpeg_x86_gcc2-0.10.2-4
+       ffmpeg_x86_gcc2_devel-0.10.2-4
+       freetype_x86_gcc2-2.4.9-3
+       freetype_x86_gcc2_devel-2.4.9-3
+       gcc_x86_gcc2-2.95.3_2013_08_15-2
+       gettext_x86_gcc2-0.18.1.1-5
+       gettext_x86_gcc2_libintl-0.18.1.1-5
+       glu_x86_gcc2-9.0.0-2
+       glu_x86_gcc2_devel-9.0.0-2
+       icu_x86_gcc2-4.8.1.1-4
+       icu_x86_gcc2_devel-4.8.1.1-4
+       jpeg_x86_gcc2-9-3
+       jpeg_x86_gcc2_devel-9-3
+       libiconv_x86_gcc2-1.13.1-6
+       libiconv_x86_gcc2_devel-1.13.1-6
+       libogg_x86_gcc2-1.3.0-2
+       libogg_x86_gcc2_devel-1.3.0-2
+       libpng_x86_gcc2-1.5.12-3
+       libpng_x86_gcc2_devel-1.5.12-3
+       libsolv_x86_gcc2-0.3.0_haiku_2013_06_16-2
+       libsolv_x86_gcc2_devel-0.3.0_haiku_2013_06_16-2
+       libtheora_x86_gcc2-1.1.1-2
+       libtheora_x86_gcc2_devel-1.1.1-2
+       libvorbis_x86_gcc2-1.3.2-2
+       libvorbis_x86_gcc2_devel-1.3.2-2
+       libvpx_x86_gcc2-1.0.0-2
+       libvpx_x86_gcc2_devel-1.0.0-2
+       libxml2_x86_gcc2-2.8.0-5
+       libxml2_x86_gcc2_devel-2.8.0-5
+       mesa_x86_gcc2-7.8.2-3
+       mesa_x86_gcc2_devel-7.8.2-3
+       ncurses_x86_gcc2-5.9-10
+       ncurses_x86_gcc2_devel-5.9-10
+       openssl_x86_gcc2-1.0.0j-3
+       openssl_x86_gcc2_devel-1.0.0j-3
+       speex_x86_gcc2-1.2~rc1-2
+       speex_x86_gcc2_devel-1.2~rc1-2
+       sqlite_x86_gcc2-3.7.13-4
+       sqlite_x86_gcc2_devel-3.7.13-4
+       wonderbrush_x86_gcc2-2.1.2-4
+       zlib_x86_gcc2-1.2.8-3
+       zlib_x86_gcc2_devel-1.2.8-3
+       :
+       # source packages
+       apr
+       autoconf
+       automake
+#      bepdf
+#      binutils
+#      binutils_x86_gcc2
+       bison
+       bzip2
+       cdrtools
+       cmake
+       ctags
+       curl
+       cvs
+       doxygen
+       expat
+       ffmpeg
+       flex
+       freetype
+#      gcc
+#      gcc_x86_gcc2
+       gettext
+       git
+       glu
+       gperf
+       grep
+       groff
+       haikuwebkit
+       htmldoc
+       icu
+       jam
+       jpeg
+       keymapswitcher
+       libedit
+       libiconv
+       libogg
+       libpcre
+       libpng
+       libsolv
+       libtheora
+       libtool
+       libvorbis
+       libvpx
+       libxml2
+       m4
+       make
+       man
+       mercurial
+#      mesa
+       mesa_x86_gcc2
+       mkdepend
+       nano
+       ncurses
+       neon
+       openssh
+       openssl
+       p7zip
+       pe
+       perl
+       pkgconfig
+       python
+       readline
+       scons
+       sed
+       speex
+       sqlite
+       subversion
+       tar
+       texi2html
+       texinfo
+       vision
+       wpa_supplicant
+       yasm
+       xz_utils
+       zlib
+       :
+       # debuginfo packages
+       grep
+       sed
+       tar
+       ;
diff --git a/build/jam/repositories/HaikuPortsCross/x86 
b/build/jam/repositories/HaikuPortsCross/x86
new file mode 100644
index 0000000..c057b06
--- /dev/null
+++ b/build/jam/repositories/HaikuPortsCross/x86
@@ -0,0 +1,74 @@
+BootstrapPackageRepository HaikuPortsCross
+       : x86
+       :
+       # architecture "any" packages
+       haikuporter-0-1
+       :
+       # repository architecture packages (stage 1)
+       autoconf_bootstrap-2.69-1
+       automake_bootstrap-1.13.1-1
+       binutils_bootstrap-2.23.2_2013_04_09-3
+       bison_bootstrap-2.4.3-1
+       flex_bootstrap-2.5.35-1
+       freetype_bootstrap-2.4.9-1
+       freetype_bootstrap_devel-2.4.9-1
+       gcc_bootstrap-4.7.3_2013_08_12-1
+       grep_bootstrap-2.14-1
+       icu_bootstrap-4.8.1.1-1
+       icu_bootstrap_devel-4.8.1.1-1
+       libtool_bootstrap-2.4-8
+       libtool_bootstrap_libltdl-2.4-8
+       m4_bootstrap-1.4.16-1
+       make_bootstrap-3.82-1
+       ncurses_bootstrap-5.9-1
+       ncurses_bootstrap_devel-5.9-1
+       python_bootstrap-2.6.8-1
+       sed_bootstrap-4.2.1-1
+       texinfo_bootstrap-4.13a-1
+       zlib_bootstrap-1.2.8-2
+       zlib_bootstrap_devel-1.2.8-2
+
+       secondary_x86_gcc2 @{
+               binutils_bootstrap_x86_gcc2-2.17_2013_04_21-3
+               freetype_bootstrap_x86_gcc2-2.4.9-1
+               freetype_bootstrap_x86_gcc2_devel-2.4.9-1
+               gcc_bootstrap_x86_gcc2-2.95.3_2013_08_15-1
+               icu_bootstrap_x86_gcc2-4.8.1.1-1
+               icu_bootstrap_x86_gcc2_devel-4.8.1.1-1
+               ncurses_bootstrap_x86_gcc2-5.9-1
+               ncurses_bootstrap_x86_gcc2_devel-5.9-1
+               zlib_bootstrap_x86_gcc2-1.2.8-2
+               zlib_bootstrap_x86_gcc2_devel-1.2.8-2
+       }@ # secondary_x86_gcc2
+       :
+       # repository architecture packages (stage 2)
+       libsolv_bootstrap-0.3.0_haiku_2013_06_16-1
+       libsolv_bootstrap_devel-0.3.0_haiku_2013_06_16-1
+
+       secondary_x86_gcc2 @{
+               libsolv_bootstrap_x86_gcc2-0.3.0_haiku_2013_06_16-1
+               libsolv_bootstrap_x86_gcc2_devel-0.3.0_haiku_2013_06_16-1
+       }@ # secondary_x86_gcc2
+       :
+       # source packages
+       autoconf_bootstrap
+       automake_bootstrap
+       binutils_bootstrap
+       bison_bootstrap
+       flex_bootstrap
+       freetype_bootstrap
+       gawk_bootstrap
+       gcc_bootstrap
+       grep_bootstrap
+       libsolv_bootstrap
+       libtool_bootstrap
+       m4_bootstrap
+       make_bootstrap
+       ncurses_bootstrap
+       python_bootstrap
+       sed_bootstrap
+       texinfo_bootstrap
+       zlib_bootstrap
+       :
+       # debuginfo packages
+       ;
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
new file mode 100644
index 0000000..c03868f
--- /dev/null
+++ b/src/data/package_infos/x86/haiku
@@ -0,0 +1,197 @@
+name                   haiku
+version                        R1~alpha4_pm-1
+architecture   x86
+summary                        "The Haiku base system"
+
+description            "The Haiku base system includes all system core 
software, like
+boot loader, kernel, the system libraries, servers, and applications."
+
+packager               "The Haiku build system"
+vendor                 "Haiku Project"
+
+copyrights             "2001-2013 Haiku, Inc. et al"
+licenses {
+       MIT
+       "GNU LGPL v2.1"
+}
+
+provides {
+       haiku=R1~alpha4_pm-1 compat>=R1~alpha1
+       coreutils = 8.4 compat >= 0
+       diffutils = 2.8.1 compat >= 0
+       findutils = 4.2.33 compat >= 0
+       cmd:arp
+       cmd:awk
+       cmd:base64
+       cmd:basename
+       cmd:bash
+       cmd:bc
+       cmd:cat
+       cmd:chgrp
+       cmd:chmod
+       cmd:chop
+       cmd:chown
+       cmd:chroot
+       cmd:cksum
+       cmd:clear
+       cmd:cmp
+       cmd:comm
+       cmd:compress
+       cmd:cp = 8.4
+       cmd:csplit
+       cmd:cut
+       cmd:date
+       cmd:dc
+       cmd:dd
+       cmd:df
+       cmd:diff = 2.8.1
+       cmd:diff3
+       cmd:dirname
+       cmd:du
+       cmd:echo
+       cmd:env
+       cmd:expand
+       cmd:expr
+       cmd:factor
+       cmd:false
+       cmd:find = 4.2.33
+       cmd:fmt
+       cmd:fold
+       cmd:frcode
+       cmd:ftp
+       cmd:ftpd
+       cmd:funzip
+       cmd:gawk
+       cmd:gdb
+       cmd:getlimits
+       cmd:groups
+       cmd:gunzip
+       cmd:gzexe
+       cmd:gzip
+       cmd:hd
+       cmd:head
+       cmd:hostname
+       cmd:id
+       cmd:install
+       cmd:join
+       cmd:kill
+       cmd:less
+       cmd:lessecho
+       cmd:lesskey
+       cmd:link
+       cmd:ln = 8.4
+       cmd:locate
+       cmd:login
+       cmd:logname
+       cmd:ls
+       cmd:md5sum
+       cmd:merge
+       cmd:mkdir
+       cmd:mkfifo
+       cmd:mktemp
+       cmd:more
+       cmd:mv = 8.4
+       cmd:netcat
+       cmd:nl
+       cmd:nohup
+       cmd:nproc
+       cmd:od
+       cmd:passwd
+       cmd:paste
+       cmd:patch
+       cmd:pathchk
+       cmd:ping
+       cmd:ping6
+       cmd:pr
+       cmd:printenv
+       cmd:printf
+       cmd:prio
+       cmd:ps
+       cmd:ptx
+       cmd:pwd
+       cmd:readlink
+       cmd:renice
+       cmd:rlog
+       cmd:rm
+       cmd:rmdir
+       cmd:sdiff
+       cmd:seq
+       cmd:sh
+       cmd:sha1sum
+       cmd:sha256sum
+       cmd:shar
+       cmd:shred
+       cmd:shuf
+       cmd:sleep
+       cmd:sort
+       cmd:split
+       cmd:stat
+       cmd:stty
+       cmd:su
+       cmd:sum
+       cmd:sync
+       cmd:tac
+       cmd:tail
+       cmd:tcpdump
+       cmd:tee
+       cmd:telnet
+       cmd:telnetd
+       cmd:test
+       cmd:timeout
+       cmd:top
+       cmd:touch
+       cmd:tput
+       cmd:tr
+       cmd:traceroute
+       cmd:trash
+       cmd:true
+       cmd:truncate
+       cmd:tsort
+       cmd:tty
+       cmd:uname
+       cmd:unchop
+       cmd:unexpand
+       cmd:uniq
+       cmd:unlink
+       cmd:unshar
+       cmd:unzip = 5.50
+       cmd:unzipsfx
+       cmd:updatedb
+       cmd:useradd
+       cmd:uudecode
+       cmd:uuencode
+       cmd:vdir
+       cmd:watch
+       cmd:wc
+       cmd:wget = 1.12
+       cmd:which
+       cmd:whoami
+       cmd:xargs
+       cmd:xres
+       cmd:yes
+       cmd:zcat
+       cmd:zcmp
+       cmd:zdiff
+       cmd:zforce
+       cmd:zgrep
+       cmd:zip = 2.32
+       cmd:zipcloak
+       cmd:zipgrep
+       cmd:zipinfo
+       cmd:zipnote
+       cmd:zipsplit
+       cmd:zmore
+       cmd:znew
+       lib:libtiff = 3.9.4 compat >= 3
+}
+
+requires {
+       lib:libfreetype
+#ifndef HAIKU_BOOTSTRAP_BUILD
+       lib:libjpeg
+       lib:libpng
+#endif
+       lib:libsolv
+       lib:libsolvext
+       lib:libz
+}
diff --git a/src/data/package_infos/x86/haiku_secondary 
b/src/data/package_infos/x86/haiku_secondary
new file mode 100644
index 0000000..5173b4d
--- /dev/null
+++ b/src/data/package_infos/x86/haiku_secondary
@@ -0,0 +1,32 @@
+name                   haiku_%HAIKU_SECONDARY_PACKAGING_ARCH%
+version                        R1~alpha4_pm-1
+architecture   x86
+summary                        "The Haiku base system 
%HAIKU_SECONDARY_PACKAGING_ARCH% secondary architecture support"
+
+description            "The Haiku base system %HAIKU_SECONDARY_PACKAGING_ARCH%
+secondary architecture support includes all system libraries, add-ons, and
+other files required to run programs build for that architecture."
+
+packager               "The Haiku build system"
+vendor                 "Haiku Project"
+
+copyrights             "2001-2013 Haiku, Inc. et al"
+licenses {
+       MIT
+       "GNU LGPL v2.1"
+}
+
+provides {
+       haiku_%HAIKU_SECONDARY_PACKAGING_ARCH% = R1~alpha4_pm-1 
compat>=R1~alpha1
+}
+
+requires {
+       lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH%
+#ifndef HAIKU_BOOTSTRAP_BUILD
+       lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
+       lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
+#endif
+       lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%
+       lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH%
+       lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH%
+}

############################################################################

Commit:      cc91b333bede32fbf9dc43e1f21d609e89b2d3fa
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Wed Aug 21 14:32:34 2013 UTC

configure: update required legacy compiler version

----------------------------------------------------------------------------

diff --git a/configure b/configure
index 023e444..f46a3fe 100755
--- a/configure
+++ b/configure
@@ -487,7 +487,7 @@ else
        exit 1
 fi
 
-haikuRequiredLegacyGCCVersion="2.95.3-haiku-2013_08_12"
+haikuRequiredLegacyGCCVersion="2.95.3-haiku-2013_08_15"
 export haikuRequiredLegacyGCCVersion
        # version of legacy gcc required to build haiku
 supportedTargetArchs="


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management [cc91b33] build/jam/repositories/HaikuPorts src/data/package_infos/x86 build/jam/repositories/HaikuPortsCross - HaikuPM-github . package-management