[arch-commits] Commit in gnu-efi-libs/trunk (PKGBUILD)

[Tobias Powalowski]

    Date: Friday, June 21, 2013 @ 21:29:42
  Author: tpowa
Revision: 188807

upgpkg: gnu-efi-libs 3.0u-2

change building to splitted arches

Modified:
  gnu-efi-libs/trunk/PKGBUILD

----------+
 PKGBUILD |   74 +++++++++++++------------------------------------------------
 1 file changed, 16 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-21 13:01:23 UTC (rev 188806)
+++ PKGBUILD	2013-06-21 19:29:42 UTC (rev 188807)
@@ -5,85 +5,43 @@
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
 pkgver="${_pkgver}u"
-pkgrel="1"
-pkgdesc="Library for building x86_64 and ia32 UEFI Applications using GNU toolchain"
+pkgrel="2"
+pkgdesc="Library for building UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 options=('!strip' '!makeflags')
 makedepends=('pciutils')
 
-if [[ "${CARCH}" == "x86_64" ]]; then
-	makedepends+=('lib32-glibc' 'gcc-multilib')
-fi
-
 source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
 md5sums=('d15d3c700e79a1e2938544d73edc572d')
 
-_build_gnu-efi-libs-x86_64() {
-	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
-	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
+
+build() {
 	
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
 	
-	make ARCH="x86_64" -j1
-	make ARCH="x86_64" -j1 -C apps all
-}
-
-_build_gnu-efi-libs-ia32() {
-	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-ia32"
-	cd "${srcdir}/gnu-efi-${_pkgver}-ia32/"
-	
+	## Unset all compiler FLAGS
 	unset CFLAGS
 	unset CPPFLAGS
 	unset CXXFLAGS
 	unset LDFLAGS
 	unset MAKEFLAGS
 	
-	make ARCH="ia32" -j1
-	make ARCH="ia32" -j1 -C apps all
-}
-
-build() {
-	cd "${srcdir}/gnu-efi-${_pkgver}/"
+	make -j1
+	make -j1 -C apps all
 	
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		_build_gnu-efi-libs-x86_64
-	fi
-	
-	_build_gnu-efi-libs-ia32
 }
 
-_package_gnu-efi-libs-x86_64() {
-	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
+package() {
 	
-	make ARCH="x86_64" INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
 	
-	install -d "${pkgdir}/usr/share/gnu-efi/apps/x86_64/"
-	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/x86_64/"
-}
-
-_package_gnu-efi-libs-ia32() {
-	cd "${srcdir}/gnu-efi-${_pkgver}-ia32/"
+	make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
 	
-	make ARCH="ia32" INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/${_LIBDIR32}" install
+	install -d "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
 	
-	install -d "${pkgdir}/usr/share/gnu-efi/apps/ia32/"
-	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-ia32/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/ia32/"
 }
-
-package() {
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		_package_gnu-efi-libs-x86_64
-		
-		_LIBDIR32="lib32"
-		_package_gnu-efi-libs-ia32
-	else
-		_LIBDIR32="lib"
-		_package_gnu-efi-libs-ia32
-	fi
-}