diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-04-21 16:21:04 -0700 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:25 +0200 |
| commit | 8127b17dc289831a559944a51d0ea10028016df5 (patch) | |
| tree | 521520f31add53f0067f88ea9e83c842eee1ace5 /nx-X11 | |
| parent | dde00b2f6848a38e9fdbe1e4c85373c8b12944b4 (diff) | |
| download | nx-libs-8127b17dc289831a559944a51d0ea10028016df5.tar.gz nx-libs-8127b17dc289831a559944a51d0ea10028016df5.tar.bz2 nx-libs-8127b17dc289831a559944a51d0ea10028016df5.zip | |
Delete special case code to append "/sparcv9" to i18n module path
Was triggered by defined(__sparcv9) so only built on Solaris SPARC 64-bit.
Inconsistent with all other platforms, and a bit overcomplicated.
Should anyone need to continue using that path, simply build with
a #define POSTLOCALELIBDIR "sparcv9" to get the same result.
Fixes Solaris bug 7038737:
sparcv9 Xlib looking in wrong path for i18n loadable modules
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/lib/X11/XlcDL.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/nx-X11/lib/X11/XlcDL.c b/nx-X11/lib/X11/XlcDL.c index 879bc51eb..7a6e0485c 100644 --- a/nx-X11/lib/X11/XlcDL.c +++ b/nx-X11/lib/X11/XlcDL.c @@ -86,16 +86,6 @@ Sun Microsystems, Inc. or its licensors is granted. #include "XlcPublic.h" #include "XlcPubI.h" -#if defined(_LP64) && defined(__sparcv9) -# define _MACH64_NAME "sparcv9" -#else -# undef _MACH64_NAME -#endif /* defined(_LP64) && defined(__sparcv9) */ - -#ifdef _MACH64_NAME -# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) -#endif - #define XI18N_DLREL 2 #define iscomment(ch) ((ch) == '\0' || (ch) == '#') @@ -269,35 +259,6 @@ __lc_path(const char *dl_name, const char *lc_dir) if (strstr (dl_name, "../")) return NULL; -#if defined (_LP64) && defined (_MACH64_NAME) - len = (lc_dir ? strlen(lc_dir) : 0 ) + - (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10; - path = Xmalloc(len + 1); - - if (strchr(dl_name, '/') != NULL) { - char *tmp = strdup(dl_name); - char *dl_dir, *dl_file; - char *slash_p; - slash_p = strchr(tmp, '/'); - *slash_p = '\0'; - dl_dir = tmp; - dl_file = ++slash_p; - - slash_p = strrchr(lc_dir, '/'); - *slash_p = '\0'; - strcpy(path, lc_dir); strcat(path, "/"); - strcat(path, dl_dir); strcat(path, "/"); - strcat(path, _MACH64_NAME); strcat(path, "/"); - strcat(path, dl_file); strcat(path, ".so.2"); - - *slash_p = '/'; - Xfree(tmp); - } else { - strcpy(path, lc_dir); strcat(path, "/"); - strcat(path, _MACH64_NAME); strcat(path, "/"); - strcat(path, dl_name); strcat(path, ".so.2"); - } -#else len = (lc_dir ? strlen(lc_dir) : 0 ) + (dl_name ? strlen(dl_name) : 0) + 10; #if defined POSTLOCALELIBDIR @@ -322,7 +283,6 @@ __lc_path(const char *dl_name, const char *lc_dir) #endif strcat(path, dl_name); strcat(path, ".so.2"); } -#endif return path; } |