author | Rich Burridge <rich.burridge@oracle.com> |
Wed, 20 Jan 2016 10:50:52 -0800 | |
changeset 5299 | a301501de846 |
permissions | -rw-r--r-- |
5299
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Fix the generation of the 64-bit /usr/lib/64/pkgconfig/autoopts.pc |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
for Solaris based on changes to .../autoopts/mk-autoopts-pc.in already |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
present upstream. |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- autogen-5.16.2/autoopts/mk-autoopts-pc.in.orig 2016-01-19 16:17:03.319088249 -0800 |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ autogen-5.16.2/autoopts/mk-autoopts-pc.in 2016-01-19 16:17:23.599671581 -0800 |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -31,7 +31,7 @@ |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
cflags="-I${includedir}" |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
test 'X@ENABLE_STATIC@' = Xno && static_libs='' |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
case "${libdir}" in |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
-/lib | /lib64 | /usr/lib | /usr/lib64 ) |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+/lib | /lib64 | /usr/lib | /usr/lib64 | /usr/lib/* ) |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
ldopts='' |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
ldflags=-lopts |
a301501de846
22568631 /usr/lib/pkgconfig/autoopts.pc is 64-bit
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
;; |