diff options
author | Yen-Ming Lee <leeym@FreeBSD.org> | 2004-03-23 19:44:17 +0000 |
---|---|---|
committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2004-03-23 19:44:17 +0000 |
commit | 9859e5fe3e6c5ec1b3bc55c54fed42654b2429f9 (patch) | |
tree | a15883caae5c2be7b953a7c5d7946e9872e5975c /converters | |
parent | - Utilize LATEST_LINK (diff) |
- only shared libraries should be build with -fPIC on amd64 and ia64
- drop maintainership
Submitted by: arved
Diffstat (limited to 'converters')
-rw-r--r-- | converters/cn2jp/Makefile | 4 | ||||
-rw-r--r-- | converters/cn2jp/files/patch-ah | 60 |
2 files changed, 41 insertions, 23 deletions
diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile index 3ff02d22f369..b301bcae3fcc 100644 --- a/converters/cn2jp/Makefile +++ b/converters/cn2jp/Makefile @@ -12,7 +12,7 @@ CATEGORIES= converters MASTER_SITES= http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/ DISTNAME= ${PORTNAME}${PORTVERSION} -MAINTAINER= leeym@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A library for code translation between Chinese and Japanese INSTALLS_SHLIB= yes @@ -20,8 +20,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= README TEST_PROGRAM= big2gb/b2g big2jis/b2j gb2big/g2b gb2jis/g2j jis2big/j2b jis2gb/j2g -CFLAGS+= -fPIC - .include <bsd.port.pre.mk> .if ${ARCH} == "ia64" diff --git a/converters/cn2jp/files/patch-ah b/converters/cn2jp/files/patch-ah index e991c9fa9df0..e8d48cc760db 100644 --- a/converters/cn2jp/files/patch-ah +++ b/converters/cn2jp/files/patch-ah @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Feb 27 06:35:44 1996 -+++ Makefile Sun Oct 19 01:43:20 2003 +--- Makefile.orig Tue Feb 27 15:35:44 1996 ++++ Makefile Mon Mar 22 10:53:52 2004 @@ -1,7 +1,8 @@ INCLUDE= @@ -7,15 +7,27 @@ -CFLAGS= -g -I../lib -I. -L../lib -L. +CC?=cc +CFLAGS?=-O -pipe -+CFLAGS+= -g -I../lib -I. -L../lib -L. ++CFLAGS+= -g -I../lib -I. -I./lib -L../lib -L. SRC = README Makefile */*.c */*.h */*.tbl */Makefile */README OBJS = big2jis/b2j-util.o big2jis/b2j_table.o \ -@@ -14,10 +15,11 @@ +@@ -12,12 +13,22 @@ + jis2gb/j2g-util.o jis2gb/j2g_table.o \ + lib/lang-util.o lib/cn-util.o \ lib/py-tbl.o lib/uzpj-tbl.o lib/uzpj-util.o \ - hz2gb.o gb2hz.o SINO.o jp-util2.o +- hz2gb.o gb2hz.o SINO.o jp-util2.o ++ lib/hz2gb.o lib/gb2hz.o lib/SINO.o lib/jp-util2.o -all: makeall libcn2jp.a ++LIB_SHOBJS = big2jis/b2j-util.So big2jis/b2j_table.So \ ++ jis2big/j2b-util.So jis2big/j2b_table.So \ ++ big2gb/b2g-util.So big2gb/b2g_table.So \ ++ gb2big/g2b-util.So gb2big/g2b_table.So \ ++ jis2gb/j2g-util.So jis2gb/j2g_table.So \ ++ lib/lang-util.So lib/cn-util.So \ ++ lib/py-tbl.So lib/uzpj-tbl.So lib/uzpj-util.So \ ++ lib/hz2gb.So lib/gb2hz.So lib/SINO.So lib/jp-util2.So ++ +all: makeall libcn2jp.a libcn2jp.so @@ -24,7 +36,7 @@ cd lib; make; cd .. cd big2jis; make; cd .. cd jis2big; make; cd .. -@@ -28,21 +30,23 @@ +@@ -28,21 +39,11 @@ libcn2jp.a: $(OBJS) rm -f libcn2jp.a @@ -32,25 +44,33 @@ + ar cru libcn2jp.a $(OBJS) ranlib libcn2jp.a - cp libcn2jp.a ../../../lib/libcn2jp.a -+ -+libcn2jp.so: $(OBJS) -+ ld -o libcn2jp.so $(OBJS) -shared -soname libcn2jp.so - - gb2hz.o: lib/gb2hz.c +- +-gb2hz.o: lib/gb2hz.c - $(CC) -c lib/gb2hz.c -+ $(CC) $(CFLAGS) -c lib/gb2hz.c - - hz2gb.o: lib/hz2gb.c +- +-hz2gb.o: lib/hz2gb.c - $(CC) -c lib/hz2gb.c -+ $(CC) $(CFLAGS) -c lib/hz2gb.c - - SINO.o: lib/SINO.c +- +-SINO.o: lib/SINO.c - $(CC) -c lib/SINO.c -+ $(CC) $(CFLAGS) -c lib/SINO.c - jp-util2.o: lib/jp-util2.c +-jp-util2.o: lib/jp-util2.c - $(CC) -c lib/jp-util2.c -+ $(CC) $(CFLAGS) -c lib/jp-util2.c ++libcn2jp.so: $(LIB_SHOBJS) ++ ld -o libcn2jp.so $(LIB_SHOBJS) -shared -soname libcn2jp.so tar: echo "Produce cn2jp`date '+%m%d'`.tar..." +@@ -55,3 +56,12 @@ + + clean: + rm -f *.o *.a */*.o */*.t */*.a */???_table.c */?2? ++ ++.SUFFIXES: .o .So ++ ++.c.So: ++ $(CC) $(CFLAGS) -fPIC -c $*.c -o $*.So ++ ++.c.o: ++ $(CC) $(CFLAGS) -fPIC -c $*.c -o $*.o ++ |