Oops, forgot to commit these. BROKEN_ELF fix.

PR:		8770

3 files changed, 99 insertions, 0 deletions

diff --git a/japanese/Wnn7-lib/files/patch-aa b/japanese/Wnn7-lib/files/patch-aa
new file mode 100644
index 000000000000..87057a51561f
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-aa
@@ -0,0 +1,63 @@
+diff -ur src.orig/contrib/im/Xsi/Wnn/jlib/Imakefile Wnn/jlib/Imakefile
+--- src.orig/contrib/im/Xsi/Wnn/jlib/Imakefile	Wed Oct 28 13:36:30 1998
++++ Wnn/jlib/Imakefile	Fri Oct 30 03:42:54 1998
+@@ -4,7 +4,7 @@
+ 
+ #ifdef NEED_DEFINE_LIB
+ #define DoNormalLib YES
+-#define DoSharedLib NO
++#define DoSharedLib YES
+ #define DoDebugLib NO
+ #define DoProfileLib NO
+ #endif
+@@ -55,13 +55,29 @@
+ 	$(WNNROMKANSRC)/rk_vars.o \
+ 	$(WNNROMKANSRC)/rk_multi.o
+ 
++UNSHARED_LOCAL_RKOBJS= $(WNNROMKANSRC)/unshared/rk_bltinfn.o \
++	$(WNNROMKANSRC)/unshared/rk_main.o \
++	$(WNNROMKANSRC)/unshared/rk_modread.o \
++	$(WNNROMKANSRC)/unshared/rk_read.o \
++	$(WNNROMKANSRC)/unshared/rk_vars.o \
++	$(WNNROMKANSRC)/unshared/rk_multi.o
++
+ LOCAL_ETCSRCS = $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
+ LOCAL_ETCOBJS = $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8)
+ SRCS= $(SRC1) $(LOCAL_ETCSRCS)
+ OBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS)
++UNSHAREDOBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS)
++
++
++SOWNN6LIBREV=1.0
+ 
+ LibraryObjectRule()
++
++#if DoSharedLib
++AllTarget($(OBJS) libwnn6_fromsrc.a libwnn6.so.$(SOWNN6LIBREV))
++#else
+ AllTarget($(OBJS) libwnn6_fromsrc.a)
++#endif
+ 
+ 
+ js.o : js.c \
+@@ -72,10 +88,19 @@
+ 
+ SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),)
+ 
+-NormalLibraryTarget(wnn6_fromsrc,$(OBJS))
++
++#if DoSharedLib
++SharedLibraryTarget(wnn6,$(SOWNN6LIBREV),$(OBJS),.,.)
++#endif
++
++UnsharedLibraryTarget(wnn6_fromsrc,$(UNSHAREDOBJS),unshared,..)
+ LintLibraryTarget(wnn6_fromsrc,$(SRCS))
+ 
+ instlib:: install
++
++#if DoSharedLib
++InstallSharedLibrary(wnn6,$(SOWNN6LIBREV),$(WNNLIBDIR))
++#endif
+ 
+ InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR))
+ 
diff --git a/japanese/Wnn7-lib/files/patch-ab b/japanese/Wnn7-lib/files/patch-ab
new file mode 100644
index 000000000000..d8555a0c935d
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-ab
@@ -0,0 +1,12 @@
+diff -ur src.orig/contrib/im/Xsi/Wnn/romkan/Imakefile src/contrib/im/Xsi/Wnn/romkan/Imakefile
+--- src.orig/contrib/im/Xsi/Wnn/romkan/Imakefile	Wed Oct 28 13:36:32 1998
++++ Wnn/romkan/Imakefile	Fri Oct 30 03:25:47 1998
+@@ -4,7 +4,7 @@
+ 
+ #ifdef NEED_DEFINE_LIB
+ #define DoNormalLib YES
+-#define DoSharedLib NO
++#define DoSharedLib YES
+ #define DoDebugLib NO
+ #define DoProfileLib NO
+ #endif
diff --git a/japanese/Wnn7-lib/files/patch-ac b/japanese/Wnn7-lib/files/patch-ac
new file mode 100644
index 000000000000..2c332a42b7ea
--- /dev/null
+++ b/japanese/Wnn7-lib/files/patch-ac
@@ -0,0 +1,24 @@
+diff -ur src.orig/contrib/im/Xsi/config/X11.tmpl src/contrib/im/Xsi/config/X11.tmpl
+--- src.orig/contrib/im/Xsi/config/X11.tmpl	Wed Oct 28 13:36:37 1998
++++ config/X11.tmpl	Fri Oct 30 03:25:47 1998
+@@ -417,7 +417,8 @@
+ 
+ #define	WnnSpecialObjectRule(obj, depends, direct, define)	@@\
+ obj : depends							@@\
+-	$(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c	@@\
++	(cd unshared ; $(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c)	@@\
++	$(CC) -c $(CFLAGS) define $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) direct/`basename $@ .o`.c	@@\
+ 
+ #ifdef	MakeDir
+ #undef MakeDir
+@@ -520,7 +521,9 @@
+ #endif
+ 
+ #ifndef WnnLibDir
+-#define WnnLibDir	$(USRLIBDIR)
++#undef UsrLibDirPath
++#define UsrLibDirPath	/usr/local/lib
++#define WnnLibDir	/usr/local/lib
+ #endif
+ 
+        WNNOWNER = WnnOwner