equal
deleted
inserted
replaced
1 --- libxslt-1.1.26/configure.in.orig Mon Mar 21 13:06:53 2011 |
1 Our Userland Makefile replaces the upstream link-editor version script with a |
2 +++ libxslt-1.1.26/configure.in Mon Mar 21 13:08:28 2011 |
2 Solaris-specific version 2 mapfile which is incompatible with the |
3 @@ -348,6 +348,10 @@ |
3 ld --version-script option. Remove the upstream configure test that prefers |
|
4 to use --version-script if available, and force the use of -M. |
|
5 |
|
6 If PYTHON_VENDOR_PACKAGES is defined, set PYTHON_SITE_PACKAGES to the |
|
7 same value. |
|
8 |
|
9 --- libxslt-1.1.28/configure.in.orig 2012-11-21 00:10:58.000000000 -0700 |
|
10 +++ libxslt-1.1.28/configure.in 2015-12-02 15:32:07.243853314 -0700 |
|
11 @@ -131,12 +131,8 @@ |
|
12 dnl then add it |
|
13 dnl |
|
14 AC_MSG_CHECKING([how to pass version script to the linker ($LD)]) |
|
15 -VERSION_SCRIPT_FLAGS=none |
|
16 -if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then |
|
17 - VERSION_SCRIPT_FLAGS=-Wl,--version-script= |
|
18 -elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then |
|
19 VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," |
|
20 -fi |
|
21 + |
|
22 AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) |
|
23 AC_SUBST(VERSION_SCRIPT_FLAGS) |
|
24 AM_CONDITIONAL([USE_VERSION_SCRIPT], [test "$VERSION_SCRIPT_FLAGS" != none]) |
|
25 @@ -364,6 +360,10 @@ |
4 else |
26 else |
5 pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
27 pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
6 fi |
28 fi |
7 + if test "$PYTHON_VENDOR_PACKAGES" != "" |
29 + if test "$PYTHON_VENDOR_PACKAGES" != "" |
8 + then |
30 + then |