components/pdsh/patches/find-genders-lib.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 14 Oct 2016 14:53:30 -0700
changeset 7114 72d09e38c454
parent 6500 eb9df404cf15
permissions -rw-r--r--
24850486 Yelp says XSLT stylesheet `/usr/share/yelp/xslt/mal2html.xsl' is missing
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6500
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Until the genders package is available on Userland build machines, then we
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
need to get libgenders.so from the prototype area of the built genders
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
component. Unfortunately there are no configure smarts to allow this to
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
be easily done.
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
This patch will not be sent upstream. When genders is on the Userland build
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
machines then this patch can be removed, along with the CONFIGURE_ENV line
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
in the component Makefile.
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
--- pdsh-2.29/configure.orig	2016-07-24 16:55:41.644998411 -0700
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
+++ pdsh-2.29/configure	2016-07-24 17:05:14.064517775 -0700
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
@@ -24937,7 +24937,7 @@
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
   echo $ECHO_N "(cached) $ECHO_C" >&6
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
 else
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
   ac_check_lib_save_LIBS=$LIBS
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
-LIBS="-lgenders  $LIBS"
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
+LIBS="$GENDERS_LD_OPTIONS -lgenders  $LIBS"
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 cat >conftest.$ac_ext <<_ACEOF
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 /* confdefs.h.  */
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
 _ACEOF
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
@@ -25024,7 +25024,7 @@
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
   echo $ECHO_N "(cached) $ECHO_C" >&6
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
 else
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
   ac_check_lib_save_LIBS=$LIBS
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
-LIBS="-lgenders  $LIBS"
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
+LIBS="$GENDERS_LD_OPTIONS -lgenders  $LIBS"
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
 cat >conftest.$ac_ext <<_ACEOF
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
 /* confdefs.h.  */
eb9df404cf15 PSARC 2016/379 genders - version 1.22
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
 _ACEOF