Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwonarm.git;a=commitdiff;h=c1e5bd3309c86a64b5dba93c0b302c4e1619e6d5
commit c1e5bd3309c86a64b5dba93c0b302c4e1619e6d5 Author: Elentir <elen...@frugalware.org> Date: Thu Feb 17 22:15:15 2011 +0000 pacman-g2-3.8.1-1-arm * add arm to archs diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index 97ed55d..80e6987 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -22,7 +22,7 @@ fi Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'intltool') Finclude mono groups=('base' 'chroot-core') -archs=('i686' 'x86_64' 'ppc') +archs=('i686' 'x86_64' 'ppc' 'arm') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then @@ -33,6 +33,12 @@ else _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" Finclude scm fi + +if [ "$CARCH" == "arm" ]; then + source=($source fix-arch-package-arm.patch) + signatures=($signatures '') + Fconfopts="$Fconfopts --disable-java" +fi if [ "$CARCH" == "ppc" ]; then Fconfopts="$Fconfopts --disable-java" fi diff --git a/source/base/pacman-g2/fix-arch-package-arm.patch b/source/base/pacman-g2/fix-arch-package-arm.patch new file mode 100644 index 0000000..8219df9 --- /dev/null +++ b/source/base/pacman-g2/fix-arch-package-arm.patch @@ -0,0 +1,12 @@ +diff -Naur pacman-g2-3.8.1//lib/libpacman/package.c pacman-g2-3.8.1new//lib/libpacman/package.c +--- pacman-g2-3.8.1//lib/libpacman/package.c 2011-01-10 22:44:52.000000000 +0100 ++++ pacman-g2-3.8.1new//lib/libpacman/package.c 2011-02-17 23:00:08.355426001 +0100 +@@ -352,7 +352,7 @@ + } + + uname (&name); +- if(strcmp(name.machine, info->arch)) { ++ if(strncmp(name.machine, info->arch, strlen(info->arch))) { + _pacman_log(PM_LOG_ERROR, _("wrong package architecture in %s"), pkgfile); + pm_errno = PM_ERR_WRONG_ARCH; + unlink(descfile); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git