Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/lua/patches/4.src.Makefile.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 19 Sep 2013 10:15:45 -0700
changeset 1479 00fd84194115
parent 1021 93e0813581a0
permissions -rw-r--r--
PSARC 2013/303 curl - scp / sftp support 15801026 SUNBT7180402 libcurl should provide sftp/scp URI support
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     1
 
--- src/Makefile.~1~	2012-03-09 08:32:16.000000000 -0800
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     2
 
+++ src/Makefile	2012-09-12 13:46:16.774180863 -0700
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     3
 
@@ -4,12 +4,12 @@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     4
 
 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     5
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     6
 
 # Your platform. See PLATS for possible values.
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     7
 
-PLAT= none
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     8
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
     9
 
-CC= gcc
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    10
 
-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    11
 
+
1021
93e0813581a0 7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 990
diff changeset 
    12
 
+CFLAGS= $(MYCFLAGS) $(USRCFLAGS)
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    13
 
+studio_XBITS.sparc.64 += -xcode=pic13
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    14
 
 LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    15
 
-LIBS= -lm $(SYSLIBS) $(MYLIBS)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    16
 
+LIBS= -lm -lc $(MYLIBS)
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    17
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    18
 
 AR= ar rcu
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    19
 
 RANLIB= ranlib
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    20
 
@@ -20,15 +20,16 @@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    21
 
 SYSLIBS=
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    22
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    23
 
 MYCFLAGS=
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    24
 
-MYLDFLAGS=
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    25
 
+LD_Z_TEXT += -z text
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    26
 
+MYLDFLAGS= $(LD_OPTIONS_SO) $(LD_OPTIONS)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    27
 
 MYLIBS=
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    28
 
 MYOBJS=
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    29
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    30
 
 # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    31
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    32
 
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    33
 
+PLATS= solaris
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    34
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    35
 
-LUA_A=	liblua.a
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    36
 
+LUA_SO=	liblua.so
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    37
 
 CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    38
 
 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    39
 
 	ltm.o lundump.o lvm.o lzio.o
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    40
 
@@ -43,11 +44,11 @@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    41
 
 LUAC_O=	luac.o
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    42
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    43
 
 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    44
 
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    45
 
-ALL_A= $(LUA_A)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    46
 
+ALL_T= $(LUA_SO) $(LUA_T) $(LUAC_T)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    47
 
+ALL_A= $(LUA_SO)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    48
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    49
 
 # Targets start here.
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    50
 
-default: $(PLAT)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    51
 
+default: solaris
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    52
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    53
 
 all:	$(ALL_T)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    54
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    55
 
@@ -55,15 +56,15 @@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    56
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    57
 
 a:	$(ALL_A)
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    58
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    59
 
-$(LUA_A): $(BASE_O)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    60
 
-	$(AR) $@ $(BASE_O)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    61
 
-	$(RANLIB) $@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    62
 
+$(LUA_SO): $(CORE_O) $(LIB_O)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    63
 
+	$(CC) -o $(LUA_SO) -G -h $(LUA_SO) $(CFLAGS) $(MYLDFLAGS) $(CORE_O) \
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    64
 
+	$(LIB_O) $(LIBS)
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    65
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    66
 
-$(LUA_T): $(LUA_O) $(LUA_A)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    67
 
-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    68
 
+$(LUA_T): $(LUA_O) $(LUA_SO)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    69
 
+	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_SO) $(LIBS)
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    70
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    71
 
-$(LUAC_T): $(LUAC_O) $(LUA_A)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    72
 
-	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    73
 
+$(LUAC_T): $(LUAC_O) $(LUA_SO)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    74
 
+	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_SO) $(LIBS)
535
5fca86890b48 7100733 Include Lua 5.1.4 patch
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    75
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    76
 
 clean:
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    77
 
 	$(RM) $(ALL_T) $(ALL_O)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    78
 
@@ -118,7 +119,7 @@
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    79
 
 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX"
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    80
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    81
 
 solaris:
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    82
 
-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" SYSLIBS="-ldl"
1021
93e0813581a0 7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 990
diff changeset 
    83
 
+	$(MAKE) all "USRCFLAGS=$(USRCFLAGS)" MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl"
990
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    84
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    85
 
 # list targets that do not create files (but not all makes understand .PHONY)
6bfca1239ccb 7197062 Upgrade lua to 5.2.1
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents: 535
diff changeset 
    86
 
 .PHONY: all $(PLATS) default o a clean depend echo none
upstream/oracle/userland-gate