components/gnuefi/patches/01-make_default.patch
author Ann Lai <ann.lai@oracle.com>
Wed, 27 Apr 2016 13:38:51 -0700
changeset 5855 986a46fa92f7
permissions -rw-r--r--
PSARC/2016/089 gnuefi library 23116736 Add gnuefi to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5855
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     1
# Source: Internal
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     2
# Info: Written internally so this component can be built on Solaris.
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     3
# Status: This patch is offered at https://sourceforge.net/p/gnu-efi/patches/37/
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     4
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     5
--- ORIGINAL/Make.defaults	2016-04-15 14:10:55.425262660 -0700
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     6
+++ gnu-efi-3.0/Make.defaults	2016-04-26 11:30:19.926023537 -0700
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     7
@@ -45,15 +45,16 @@
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     8
 # Where to install the package. GNU-EFI will create and access
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
     9
 # lib and include under the root
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    10
 #
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    11
-INSTALLROOT  := /
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    12
-PREFIX       := /usr/local
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    13
-LIBDIR 	     := $(PREFIX)/lib
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    14
-INSTALL	     := install
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    15
+INSTALLROOT  := $(DESTDIR)
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    16
+PREFIX       := /usr
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    17
+INSTALL	     := ginstall
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    18
 
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    19
 # Host/target identification
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    20
 OS	     := $(shell uname -s)
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    21
 HOSTARCH     := $(shell uname -m | sed s,i[3456789]86,ia32,)
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    22
-ARCH	     := $(shell uname -m | sed s,i[3456789]86,ia32,)
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    23
+ARCH         := $(shell isainfo -n)
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    24
+LIBDIR       := $(PREFIX)/lib/$(ARCH)
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    25
+ARCH3264     := -m64
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    26
 
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    27
 # FreeBSD (and possibly others) reports amd64 instead of x86_64
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    28
 ifeq ($(ARCH),amd64)
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    29
@@ -64,10 +65,10 @@
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    30
 prefix       := /usr/bin/
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    31
 CC           := $(prefix)gcc
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    32
 AS           := $(prefix)as
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    33
-LD           := $(prefix)ld
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    34
+LD           := /usr/ccs/bin/gld
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    35
 AR           := $(prefix)ar
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    36
 RANLIB       := $(prefix)ranlib
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    37
-OBJCOPY      := $(prefix)objcopy
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    38
+OBJCOPY	     := /usr/gnu/bin/objcopy
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    39
 
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    40
 
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    41
 #
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    42
@@ -109,7 +110,7 @@
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    43
 
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    44
 # Generic compilation flags
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    45
 INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    46
-           -I$(TOPDIR)/inc/protocol
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    47
+           -I$(TOPDIR)/inc/protocol -I/usr/include
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    48
 CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    49
            -fno-merge-constants -ffreestanding -fno-stack-protector       \
986a46fa92f7 PSARC/2016/089 gnuefi library
Ann Lai <ann.lai@oracle.com>
parents:
diff changeset
    50
            -fno-stack-check