diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 96 | ||||
-rw-r--r-- | gnu-efi-disable-use_ms_abi.patch | 13 |
3 files changed, 23 insertions, 94 deletions
@@ -1,10 +1,10 @@ pkgbase = gnu-efi-libs-git - pkgdesc = Library for building x86_64 and ia32 UEFI Applications using GNU toolchain - Sourceforge GIT Version + pkgdesc = Library for building UEFI Applications using GNU toolchain - Sourceforge GIT Version pkgver = 8cb1e87 - pkgrel = 2 + pkgrel = 3 url = http://sourceforge.net/projects/gnu-efi/ - arch = i686 arch = x86_64 + arch = i686 license = GPL makedepends = pciutils provides = gnu-efi-libs @@ -12,9 +12,7 @@ pkgbase = gnu-efi-libs-git options = !strip options = !makeflags source = gnu-efi::git+git://git.code.sf.net/p/gnu-efi/code#branch=master - source = gnu-efi-disable-use_ms_abi.patch sha1sums = SKIP - sha1sums = 387ac12c85d8b94235d5ec27944e447de4fe0140 pkgname = gnu-efi-libs-git @@ -10,115 +10,59 @@ _src_rootdir="${_gitname}-3.0" pkgname="gnu-efi-libs-git" pkgver=8cb1e87 -pkgrel=2 -pkgdesc="Library for building x86_64 and ia32 UEFI Applications using GNU toolchain - Sourceforge GIT Version" +pkgrel=3 +pkgdesc="Library for building UEFI Applications using GNU toolchain - Sourceforge GIT Version" url="http://sourceforge.net/projects/gnu-efi/" license=('GPL') -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') makedepends=('pciutils') options=('!strip' '!makeflags') -if [[ "${CARCH}" == "x86_64" ]]; then - makedepends+=('gcc-multilib') -fi - conflicts=('gnu-efi-libs') provides=('gnu-efi-libs') -source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}" - 'gnu-efi-disable-use_ms_abi.patch') - -sha1sums=('SKIP' - '387ac12c85d8b94235d5ec27944e447de4fe0140') +source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}") +sha1sums=('SKIP') pkgver() { cd "${srcdir}/${_gitname}/" git describe --always | sed 's|-|.|g' } -_build_gnu-efi-libs-x86_64() { - rm -rf "${srcdir}/${_gitname}_build-x86_64" || true - cp -r "${srcdir}/${_gitname}_build" "${srcdir}/${_gitname}_build-x86_64" - - cd "${srcdir}/${_gitname}_build-x86_64/${_src_rootdir}/" - - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS +build() { + rm -rf "${srcdir}/${_gitname}_build/" || true + cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build" - make ARCH="x86_64" -j1 - echo + cd "${srcdir}/${_gitname}_build/" - make ARCH="x86_64" -j1 -C apps all + git clean -x -d -f echo -} - -_build_gnu-efi-libs-ia32() { - rm -rf "${srcdir}/${_gitname}_build-ia32" || true - cp -r "${srcdir}/${_gitname}_build" "${srcdir}/${_gitname}_build-ia32" - - cd "${srcdir}/${_gitname}_build-ia32/${_src_rootdir}/" + ## Unset all compiler FLAGS unset CFLAGS unset CPPFLAGS unset CXXFLAGS unset LDFLAGS unset MAKEFLAGS - make ARCH="ia32" -j1 - echo - - make ARCH="ia32" -j1 -C apps all - echo -} - -build() { - rm -rf "${srcdir}/${_gitname}_build/" || true - cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build" - cd "${srcdir}/${_gitname}_build/${_src_rootdir}/" - ## Disable ms_abi in gnu-efi Makefiles - # patch -Np1 -i "${srcdir}/gnu-efi-disable-use_ms_abi.patch" + make -j1 echo - 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}/${_gitname}_build-x86_64/${_src_rootdir}/" - - make ARCH="x86_64" INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install + make -j1 -C apps all echo - install -d "${pkgdir}/usr/share/gnu-efi/apps/x86_64/" - install -D -m0644 "${srcdir}/${_gitname}_build-x86_64/${_src_rootdir}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/x86_64/" } -_package_gnu-efi-libs-ia32() { - cd "${srcdir}/${_gitname}_build-ia32/${_src_rootdir}/" +package() { + + cd "${srcdir}/${_gitname}_build/${_src_rootdir}/" - make ARCH="ia32" INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/${_LIBDIR32}" install + make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install echo - install -d "${pkgdir}/usr/share/gnu-efi/apps/ia32/" - install -D -m0644 "${srcdir}/${_gitname}_build-ia32/${_src_rootdir}/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 + install -d "${pkgdir}/usr/share/gnu-efi/apps/" + install -D -m0644 "${srcdir}/${_gitname}_build/${_src_rootdir}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/" + } diff --git a/gnu-efi-disable-use_ms_abi.patch b/gnu-efi-disable-use_ms_abi.patch deleted file mode 100644 index 531a23c62b13..000000000000 --- a/gnu-efi-disable-use_ms_abi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Make.defaults b/Make.defaults -index a22a1b4..4c95e7b 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -83,7 +83,7 @@ GCCNEWENOUGH := $(shell ( [ $(GCCVERSION) -gt "4" ] \ - && [ $(GCCMINOR) -ge "7" ] ) ) \ - && echo 1) - ifeq ($(GCCNEWENOUGH),1) -- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 -+ CPPFLAGS += --std=c11 - endif - - # Arch-specific compilation flags |