From a9abe32b7a850b8ae917caddcb9b5f7cec1ad2b1 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 21 Jun 2011 20:48:50 -0400 Subject: [PATCH] fixes for armv7h architecture --- aur/asterisk/PKGBUILD | 2 +- aur/sabnzbd/PKGBUILD | 2 +- core/binutils/PKGBUILD | 2 +- core/gcc/PKGBUILD | 2 +- core/glibc/PKGBUILD | 2 +- core/kernel26-omap/PKGBUILD | 4 ++-- core/kernel26-tegra/PKGBUILD | 4 ++-- core/mkinitcpio-busybox/PKGBUILD | 2 +- core/pacman/PKGBUILD | 10 +++++----- core/pacman/pacman.conf.armv7 | 2 +- extra/libjpeg-turbo/PKGBUILD | 2 +- extra/qt/PKGBUILD | 2 +- extra/texlive-bin/PKGBUILD | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/aur/asterisk/PKGBUILD b/aur/asterisk/PKGBUILD index 068be8942..bfdda1377 100644 --- a/aur/asterisk/PKGBUILD +++ b/aur/asterisk/PKGBUILD @@ -44,7 +44,7 @@ build() { patch -Np1 -i ../arm.patch || return 1 [[ $CARCH == "arm" ]] && CONFIGFLAG="--build=arm-unknown-linux-gnueabi" - [[ $CARCH == "armv7" ]] && CONFIGFLAG="--build=armv7l-unknown-linux-gnueabi" + [[ $CARCH == "armv7h" ]] && CONFIGFLAG="--build=armv7l-unknown-linux-gnueabi" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var $CONFIGFLAG make || return 1 diff --git a/aur/sabnzbd/PKGBUILD b/aur/sabnzbd/PKGBUILD index a0a808e0c..2844a6901 100644 --- a/aur/sabnzbd/PKGBUILD +++ b/aur/sabnzbd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=sabnzbd pkgver=0.6.4 pkgrel=1 pkgdesc="A web-interface based binary newsgrabber with NZB file support" -arch=(arm armv7) +arch=(arm armv7h) url="http://www.sabnzbd.org/" license=('GPL') depends=('par2cmdline' 'python2' 'python-cheetah' 'python-feedparser' 'python-yenc' 'python2-pyopenssl' 'unrar' 'unzip' 'sqlite3' 'curl') diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index eecb6f162..d396c4eb9 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -42,7 +42,7 @@ build() { # ALARM: Specify build host types [[ $CARCH == "arm" ]] && CONFIGFLAG="--host=arm-unknown-linux-gnueabi --build=arm-unknown-linux-gnueabi" - [[ $CARCH == "armv7" ]] && CONFIGFLAG="--host=armv7l-unknown-linux-gnueabi --build=armv7l-unknown-linux-gnueabi" + [[ $CARCH == "armv7h" ]] && CONFIGFLAG="--host=armv7l-unknown-linux-gnueabi --build=armv7l-unknown-linux-gnueabi" ${srcdir}/binutils/configure --prefix=/usr \ --enable-ld=default --enable-gold \ diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index cf97f823d..a287c3097 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -67,7 +67,7 @@ build() { # ALARM: Specify build host types [[ $CARCH == "arm" ]] && CONFIGFLAG="--host=arm-unknown-linux-gnueabi --build=arm-unknown-linux-gnueabi" - [[ $CARCH == "armv7" ]] && CONFIGFLAG="--host=armv7l-unknown-linux-gnueabi --build=armv7l-unknown-linux-gnueabi" + [[ $CARCH == "armv7h" ]] && CONFIGFLAG="--host=armv7l-unknown-linux-gnueabi --build=armv7l-unknown-linux-gnueabi" ${_basedir}/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index df8407e75..e7e52a627 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -101,7 +101,7 @@ build() { # ALARM: Specify build host types [[ $CARCH == "arm" ]] && CONFIGFLAG="--host=arm-unknown-linux-gnueabi --build=arm-unknown-linux-gnueabi" - [[ $CARCH == "armv7" ]] && CONFIGFLAG="--host=armv7l-unknown-linux-gnueabi --build=armv7l-unknown-linux-gnueabi" + [[ $CARCH == "armv7h" ]] && CONFIGFLAG="--host=armv7l-unknown-linux-gnueabi --build=armv7l-unknown-linux-gnueabi" echo "slibdir=/lib" >> configparms diff --git a/core/kernel26-omap/PKGBUILD b/core/kernel26-omap/PKGBUILD index dd945f778..2df648ef2 100644 --- a/core/kernel26-omap/PKGBUILD +++ b/core/kernel26-omap/PKGBUILD @@ -19,8 +19,8 @@ pkgrel=${_pkgrel} makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'make') _patchname="patch-${pkgver}-${_pkgrel}-ARCH" #_patchname="patch-${pkgver}-1-ARCH" -arch=(armv7) -CARCH=armv7 +arch=(armv7h) +CARCH=armv7h KARCH=arm LDFLAGS="" license=('GPL2') diff --git a/core/kernel26-tegra/PKGBUILD b/core/kernel26-tegra/PKGBUILD index cfc3a40c6..5b39c604e 100644 --- a/core/kernel26-tegra/PKGBUILD +++ b/core/kernel26-tegra/PKGBUILD @@ -20,8 +20,8 @@ pkgrel=${_pkgrel} makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'make') _patchname="patch-${pkgver}-${_pkgrel}-ARCH" #_patchname="patch-${pkgver}-1-ARCH" -arch=(armv7) -CARCH=armv7 +arch=(armv7h) +CARCH=armv7h KARCH=arm LDFLAGS="" license=('GPL2') diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index f77084cac..31e7780ff 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -23,7 +23,7 @@ build() { cd "${srcdir}/busybox-${pkgver}" unset CFLAGS CXXFLAGS - if [ ${CARCH} = "armv7" ]; then + if [ ${CARCH} = "armv7h" ]; then sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=armv7-a -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config else sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=armv5te -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 9ebeb2d43..73c5ff94a 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -13,7 +13,7 @@ pkgname=pacman pkgver=3.5.3 pkgrel=1 pkgdesc="A library-based package manager with dependency support" -arch=('arm' 'armv7') +arch=('arm' 'armv7h') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') @@ -29,7 +29,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz makepkg.conf) md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' '8a202e08a4e9ffe978c6aa6358e1b640' - 'ef58d47ca67b78e597b0698ac2b97987' + '5a572af37873bb8a521ffbf81aa2151e' 'da2e78190c8677e3df4ed9744bc22e7e') # keep an upgrade path for older installations @@ -55,11 +55,11 @@ package() { mychost="arm-unknown-linux-gnueabi" myflags="-march=armv5te " ;; - armv7) + armv7h) install -m644 $srcdir/pacman.conf.armv7 $pkgdir/etc/pacman.conf - mycarch="armv7" + mycarch="armv7h" mychost="armv7l-unknown-linux-gnueabi" - myflags="-march=armv7-a " + myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16" ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ diff --git a/core/pacman/pacman.conf.armv7 b/core/pacman/pacman.conf.armv7 index 1bc2364fc..b0d17f3ce 100644 --- a/core/pacman/pacman.conf.armv7 +++ b/core/pacman/pacman.conf.armv7 @@ -19,7 +19,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - -f %u > %o #CleanMethod = KeepInstalled -Architecture = armv7 +Architecture = armv7h # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 0b24c5394..140b7df48 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -6,7 +6,7 @@ pkgname=libjpeg-turbo pkgver=1.1.1 pkgrel=1 pkgdesc="ARM dummy package for the x86 assembly version" -arch=('arm' 'armv7') +arch=('arm' 'armv7h') url="http://www.archlinuxarm.org" depends=('libjpeg') license=('BYOB') diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index b92941099..c210abc95 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -52,7 +52,7 @@ build() { sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf - if [ "${CARCH}" = "armv7" ]; then + if [ "${CARCH}" = "armv7h" ]; then useneon="" mymakeflags="-j2" else diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD index 1735f4f11..805ec409e 100644 --- a/extra/texlive-bin/PKGBUILD +++ b/extra/texlive-bin/PKGBUILD @@ -54,7 +54,7 @@ md5sums=('626f900fb59f036d6fea95f08c74b00b' '86c78e48013492e6b1c41373741d19fd') build() { - if [ "${CARCH}" = "armv7" ]; then + if [ "${CARCH}" = "armv7h" ]; then export CFLAGS="${CFLAGS} -fPIC" export CXXFLAGS="${CXXFLAGS} -fPIC" fi