| author | Prakash Jalan <Prakash.Jalan@oracle.com> |
| Thu, 13 Mar 2014 11:25:30 -0700 | |
| branch | s11-update |
| changeset 2987 | 01d2e6a3aae8 |
| parent 2557 | b52f689e05e2 |
| permissions | -rw-r--r-- |
|
2557
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Adjust the CFLAGS in the Solaris Studio Makefile to not include build |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
options like '-fast' and '-lpthread', use -D_REENTRANT instead of -mt |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
and to not set a run path. |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- pbzip2-1.1.6/Makefile.solaris.sunstudio.orig 2013-03-18 08:53:39.894869460 -0700 |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ pbzip2-1.1.6/Makefile.solaris.sunstudio 2013-03-18 10:37:02.531235184 -0700 |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -4,11 +4,12 @@ |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
# Compiler to use |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
CC=CC |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
CFLAGS = -m64 |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
-CFLAGS += -fast -xO5 |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+CFLAGS += -xO5 |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
|
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
#CFLAGS += -Wall |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
#CFLAGS += -g |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
-CFLAGS += -mt -lpthread |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+CFLAGS += -D_REENTRANT |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
+CFLAGS += -norunpath |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
|
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
# Comment out CFLAGS line below for compatability mode for 32bit file sizes |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
# (less than 2GB) and systems that have compilers that treat int as 64bit |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
@@ -30,7 +31,6 @@ |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
|
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
# Libraries |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
LDFLAGS = -lbz2 |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
-LDFLAGS += -lpthread |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
|
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
# Where you want pbzip2 installed when you do 'make install' |
|
b52f689e05e2
PSARC 2012/095 pbzip2 version 1.1.6 - parallel bzip2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
PREFIX = /usr |