mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
Oops, forgot to commit these. BROKEN_ELF fix.
PR: 8770
This commit is contained in:
Satoshi Asami
parent
22084ff7db
commit
ce6aa96c75
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=14968
63
japanese/Wnn6-lib/files/patch-aa
Normal file
63
japanese/Wnn6-lib/files/patch-aa
Normal file
@ -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))
|
||||
|
||||
12
japanese/Wnn6-lib/files/patch-ab
Normal file
12
japanese/Wnn6-lib/files/patch-ab
Normal file
@ -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
|
||||
24
japanese/Wnn6-lib/files/patch-ac
Normal file
24
japanese/Wnn6-lib/files/patch-ac
Normal file
@ -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
|
||||
63
japanese/Wnn7-lib/files/patch-aa
Normal file
63
japanese/Wnn7-lib/files/patch-aa
Normal file
@ -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))
|
||||
|
||||
12
japanese/Wnn7-lib/files/patch-ab
Normal file
12
japanese/Wnn7-lib/files/patch-ab
Normal file
@ -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
|
||||
24
japanese/Wnn7-lib/files/patch-ac
Normal file
24
japanese/Wnn7-lib/files/patch-ac
Normal file
@ -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
|
||||
Loading…
Reference in New Issue
Block a user