| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Wed, 11 Jun 2014 23:33:02 -0700 | |
| changeset 1945 | 3dc1935a2189 |
| child 7718 | 9960a50bc6cf |
| permissions | -rw-r--r-- |
|
1945
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
ZLIB renames *.o file into *.lo before it links them info shared |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
library. We need to do same to *.o.bc files so they are recognized by |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
Parfait during linking. |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
|
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
Downside of it is that Parfait will analyze also these separate object |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
files. |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
|
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
--- zlib-1.2.8/Makefile.in 2013-04-28 15:57:11.000000000 -0700 |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+++ zlib-1.2.8/Makefile.in 2014-05-07 07:30:58.047571894 -0700 |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
@@ -158,6 +158,7 @@ |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
-@mkdir objs 2>/dev/null || test -d objs |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $< |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
-@mv objs/$*.o $@ |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ -@if [ -f objs/$*.o.bc ]; then mv objs/$*.o.bc [email protected]; fi |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
|
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a |
|
3dc1935a2189
PSARC/2014/167 zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) |