| author | Ali Bahrami <Ali.Bahrami@Oracle.COM> |
| Thu, 03 Dec 2015 14:27:29 -0700 | |
| changeset 5150 | 8af18e2b90dd |
| parent 148 | 33ca3897ae25 |
| permissions | -rw-r--r-- |
|
5150
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
1 |
Our Userland Makefile replaces the upstream link-editor version script with a |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
2 |
Solaris-specific version 2 mapfile which is incompatible with the |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
3 |
ld --version-script option. Remove the upstream configure test that prefers |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
4 |
to use --version-script if available, and force the use of -M. |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
5 |
|
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
6 |
If PYTHON_VENDOR_PACKAGES is defined, set PYTHON_SITE_PACKAGES to the |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
7 |
same value. |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
8 |
|
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
9 |
--- libxslt-1.1.28/configure.in.orig 2012-11-21 00:10:58.000000000 -0700 |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
10 |
+++ libxslt-1.1.28/configure.in 2015-12-02 15:32:07.243853314 -0700 |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
11 |
@@ -131,12 +131,8 @@ |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
12 |
dnl then add it |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
13 |
dnl |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
14 |
AC_MSG_CHECKING([how to pass version script to the linker ($LD)]) |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
15 |
-VERSION_SCRIPT_FLAGS=none |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
16 |
-if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
17 |
- VERSION_SCRIPT_FLAGS=-Wl,--version-script= |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
18 |
-elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
19 |
VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
20 |
-fi |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
21 |
+ |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
22 |
AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
23 |
AC_SUBST(VERSION_SCRIPT_FLAGS) |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
24 |
AM_CONDITIONAL([USE_VERSION_SCRIPT], [test "$VERSION_SCRIPT_FLAGS" != none]) |
|
8af18e2b90dd
22302820 libxslt build broken by introduction of of ld --version-script
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
148
diff
changeset
|
25 |
@@ -364,6 +360,10 @@ |
|
148
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
26 |
else |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
27 |
pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
28 |
fi |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
29 |
+ if test "$PYTHON_VENDOR_PACKAGES" != "" |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
30 |
+ then |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
31 |
+ PYTHON_SITE_PACKAGES=$PYTHON_VENDOR_PACKAGES |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
32 |
+ fi |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
33 |
fi |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
34 |
AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") |
|
33ca3897ae25
7029701 libxml2 should move to userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
35 |
if test "$PYTHON_INCLUDES" != "" |