| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Wed, 04 Nov 2015 02:38:31 -0800 | |
| changeset 5060 | cd8d20971627 |
| permissions | -rw-r--r-- |
|
5060
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
Allows to test minigzip with installed version of zlib. |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- zlib-1.2.8/Makefile.in |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ zlib-1.2.8/Makefile.in |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
@@ -92,9 +92,11 @@ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
rm -f $$TMPST |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
|
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
testshared: shared |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
- @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ @if test -z $(SYSTEM_TEST); then \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ fi; \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
TMPSH=tmpsh_$$; \ |
|
cd8d20971627
22149578 zlib should have master test results and support system-test
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \ |