90e6999a07
- Update to the stuff in master to fix the issue at: https://bodhi.fedoraproject.org/updates/FEDORA-2020-050993b283#comment-1208958 - Update to 3.0.11 (via patches generated from git) - Plus newer upstream fixes (also via patches generated from git) - Fix shell exit failures in make - Fix .reloc section generation - Fix CHAR8 definition - Fix "make DESTDIR=..." - Change the installed .a/.o layout - Provide makefiles for consumers to use. - Make the -devel noarch since it's just headers. - Add a bunch of compatibility symlinks for our older packages. These will go away once we've migrated everything using them in fedora to use the newer make system... Signed-off-by: Peter Jones <pjones@redhat.com>
112 lines
3.4 KiB
Diff
112 lines
3.4 KiB
Diff
From 656a63fa501797f26b8169e5e01fe61c05fb1158 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 14 Nov 2019 10:08:08 -0500
|
|
Subject: [PATCH 26/46] Remove the accidental lib/Makefile.orig
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
lib/Makefile.orig | 91 -----------------------------------------------
|
|
1 file changed, 91 deletions(-)
|
|
delete mode 100644 lib/Makefile.orig
|
|
|
|
diff --git a/lib/Makefile.orig b/lib/Makefile.orig
|
|
deleted file mode 100644
|
|
index 65aa8ca5df2..00000000000
|
|
--- a/lib/Makefile.orig
|
|
+++ /dev/null
|
|
@@ -1,91 +0,0 @@
|
|
-#
|
|
-# Copyright (C) 1999-2001 Hewlett-Packard Co.
|
|
-# Contributed by David Mosberger <davidm@hpl.hp.com>
|
|
-# Contributed by Stephane Eranian <eranian@hpl.hp.com>
|
|
-#
|
|
-# All rights reserved.
|
|
-#
|
|
-# Redistribution and use in source and binary forms, with or without
|
|
-# modification, are permitted provided that the following conditions
|
|
-# are met:
|
|
-#
|
|
-# * Redistributions of source code must retain the above copyright
|
|
-# notice, this list of conditions and the following disclaimer.
|
|
-# * Redistributions in binary form must reproduce the above
|
|
-# copyright notice, this list of conditions and the following
|
|
-# disclaimer in the documentation and/or other materials
|
|
-# provided with the distribution.
|
|
-# * Neither the name of Hewlett-Packard Co. nor the names of its
|
|
-# contributors may be used to endorse or promote products derived
|
|
-# from this software without specific prior written permission.
|
|
-#
|
|
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
|
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
|
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
|
-# BE LIABLE FOR ANYDIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
|
-# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
|
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
|
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
-# SUCH DAMAGE.
|
|
-#
|
|
-
|
|
-SRCDIR = .
|
|
-
|
|
-VPATH = $(SRCDIR)
|
|
-
|
|
-include $(SRCDIR)/../Make.defaults
|
|
-
|
|
-TOPDIR = $(SRCDIR)/..
|
|
-
|
|
-CDIR = $(TOPDIR)/..
|
|
-FILES = boxdraw smbios console crc data debug dpath \
|
|
- error event guid hand hw init lock \
|
|
- misc print sread str cmdline \
|
|
- runtime/rtlock runtime/efirtlib runtime/rtstr runtime/vm runtime/rtdata \
|
|
- $(ARCH)/initplat $(ARCH)/math
|
|
-
|
|
-ifeq ($(ARCH),ia64)
|
|
-FILES += $(ARCH)/salpal $(ARCH)/palproc
|
|
-endif
|
|
-
|
|
-ifeq ($(ARCH),x86_64)
|
|
-FILES += $(ARCH)/callwrap $(ARCH)/efi_stub
|
|
-endif
|
|
-
|
|
-ifeq ($(ARCH),arm)
|
|
-FILES += $(ARCH)/lib1funcs $(ARCH)/div64
|
|
-endif
|
|
-
|
|
-OBJS = $(FILES:%=%.o)
|
|
-
|
|
-SUBDIRS = ia32 x86_64 ia64 aarch64 arm runtime
|
|
-
|
|
-LIBDIRINSTALL = $(INSTALLROOT)$(LIBDIR)
|
|
-
|
|
-all: libsubdirs libefi.a
|
|
-
|
|
-.PHONY: libsubdirs
|
|
-libsubdirs:
|
|
- for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
|
|
-
|
|
-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
|
|
-
|
|
-include $(SRCDIR)/../Make.rules
|
|
-
|
|
-.PHONY: libsubdirs
|
|
--
|
|
2.24.1
|
|
|