[arch-commits] Commit in gnu-efi-libs/repos (6 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Wed May 28 06:29:34 UTC 2014
Date: Wednesday, May 28, 2014 @ 08:29:34
Author: tpowa
Revision: 213679
archrelease: copy trunk to extra-x86_64, extra-i686
Added:
gnu-efi-libs/repos/extra-i686/PKGBUILD
(from rev 213678, gnu-efi-libs/trunk/PKGBUILD)
gnu-efi-libs/repos/extra-i686/gnu-efi-3.0v-revert-makefile-commit.patch
(from rev 213678, gnu-efi-libs/trunk/gnu-efi-3.0v-revert-makefile-commit.patch)
gnu-efi-libs/repos/extra-x86_64/PKGBUILD
(from rev 213678, gnu-efi-libs/trunk/PKGBUILD)
gnu-efi-libs/repos/extra-x86_64/gnu-efi-3.0v-revert-makefile-commit.patch
(from rev 213678, gnu-efi-libs/trunk/gnu-efi-3.0v-revert-makefile-commit.patch)
Deleted:
gnu-efi-libs/repos/extra-i686/PKGBUILD
gnu-efi-libs/repos/extra-x86_64/PKGBUILD
--------------------------------------------------------+
/PKGBUILD | 108 ++++++++++
extra-i686/PKGBUILD | 47 ----
extra-i686/gnu-efi-3.0v-revert-makefile-commit.patch | 148 +++++++++++++++
extra-x86_64/PKGBUILD | 47 ----
extra-x86_64/gnu-efi-3.0v-revert-makefile-commit.patch | 148 +++++++++++++++
5 files changed, 404 insertions(+), 94 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-05-28 06:29:24 UTC (rev 213678)
+++ extra-i686/PKGBUILD 2014-05-28 06:29:34 UTC (rev 213679)
@@ -1,47 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
-
-_pkgver="3.0"
-pkgname="gnu-efi-libs"
-pkgver="${_pkgver}u"
-pkgrel="4"
-pkgdesc="Library for building UEFI Applications using GNU toolchain"
-url="http://sourceforge.net/projects/gnu-efi/"
-license=('GPL')
-arch=('x86_64' 'i686')
-options=('!strip' '!makeflags' 'staticlibs')
-makedepends=('pciutils')
-
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
-md5sums=('d15d3c700e79a1e2938544d73edc572d')
-
-[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
-
-build() {
-
- cd "${srcdir}/gnu-efi-${_pkgver}/"
-
- ## Unset all compiler FLAGS
- unset CFLAGS
- unset CPPFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- make -j1
- make -j1 -C apps all
-
-}
-
-package() {
-
- cd "${srcdir}/gnu-efi-${_pkgver}/"
-
- make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" 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}/"
-
-}
Copied: gnu-efi-libs/repos/extra-i686/PKGBUILD (from rev 213678, gnu-efi-libs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-05-28 06:29:34 UTC (rev 213679)
@@ -0,0 +1,54 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+
+_pkgver="3.0"
+pkgname="gnu-efi-libs"
+pkgver="${_pkgver}v"
+pkgrel="1"
+pkgdesc="Library for building UEFI Applications using GNU toolchain"
+url="http://sourceforge.net/projects/gnu-efi/"
+license=('GPL')
+arch=('x86_64' 'i686')
+options=('!strip' '!makeflags' 'staticlibs')
+makedepends=('pciutils')
+
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"
+ 'gnu-efi-3.0v-revert-makefile-commit.patch')
+
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
+
+perpare() {
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+ patch -Np1 -i "${srcdir}/gnu-efi-3.0v-revert-makefile-commit.patch"
+}
+
+build() {
+
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+
+ ## Unset all compiler FLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ make -j1
+ make -j1 -C apps all
+
+}
+
+package() {
+
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+
+ make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" 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}/"
+
+}
+md5sums=('57f0a308c0e939e5d18e40840a5484a9'
+ '19daf1c655747fb6cc7f37a18623ae26')
Copied: gnu-efi-libs/repos/extra-i686/gnu-efi-3.0v-revert-makefile-commit.patch (from rev 213678, gnu-efi-libs/trunk/gnu-efi-3.0v-revert-makefile-commit.patch)
===================================================================
--- extra-i686/gnu-efi-3.0v-revert-makefile-commit.patch (rev 0)
+++ extra-i686/gnu-efi-3.0v-revert-makefile-commit.patch 2014-05-28 06:29:34 UTC (rev 213679)
@@ -0,0 +1,148 @@
+From 3100a29932662dd8b045ca0a2c3329e67b2b2df3 Mon Sep 17 00:00:00 2001
+From: Keshav Amburay <the.ridikulus.rat at gmail.com>
+Date: Tue, 13 May 2014 14:14:31 -0400
+Subject: [PATCH] Revert 06744d69273de4945cf0ffcaa4a6abf7cec707b6
+
+---
+ gnu-efi-3.0/gnuefi/Makefile | 34 ++++++++++++----------------------
+ gnu-efi-3.0/inc/Makefile | 36 +++++++++++-------------------------
+ gnu-efi-3.0/lib/Makefile | 13 +++----------
+ 3 files changed, 26 insertions(+), 57 deletions(-)
+
+diff --git a/gnu-efi-3.0/gnuefi/Makefile b/gnu-efi-3.0/gnuefi/Makefile
+index 71e93f9..27f43b7 100644
+--- a/gnu-efi-3.0/gnuefi/Makefile
++++ b/gnu-efi-3.0/gnuefi/Makefile
+@@ -49,19 +49,6 @@ OBJS = $(FILES:%=%.o)
+
+ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
+
+-INSTALLTARGETS = $(TARGETS)
+-ifneq (,$(findstring FreeBSD,$(OS)))
+- ifeq ($(ARCH),x86_64)
+- INSTALLTARGETS += elf_$(ARCH)_fbsd_efi.lds
+- else
+- INSTALLTARGETS += elf_$(ARCH)_efi.lds
+- endif
+-else
+- INSTALLTARGETS += elf_$(ARCH)_efi.lds
+-endif
+-
+-LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
+-
+ all: $(TARGETS)
+
+ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+@@ -69,14 +56,17 @@ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+ clean:
+ rm -f $(TARGETS) *~ *.o $(OBJS)
+
+-$(LIBDIRINSTALL):
+- mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(LIBDIRINSTALL)/%: % | $$(dir $$@)
+- $(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
++install:
++ mkdir -p $(INSTALLROOT)/$(LIBDIR)
++ $(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)/$(LIBDIR)
++ifneq (,$(findstring FreeBSD,$(OS)))
++ ifeq ($(ARCH),x86_64)
++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ else
++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ endif
++else
++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++endif
+
+ include $(SRCDIR)/../Make.rules
+diff --git a/gnu-efi-3.0/inc/Makefile b/gnu-efi-3.0/inc/Makefile
+index 526af22..273d303 100644
+--- a/gnu-efi-3.0/inc/Makefile
++++ b/gnu-efi-3.0/inc/Makefile
+@@ -8,34 +8,20 @@ TOPDIR = $(SRCDIR)/..
+
+ CDIR=$(TOPDIR)/..
+
+-INCDIRINSTALL = $(INSTALLROOT)$(PREFIX)/include/efi
+-
+-SRCHEADERS = $(wildcard $(SRCDIR)/*.h) \
+- $(wildcard $(SRCDIR)/protocol/*.h) \
+- $(wildcard $(SRCDIR)/$(ARCH)/*.h)
+-ifeq ($(ARCH),ia64)
+- SRCHEADERS += $(wildcard $(SRCDIR)/protocol/$(ARCH)/*.h)
+-endif
+-
+-HEADERS = $(patsubst $(SRCDIR)/%,%,$(SRCHEADERS))
+-
+ all:
+
+ clean:
+
+- rm -f *~
+-
+-$(INCDIRINSTALL) \
+-$(INCDIRINSTALL)/protocol \
+-$(INCDIRINSTALL)/$(ARCH) \
+-$(INCDIRINSTALL)/protocol/$(ARCH):
+- mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(INCDIRINSTALL)/%.h: %.h | $$(dir $$@)
+- $(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
++install:
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++ $(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi
++ $(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++ $(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++ifeq ($(ARCH),ia64)
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++ $(INSTALL) -m 644 $(SRCDIR)/protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++endif
+
+ include $(SRCDIR)/../Make.rules
+diff --git a/gnu-efi-3.0/lib/Makefile b/gnu-efi-3.0/lib/Makefile
+index d2635ad..e9f604e 100644
+--- a/gnu-efi-3.0/lib/Makefile
++++ b/gnu-efi-3.0/lib/Makefile
+@@ -61,11 +61,8 @@ OBJS = $(FILES:%=%.o)
+
+ SUBDIRS = ia32 x86_64 ia64 runtime
+
+-LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
+-
+ all: libsubdirs libefi.a
+
+-.PHONY: libsubdirs
+ libsubdirs:
+ for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
+
+@@ -74,13 +71,9 @@ libefi.a: $(patsubst %,libefi.a(%),$(OBJS))
+ clean:
+ rm -f libefi.a *~ $(OBJS) */*.o
+
+-$(LIBDIRINSTALL):
+- mkdir -p $@
+-
+-$(LIBDIRINSTALL)/libefi.a: libefi.a | $(LIBDIRINSTALL)
+- $(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(LIBDIRINSTALL)/libefi.a
++install: libefi.a
++ mkdir -p $(INSTALLROOT)/$(LIBDIR)
++ $(INSTALL) -m 644 libefi.a $(INSTALLROOT)/$(LIBDIR)
+
+ include $(SRCDIR)/../Make.rules
+
+--
+1.9.2
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-05-28 06:29:24 UTC (rev 213678)
+++ extra-x86_64/PKGBUILD 2014-05-28 06:29:34 UTC (rev 213679)
@@ -1,47 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
-
-_pkgver="3.0"
-pkgname="gnu-efi-libs"
-pkgver="${_pkgver}u"
-pkgrel="4"
-pkgdesc="Library for building UEFI Applications using GNU toolchain"
-url="http://sourceforge.net/projects/gnu-efi/"
-license=('GPL')
-arch=('x86_64' 'i686')
-options=('!strip' '!makeflags' 'staticlibs')
-makedepends=('pciutils')
-
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
-md5sums=('d15d3c700e79a1e2938544d73edc572d')
-
-[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
-
-build() {
-
- cd "${srcdir}/gnu-efi-${_pkgver}/"
-
- ## Unset all compiler FLAGS
- unset CFLAGS
- unset CPPFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- make -j1
- make -j1 -C apps all
-
-}
-
-package() {
-
- cd "${srcdir}/gnu-efi-${_pkgver}/"
-
- make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" 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}/"
-
-}
Copied: gnu-efi-libs/repos/extra-x86_64/PKGBUILD (from rev 213678, gnu-efi-libs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-05-28 06:29:34 UTC (rev 213679)
@@ -0,0 +1,54 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+
+_pkgver="3.0"
+pkgname="gnu-efi-libs"
+pkgver="${_pkgver}v"
+pkgrel="1"
+pkgdesc="Library for building UEFI Applications using GNU toolchain"
+url="http://sourceforge.net/projects/gnu-efi/"
+license=('GPL')
+arch=('x86_64' 'i686')
+options=('!strip' '!makeflags' 'staticlibs')
+makedepends=('pciutils')
+
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"
+ 'gnu-efi-3.0v-revert-makefile-commit.patch')
+
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
+
+perpare() {
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+ patch -Np1 -i "${srcdir}/gnu-efi-3.0v-revert-makefile-commit.patch"
+}
+
+build() {
+
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+
+ ## Unset all compiler FLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ make -j1
+ make -j1 -C apps all
+
+}
+
+package() {
+
+ cd "${srcdir}/gnu-efi-${_pkgver}/"
+
+ make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" 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}/"
+
+}
+md5sums=('57f0a308c0e939e5d18e40840a5484a9'
+ '19daf1c655747fb6cc7f37a18623ae26')
Copied: gnu-efi-libs/repos/extra-x86_64/gnu-efi-3.0v-revert-makefile-commit.patch (from rev 213678, gnu-efi-libs/trunk/gnu-efi-3.0v-revert-makefile-commit.patch)
===================================================================
--- extra-x86_64/gnu-efi-3.0v-revert-makefile-commit.patch (rev 0)
+++ extra-x86_64/gnu-efi-3.0v-revert-makefile-commit.patch 2014-05-28 06:29:34 UTC (rev 213679)
@@ -0,0 +1,148 @@
+From 3100a29932662dd8b045ca0a2c3329e67b2b2df3 Mon Sep 17 00:00:00 2001
+From: Keshav Amburay <the.ridikulus.rat at gmail.com>
+Date: Tue, 13 May 2014 14:14:31 -0400
+Subject: [PATCH] Revert 06744d69273de4945cf0ffcaa4a6abf7cec707b6
+
+---
+ gnu-efi-3.0/gnuefi/Makefile | 34 ++++++++++++----------------------
+ gnu-efi-3.0/inc/Makefile | 36 +++++++++++-------------------------
+ gnu-efi-3.0/lib/Makefile | 13 +++----------
+ 3 files changed, 26 insertions(+), 57 deletions(-)
+
+diff --git a/gnu-efi-3.0/gnuefi/Makefile b/gnu-efi-3.0/gnuefi/Makefile
+index 71e93f9..27f43b7 100644
+--- a/gnu-efi-3.0/gnuefi/Makefile
++++ b/gnu-efi-3.0/gnuefi/Makefile
+@@ -49,19 +49,6 @@ OBJS = $(FILES:%=%.o)
+
+ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
+
+-INSTALLTARGETS = $(TARGETS)
+-ifneq (,$(findstring FreeBSD,$(OS)))
+- ifeq ($(ARCH),x86_64)
+- INSTALLTARGETS += elf_$(ARCH)_fbsd_efi.lds
+- else
+- INSTALLTARGETS += elf_$(ARCH)_efi.lds
+- endif
+-else
+- INSTALLTARGETS += elf_$(ARCH)_efi.lds
+-endif
+-
+-LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
+-
+ all: $(TARGETS)
+
+ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+@@ -69,14 +56,17 @@ libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
+ clean:
+ rm -f $(TARGETS) *~ *.o $(OBJS)
+
+-$(LIBDIRINSTALL):
+- mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(LIBDIRINSTALL)/%: % | $$(dir $$@)
+- $(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
++install:
++ mkdir -p $(INSTALLROOT)/$(LIBDIR)
++ $(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)/$(LIBDIR)
++ifneq (,$(findstring FreeBSD,$(OS)))
++ ifeq ($(ARCH),x86_64)
++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ else
++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++ endif
++else
++ $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR)
++endif
+
+ include $(SRCDIR)/../Make.rules
+diff --git a/gnu-efi-3.0/inc/Makefile b/gnu-efi-3.0/inc/Makefile
+index 526af22..273d303 100644
+--- a/gnu-efi-3.0/inc/Makefile
++++ b/gnu-efi-3.0/inc/Makefile
+@@ -8,34 +8,20 @@ TOPDIR = $(SRCDIR)/..
+
+ CDIR=$(TOPDIR)/..
+
+-INCDIRINSTALL = $(INSTALLROOT)$(PREFIX)/include/efi
+-
+-SRCHEADERS = $(wildcard $(SRCDIR)/*.h) \
+- $(wildcard $(SRCDIR)/protocol/*.h) \
+- $(wildcard $(SRCDIR)/$(ARCH)/*.h)
+-ifeq ($(ARCH),ia64)
+- SRCHEADERS += $(wildcard $(SRCDIR)/protocol/$(ARCH)/*.h)
+-endif
+-
+-HEADERS = $(patsubst $(SRCDIR)/%,%,$(SRCHEADERS))
+-
+ all:
+
+ clean:
+
+- rm -f *~
+-
+-$(INCDIRINSTALL) \
+-$(INCDIRINSTALL)/protocol \
+-$(INCDIRINSTALL)/$(ARCH) \
+-$(INCDIRINSTALL)/protocol/$(ARCH):
+- mkdir -p $@
+-
+-.SECONDEXPANSION:
+-
+-$(INCDIRINSTALL)/%.h: %.h | $$(dir $$@)
+- $(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(addprefix $(INCDIRINSTALL)/,$(HEADERS))
++install:
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++ $(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi
++ $(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
++ $(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
++ifeq ($(ARCH),ia64)
++ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++ $(INSTALL) -m 644 $(SRCDIR)/protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
++endif
+
+ include $(SRCDIR)/../Make.rules
+diff --git a/gnu-efi-3.0/lib/Makefile b/gnu-efi-3.0/lib/Makefile
+index d2635ad..e9f604e 100644
+--- a/gnu-efi-3.0/lib/Makefile
++++ b/gnu-efi-3.0/lib/Makefile
+@@ -61,11 +61,8 @@ OBJS = $(FILES:%=%.o)
+
+ SUBDIRS = ia32 x86_64 ia64 runtime
+
+-LIBDIRINSTALL = $(INSTALLROOT)/$(LIBDIR)
+-
+ all: libsubdirs libefi.a
+
+-.PHONY: libsubdirs
+ libsubdirs:
+ for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
+
+@@ -74,13 +71,9 @@ libefi.a: $(patsubst %,libefi.a(%),$(OBJS))
+ clean:
+ rm -f libefi.a *~ $(OBJS) */*.o
+
+-$(LIBDIRINSTALL):
+- mkdir -p $@
+-
+-$(LIBDIRINSTALL)/libefi.a: libefi.a | $(LIBDIRINSTALL)
+- $(INSTALL) -m 644 $< $(dir $@)
+-
+-install: $(LIBDIRINSTALL)/libefi.a
++install: libefi.a
++ mkdir -p $(INSTALLROOT)/$(LIBDIR)
++ $(INSTALL) -m 644 libefi.a $(INSTALLROOT)/$(LIBDIR)
+
+ include $(SRCDIR)/../Make.rules
+
+--
+1.9.2
+
More information about the arch-commits
mailing list