1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00

Update to ILU-2.0alpha13.

Disable native shared library support, doesn't work, use own scheme as before.
Don't use shared library version numbering on ELF for now, needs more thought.
Document shared library version numbering scheme I chose.
Pump shared library version number on aout.
Better COMMENT and DESCR (still too long).
Remove patch to regognize now outdated FreeBSD JDK.
This commit is contained in:
Martin Cracauer 1998-12-01 16:22:00 +00:00
parent afb7120e36
commit e375457f7c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=15019
9 changed files with 278 additions and 241 deletions

View File

@ -1,15 +1,15 @@
# New ports collection makefile for: ilu
# Version required: 2.0alpha12
# Version required: 2.0alpha13
# Date created: 29.9.1997
# Whom: cracauer@cons.org "Martin Cracauer"
#
# $Id: Makefile,v 1.14 1998/11/14 09:43:07 asami Exp $
# $Id: Makefile,v 1.15 1998/11/28 00:44:32 asami Exp $
#
DISTNAME= ilu-2.0alpha12
PKGNAME= ilu-2.0a12
DISTNAME= ilu-2.0alpha13
PKGNAME= ilu-2.0a13
CATEGORIES= devel
MASTER_SITES= ftp://parcftp.xerox.com/pub/ilu/2.0a12/
MASTER_SITES= ftp://parcftp.xerox.com/pub/ilu/2.0a13/
PATCH_SITES= http://www2.cons.org:8000/freebsd-distfiles/
PATCHFILES= ${DISTNAME}-patches.html.gz
@ -18,7 +18,11 @@ MAINTAINER= cracauer@cons.org
BUILD_DEPENDS= imake:${PORTSDIR}/x11/XFree86
CONFIGURE_ARGS= --enable-http-protocol --enable-os-threads=posix
# The FreeBSD port uses its own shared library patches. The native
# ILU support is incomplete and disabled here.
CONFIGURE_ARGS= --enable-http-protocol --enable-os-threads=posix \
--disable-kernel-shared-library --disable-c-shared-library \
--disable-cplusplus-shared-libary
NO_WRKSUBDIR= yes
HAS_CONFIGURE= yes
@ -39,7 +43,7 @@ CONFIGURE_ARGS+= --disable-java-support
SHLIBPATCH=files/shlib-aout.patch
# Java support on -stable does not work (ILU runtime dumps core).
# You might want to enable it if you know what you are doing.
# Maybe taking -O out of patches/patch-1-cra-cflags help.
# Taking -O out of patches/patch-1-cra-cflags may also help.
CONFIGURE_ARGS+= --disable-java-support
.endif
@ -47,6 +51,9 @@ CONFIGURE_ARGS+= --disable-java-support
startup_dir= ${PREFIX}/etc/rc.d
startup_script= ${startup_dir}/50.ilu.sh
post-extract:
chmod -R u+w work
post-patch:
${PATCH} ${PATCH_DIST_ARGS} < ${SHLIBPATCH}

View File

@ -1,2 +1,2 @@
MD5 (ilu-2.0alpha12.tar.gz) = 1bf3ed2fb4629d977239278dd1bcbd19
MD5 (ilu-2.0alpha12-patches.html.gz) = c38f20dd5186a9ed2b36eaadf059c8e2
MD5 (ilu-2.0alpha13.tar.gz) = b2682d08e5ad96dd20188fe7e46cbf69
MD5 (ilu-2.0alpha13-patches.html.gz) = 97b71723201e91b1eda1a97d366c1afe

View File

@ -1,7 +1,7 @@
*** imake/iludefs.in.original Thu Oct 8 15:13:44 1998
--- imake/iludefs.in Thu Oct 8 15:13:46 1998
*** ./imake/iludefs.in.orig Thu Nov 5 19:22:09 1998
--- ./imake/iludefs.in Mon Nov 30 19:19:09 1998
***************
*** 91,100 ****
*** 121,130 ****
IDL_CFE_CPP_DRIVER = @IDL_CPP_COMMAND@
#endif /* ADD_IDL_SUPPORT */
@ -12,11 +12,11 @@
SECURITYLIBS =
SECURITYINCLUDES =
--- 91,97 ----
--- 121,127 ----
IDL_CFE_CPP_DRIVER = @IDL_CPP_COMMAND@
#endif /* ADD_IDL_SUPPORT */
! CDEBUGFLAGS = -g -O -D_THREADSAFE -pthread
! CDEBUGFLAGS = -g -O -D_THREAD_SAFE -pthread
SECURITYLIBS =
SECURITYINCLUDES =

View File

@ -1,7 +1,7 @@
*** runtime/kernel/threads.c.orig Thu Oct 8 15:34:30 1998
--- runtime/kernel/threads.c Thu Oct 8 15:33:58 1998
*** ./runtime/kernel/threads.c.orig Thu Nov 5 19:19:17 1998
--- ./runtime/kernel/threads.c Mon Nov 30 19:19:41 1998
***************
*** 1151,1158 ****
*** 1149,1156 ****
err == ETIME
#endif
#if (defined(ILU_POSIX_THREADS) || defined(ILU_DCE_THREADS))
@ -10,7 +10,7 @@
#endif
#ifdef ILU_WIN32_THREADS
err == WAIT_TIMEOUT
--- 1151,1160 ----
--- 1149,1158 ----
err == ETIME
#endif
#if (defined(ILU_POSIX_THREADS) || defined(ILU_DCE_THREADS))

View File

@ -1,9 +1,12 @@
--- etc/sbfile/ilusbls.c.orig Sat Oct 11 08:56:44 1997
+++ etc/sbfile/ilusbls.c Sat Oct 11 08:57:33 1997
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <string.h>
+#include <sys/types.h>
#if defined(WIN32)
#include <windows.h>
*** ./etc/sbfile/ilusbls.c.orig Thu Nov 5 19:20:35 1998
--- ./etc/sbfile/ilusbls.c Mon Nov 30 19:20:22 1998
***************
*** 22,27 ****
--- 22,28 ----
#include <stdio.h>
#include <string.h>
+ #include <sys/types.h>
#if defined(WIN32)
#include <windows.h>

View File

@ -1,38 +1,39 @@
diff -r -c ./etc/CosNaming/Imakefile /home/cracauer/work/ilu2patch/./etc/CosNaming/Imakefile
*** ./etc/CosNaming/Imakefile Thu Sep 25 23:32:29 1997
--- /home/cracauer/work/ilu2patch/./etc/CosNaming/Imakefile Tue Oct 7 13:52:22 1997
diff -rc ../work.orig/etc/CosNaming/Imakefile ./etc/CosNaming/Imakefile
*** ../work.orig/etc/CosNaming/Imakefile Thu Nov 5 19:20:38 1998
--- ./etc/CosNaming/Imakefile Mon Nov 30 20:49:02 1998
***************
*** 59,66 ****
--- 59,68 ----
*** 56,63 ****
--- 56,65 ----
/******/
LibraryTarget(libCosNaming-c.a, CosNaming-surrogate.o CosNaming-common.o)
+ SLibraryTarget(libCosNaming-c.so.1.0, CosNaming-surrogate.o CosNaming-common.o)
+ SLibraryTarget(libCosNaming-c.so.2.0, CosNaming-surrogate.o CosNaming-common.o)
InstallLibrary(libCosNaming-c.a, $(DESTDIR)/lib)
+ InstallSLibrary(libCosNaming-c.so.1.0, $(DESTDIR)/lib)
+ InstallSLibrary(libCosNaming-c.so.2.0, $(DESTDIR)/lib)
InstallRO(CosNaming.h, $(DESTDIR)/include)
#endif
diff -r -c ./etc/portmapper/Imakefile /home/cracauer/work/ilu2patch/./etc/portmapper/Imakefile
*** ./etc/portmapper/Imakefile Thu Sep 25 23:32:22 1997
--- /home/cracauer/work/ilu2patch/./etc/portmapper/Imakefile Tue Oct 7 13:52:00 1997
diff -rc ../work.orig/etc/portmapper/Imakefile ./etc/portmapper/Imakefile
*** ../work.orig/etc/portmapper/Imakefile Thu Nov 5 19:20:33 1998
--- ./etc/portmapper/Imakefile Mon Nov 30 20:48:29 1998
***************
*** 45,49 ****
--- 45,51 ----
*** 38,43 ****
--- 38,45 ----
portmap.o : SunPortMapper.h portmap.c ${ILUHEADERFILES}
LibraryTarget(libsunportmapper.a, SunPortMapper-surrogate.o SunPortMapper-common.o portmap.o)
+ SLibraryTarget(libsunportmapper.so.1.0, SunPortMapper-surrogate.o SunPortMapper-common.o portmap.o)
+ SLibraryTarget(libsunportmapper.so.2.0, SunPortMapper-surrogate.o SunPortMapper-common.o portmap.o)
InstallLibrary(libsunportmapper.a, $(DESTDIR)/lib)
+ InstallSLibrary(libsunportmapper.so.1.0, $(DESTDIR)/lib)
+ InstallSLibrary(libsunportmapper.so.2.0, $(DESTDIR)/lib)
InstallRO(ilusunportmapper.h, $(DESTDIR)/include)
diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
*** ./imake/ilu.rules Thu Sep 25 23:33:55 1997
--- /home/cracauer/work/ilu2patch/./imake/ilu.rules Tue Oct 7 16:44:30 1997
InstallRO(SunPortMapper.isl, $(DESTDIR)/interfaces)
diff -rc ../work.orig/imake/ilu.rules ./imake/ilu.rules
*** ../work.orig/imake/ilu.rules Thu Nov 5 19:22:08 1998
--- ./imake/ilu.rules Mon Nov 30 20:51:15 1998
***************
*** 411,416 ****
--- 411,422 ----
*** 508,513 ****
--- 508,519 ----
$(AR) $@ objs @@\
$(RANLIB) $@
@ -46,7 +47,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
* This section added for Linux shared libs
*/
***************
*** 473,479 ****
*** 570,576 ****
#define ILUCPlusPlusProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -54,7 +55,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(RM) $@ @@\
$(CPLUSPLUS_COMMAND) $(CFLAGS) -o $@ objs libs $(ILUCPLUSPLUSLIBS) syslibs $(CPLUSPLUS_LIBRARIES) $(SYSAUX_LIBRARIES) -lm @@\
@@\
--- 479,485 ----
--- 576,582 ----
#define ILUCPlusPlusProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -63,7 +64,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(CPLUSPLUS_COMMAND) $(CFLAGS) -o $@ objs libs $(ILUCPLUSPLUSLIBS) syslibs $(CPLUSPLUS_LIBRARIES) $(SYSAUX_LIBRARIES) -lm @@\
@@\
***************
*** 493,499 ****
*** 590,596 ****
#define ILUCProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -71,7 +72,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(RM) $@ @@\
$(CC) $(CFLAGS) -o $@ objs libs $(ILUCLIBS) syslibs $(ANSI_C_LIBRARY) $(SYSAUX_LIBRARIES) $(WORKAROUND_LOCAL_GCC_INSTALLATION_BUG) @@\
@@\
--- 499,505 ----
--- 596,602 ----
#define ILUCProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -80,8 +81,8 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(CC) $(CFLAGS) -o $@ objs libs $(ILUCLIBS) syslibs $(ANSI_C_LIBRARY) $(SYSAUX_LIBRARIES) $(WORKAROUND_LOCAL_GCC_INSTALLATION_BUG) @@\
@@\
***************
*** 671,676 ****
--- 677,689 ----
*** 768,773 ****
--- 774,786 ----
RANLIBRULE(dest)
#endif /* sgi */
@ -96,8 +97,8 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
InstallLibraries(lib.a,dest) @@\
InstallFiles(lib.ax,$(INSTLIBFLAGS),dest)
***************
*** 749,754 ****
--- 762,770 ----
*** 846,851 ****
--- 859,867 ----
#define InstallLibrary(file, dest) @@\
InstallLibraries(file,dest)
@ -107,119 +108,131 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
#define InstallMultiple(list, flags, dest) @@\
InstallFiles(list,flags,dest)
diff -r -c ./imake/ilu.tmpl /home/cracauer/work/ilu2patch/./imake/ilu.tmpl
*** ./imake/ilu.tmpl Thu Sep 25 23:33:55 1997
--- /home/cracauer/work/ilu2patch/./imake/ilu.tmpl Tue Oct 7 14:09:29 1997
diff -rc ../work.orig/imake/ilu.tmpl ./imake/ilu.tmpl
*** ../work.orig/imake/ilu.tmpl Thu Nov 5 19:22:09 1998
--- ./imake/ilu.tmpl Mon Nov 30 22:30:50 1998
***************
*** 77,86 ****
*** 64,73 ****
#ifdef WORK_IN_ILU_SOURCE_TREE
ILUCINCLUDES = -I../../runtime/c -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCLIBS = ../../runtime/c/libilu-c.a ../../runtime/kernel/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I../../runtime/cpp -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCPLUSPLUSLIBS = ../../runtime/cpp/libilu-c++.a ../../runtime/kernel/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = ../../runtime/java/ilu.jar
--- 64,73 ----
#ifdef WORK_IN_ILU_SOURCE_TREE
ILUCINCLUDES = -I../../runtime/c -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCLIBS = -L../../runtime/c -L../../runtime/kernel -lilu-c -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I../../runtime/cpp -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCPLUSPLUSLIBS = -L../../runtime/c -L../../runtime/kernel -lilu-c++ -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = ../../runtime/java/ilu.jar
***************
*** 88,97 ****
#else
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCLIBS = $(ILUHOME)/lib/libilu-c.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS)
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCLIBS = $(ILUHOME)/lib/libilu-c.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCPLUSPLUSLIBS = $(ILUHOME)/lib/libilu-c++.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCPLUSPLUSLIBS = $(ILUHOME)/lib/libilu-c++.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = $(ILUHOME)/lib/ilu.jar
--- 77,86 ----
--- 88,97 ----
#else
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCLIBS = -L$(ILUHOME)/lib -lilu-c -lilu $(SECURITYLIBS)
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCLIBS = -L$(ILUHOME)/lib -lilu-c -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCPLUSPLUSLIBS = $(ILUHOME)/lib/libilu-c++.a -L$(ILUHOME)/lib -lilu $(SECURITYLIBS)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCPLUSPLUSLIBS = -L$(ILUHOME)/lib -lilu-c++ -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = $(ILUHOME)/lib/ilu.jar
diff -r -c ./runtime/c/Imakefile /home/cracauer/work/ilu2patch/./runtime/c/Imakefile
*** ./runtime/c/Imakefile Thu Sep 25 23:32:00 1997
--- /home/cracauer/work/ilu2patch/./runtime/c/Imakefile Tue Oct 7 13:53:13 1997
diff -rc ../work.orig/runtime/c/Imakefile ./runtime/c/Imakefile
*** ../work.orig/runtime/c/Imakefile Thu Nov 5 19:20:12 1998
--- ./runtime/c/Imakefile Mon Nov 30 20:52:38 1998
***************
*** 40,48 ****
*** 44,56 ****
OBJS = ilu.o orb.o
LibraryTarget(libilu-c.a, $(OBJS))
LibraryTarget(libilu-c.a, $(OBJS) $(BIGNUMOBJS))
InstallLibrary(libilu-c.a, $(DESTDIR)/lib)
InstallRO(iluchdrs.h ilucstub.h, $(DESTDIR)/include)
#ifdef ADD_C_SHARED_LIBRARY
SharedLibrary(libilu-c, $(OBJS),,)
#endif /* def ADD_C_SHARED_LIBRARY */
! all:: libilu-c.a
--- 40,50 ----
!
--- 44,57 ----
OBJS = ilu.o orb.o
LibraryTarget(libilu-c.a, $(OBJS))
+ SLibraryTarget(libilu-c.so.1.0, $(OBJS))
LibraryTarget(libilu-c.a, $(OBJS) $(BIGNUMOBJS))
+ SLibraryTarget(libilu-c.so.2.0, $(OBJS) $(BIGNUMOBJS))
InstallLibrary(libilu-c.a, $(DESTDIR)/lib)
+ InstallSLibrary(libilu-c.so.1.0, $(DESTDIR)/lib)
+ InstallSLibrary(libilu-c.so.2.0, $(DESTDIR)/lib)
InstallRO(iluchdrs.h ilucstub.h, $(DESTDIR)/include)
! all:: libilu-c.a libilu-c.so.1.0
#ifdef ADD_C_SHARED_LIBRARY
SharedLibrary(libilu-c, $(OBJS),,)
#endif /* def ADD_C_SHARED_LIBRARY */
diff -r -c ./runtime/kernel/Imakefile /home/cracauer/work/ilu2patch/./runtime/kernel/Imakefile
*** ./runtime/kernel/Imakefile Thu Sep 25 23:31:04 1997
--- /home/cracauer/work/ilu2patch/./runtime/kernel/Imakefile Tue Oct 7 13:53:02 1997
! all:: libilu-c.a libilu-c.so.2.0
diff -rc ../work.orig/runtime/kernel/Imakefile ./runtime/kernel/Imakefile
*** ../work.orig/runtime/kernel/Imakefile Thu Nov 5 19:19:08 1998
--- ./runtime/kernel/Imakefile Mon Nov 30 20:53:59 1998
***************
*** 242,251 ****
--- 242,259 ----
*** 266,274 ****
--- 266,282 ----
opaqval.o : $(PVTIFC) ilutypes.h opaqval.c
libilu.a : $(MF)
+ libilu.so.1.0 : $(MF)
+ libilu.so.2.0 : $(MF)
LibraryTarget(libilu.a, $(OBJS))
+ SLibraryTarget(libilu.so.2.0, $(OBJS))
InstallLibrary(libilu.a, $(DESTDIR)/lib)
+ SLibraryTarget(libilu.so.1.0, $(OBJS))
+ InstallSLibrary(libilu.so.1.0, $(DESTDIR)/lib)
InstallRO($(PVTIFC), $(DESTDIR)/include)
+ InstallSLibrary(libilu.so.2.0, $(DESTDIR)/lib)
+
+ libilu.so: $(OBJS)
+ ibilu.so.2.0: $(OBJS)
+ $(RM) $@
+ ld -Bshareable -o $@ $(OBJS)
+
CProgramTarget(iluhashm,iluhashm.o,,)
CProgramTarget(decoderr,decoderr.o,,)
diff -r -c ./stubbers/parser/Imakefile /home/cracauer/work/ilu2patch/./stubbers/parser/Imakefile
*** ./stubbers/parser/Imakefile Thu Sep 25 23:29:51 1997
--- /home/cracauer/work/ilu2patch/./stubbers/parser/Imakefile Tue Oct 7 13:53:31 1997
#ifdef ADD_KERNEL_SHARED_LIBRARY
SharedLibrary(libilu, $(OBJS),,)
diff -rc ../work.orig/stubbers/parser/Imakefile ./stubbers/parser/Imakefile
*** ../work.orig/stubbers/parser/Imakefile Thu Nov 5 19:18:03 1998
--- ./stubbers/parser/Imakefile Mon Nov 30 20:55:15 1998
***************
*** 40,45 ****
--- 40,46 ----
*** 78,83 ****
--- 78,84 ----
#endif
LibraryTarget(libilu-parser.a, iluparse.o typeuid.o shs.o pathname.o malloc.o util.o aprintf.o $(IDLOBJS))
+ SLibraryTarget(libilu-parser.so.1.0, iluparse.o typeuid.o shs.o pathname.o malloc.o util.o aprintf.o $(IDLOBJS))
ProgramTarget(islscan, scan.o, libilu-parser.a,)
LibraryTarget(libilu-parser.a, $(COMMONOBJS) $(TYPEUID_OBJS) $(XMLIDL_OBJS) $(IDLOBJS) $(BIGNUM_OBJS))
+ SLibraryTarget(libilu-parser.so.2.0, $(COMMONOBJS) $(TYPEUID_OBJS) $(XMLIDL_OBJS) $(IDLOBJS) $(BIGNUM_OBJS))
ProgramTarget(islscan, scan.o, $(ILU_STUBBER_LIBRARIES),)
iluconf.h : ../../runtime/kernel/iluconf.h
***************
*** 63,68 ****
--- 64,70 ----
*** 101,106 ****
--- 102,108 ----
InstallProgram(islscan, $(DESTDIR)/bin)
InstallRO(libilu-parser.a, $(DESTDIR)/lib)
+ InstallRO(libilu-parser.so.1.0, $(DESTDIR)/lib)
+ InstallRO(libilu-parser.so.2.0, $(DESTDIR)/lib)
InstallRO(iluptype.h, $(DESTDIR)/include)
InstallRO(ilu.isl, $(DESTDIR)/interfaces)
InstallRO(iluhttp.isl, $(DESTDIR)/interfaces)
***************
*** 85,91 ****
make genregs
-rm -f ../../runtime/kernel/ilutpcod.c ../../runtime/kernel/ilutpcod.h
./genregs "../../runtime/kernel/ilutpcod"
! -rm -f genregs *.o *.a
$(DISTCLEAN)
genregs: version.h genregs.o libilu-parser.a
--- 87,93 ----
make genregs
-rm -f ../../runtime/kernel/ilutpcod.c ../../runtime/kernel/ilutpcod.h
./genregs "../../runtime/kernel/ilutpcod"
! -rm -f genregs *.o *.a *.so *.so.*.*
$(DISTCLEAN)
genregs: version.h genregs.o libilu-parser.a

View File

@ -1,38 +1,39 @@
diff -r -c ./etc/CosNaming/Imakefile /home/cracauer/work/ilu2patch/./etc/CosNaming/Imakefile
*** ./etc/CosNaming/Imakefile Thu Sep 25 23:32:29 1997
--- /home/cracauer/work/ilu2patch/./etc/CosNaming/Imakefile Tue Oct 7 13:52:22 1997
diff -rc ../work.orig/etc/CosNaming/Imakefile ./etc/CosNaming/Imakefile
*** ../work.orig/etc/CosNaming/Imakefile Thu Nov 5 19:20:38 1998
--- ./etc/CosNaming/Imakefile Mon Nov 30 20:49:02 1998
***************
*** 59,66 ****
--- 59,68 ----
*** 56,63 ****
--- 56,65 ----
/******/
LibraryTarget(libCosNaming-c.a, CosNaming-surrogate.o CosNaming-common.o)
+ SLibraryTarget(libCosNaming-c.so.1, CosNaming-surrogate.o CosNaming-common.o)
+ SLibraryTarget(libCosNaming-c.so, CosNaming-surrogate.o CosNaming-common.o)
InstallLibrary(libCosNaming-c.a, $(DESTDIR)/lib)
+ InstallSLibrary(libCosNaming-c.so.1, $(DESTDIR)/lib)
+ InstallSLibrary(libCosNaming-c.so, $(DESTDIR)/lib)
InstallRO(CosNaming.h, $(DESTDIR)/include)
#endif
diff -r -c ./etc/portmapper/Imakefile /home/cracauer/work/ilu2patch/./etc/portmapper/Imakefile
*** ./etc/portmapper/Imakefile Thu Sep 25 23:32:22 1997
--- /home/cracauer/work/ilu2patch/./etc/portmapper/Imakefile Tue Oct 7 13:52:00 1997
diff -rc ../work.orig/etc/portmapper/Imakefile ./etc/portmapper/Imakefile
*** ../work.orig/etc/portmapper/Imakefile Thu Nov 5 19:20:33 1998
--- ./etc/portmapper/Imakefile Mon Nov 30 20:48:29 1998
***************
*** 45,49 ****
--- 45,51 ----
*** 38,43 ****
--- 38,45 ----
portmap.o : SunPortMapper.h portmap.c ${ILUHEADERFILES}
LibraryTarget(libsunportmapper.a, SunPortMapper-surrogate.o SunPortMapper-common.o portmap.o)
+ SLibraryTarget(libsunportmapper.so.1, SunPortMapper-surrogate.o SunPortMapper-common.o portmap.o)
+ SLibraryTarget(libsunportmapper.so, SunPortMapper-surrogate.o SunPortMapper-common.o portmap.o)
InstallLibrary(libsunportmapper.a, $(DESTDIR)/lib)
+ InstallSLibrary(libsunportmapper.so.1, $(DESTDIR)/lib)
+ InstallSLibrary(libsunportmapper.so, $(DESTDIR)/lib)
InstallRO(ilusunportmapper.h, $(DESTDIR)/include)
diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
*** ./imake/ilu.rules Thu Sep 25 23:33:55 1997
--- /home/cracauer/work/ilu2patch/./imake/ilu.rules Tue Oct 7 16:44:30 1997
InstallRO(SunPortMapper.isl, $(DESTDIR)/interfaces)
diff -rc ../work.orig/imake/ilu.rules ./imake/ilu.rules
*** ../work.orig/imake/ilu.rules Thu Nov 5 19:22:08 1998
--- ./imake/ilu.rules Mon Nov 30 20:51:15 1998
***************
*** 411,416 ****
--- 411,422 ----
*** 508,513 ****
--- 508,519 ----
$(AR) $@ objs @@\
$(RANLIB) $@
@ -46,7 +47,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
* This section added for Linux shared libs
*/
***************
*** 473,479 ****
*** 570,576 ****
#define ILUCPlusPlusProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -54,7 +55,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(RM) $@ @@\
$(CPLUSPLUS_COMMAND) $(CFLAGS) -o $@ objs libs $(ILUCPLUSPLUSLIBS) syslibs $(CPLUSPLUS_LIBRARIES) $(SYSAUX_LIBRARIES) -lm @@\
@@\
--- 479,485 ----
--- 576,582 ----
#define ILUCPlusPlusProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -63,7 +64,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(CPLUSPLUS_COMMAND) $(CFLAGS) -o $@ objs libs $(ILUCPLUSPLUSLIBS) syslibs $(CPLUSPLUS_LIBRARIES) $(SYSAUX_LIBRARIES) -lm @@\
@@\
***************
*** 493,499 ****
*** 590,596 ****
#define ILUCProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -71,7 +72,7 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(RM) $@ @@\
$(CC) $(CFLAGS) -o $@ objs libs $(ILUCLIBS) syslibs $(ANSI_C_LIBRARY) $(SYSAUX_LIBRARIES) $(WORKAROUND_LOCAL_GCC_INSTALLATION_BUG) @@\
@@\
--- 499,505 ----
--- 596,602 ----
#define ILUCProgramTarget(program, objs, libs, syslibs) @@\
all:: program @@\
@@\
@ -80,8 +81,8 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
$(CC) $(CFLAGS) -o $@ objs libs $(ILUCLIBS) syslibs $(ANSI_C_LIBRARY) $(SYSAUX_LIBRARIES) $(WORKAROUND_LOCAL_GCC_INSTALLATION_BUG) @@\
@@\
***************
*** 671,676 ****
--- 677,689 ----
*** 768,773 ****
--- 774,786 ----
RANLIBRULE(dest)
#endif /* sgi */
@ -96,8 +97,8 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
InstallLibraries(lib.a,dest) @@\
InstallFiles(lib.ax,$(INSTLIBFLAGS),dest)
***************
*** 749,754 ****
--- 762,770 ----
*** 846,851 ****
--- 859,867 ----
#define InstallLibrary(file, dest) @@\
InstallLibraries(file,dest)
@ -107,119 +108,131 @@ diff -r -c ./imake/ilu.rules /home/cracauer/work/ilu2patch/./imake/ilu.rules
#define InstallMultiple(list, flags, dest) @@\
InstallFiles(list,flags,dest)
diff -r -c ./imake/ilu.tmpl /home/cracauer/work/ilu2patch/./imake/ilu.tmpl
*** ./imake/ilu.tmpl Thu Sep 25 23:33:55 1997
--- /home/cracauer/work/ilu2patch/./imake/ilu.tmpl Tue Oct 7 14:09:29 1997
diff -rc ../work.orig/imake/ilu.tmpl ./imake/ilu.tmpl
*** ../work.orig/imake/ilu.tmpl Thu Nov 5 19:22:09 1998
--- ./imake/ilu.tmpl Mon Nov 30 22:30:50 1998
***************
*** 77,86 ****
*** 64,73 ****
#ifdef WORK_IN_ILU_SOURCE_TREE
ILUCINCLUDES = -I../../runtime/c -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCLIBS = ../../runtime/c/libilu-c.a ../../runtime/kernel/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I../../runtime/cpp -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCPLUSPLUSLIBS = ../../runtime/cpp/libilu-c++.a ../../runtime/kernel/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = ../../runtime/java/ilu.jar
--- 64,73 ----
#ifdef WORK_IN_ILU_SOURCE_TREE
ILUCINCLUDES = -I../../runtime/c -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCLIBS = -L../../runtime/c -L../../runtime/kernel -lilu-c -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I../../runtime/cpp -I../../runtime/kernel $(BUILD_SECURITY_INCLUDES) $(BUILD_BIGNUM_INCLUDES)
! ILUCPLUSPLUSLIBS = -L../../runtime/c -L../../runtime/kernel -lilu-c++ -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = ../../runtime/java/ilu.jar
***************
*** 88,97 ****
#else
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCLIBS = $(ILUHOME)/lib/libilu-c.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS)
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCLIBS = $(ILUHOME)/lib/libilu-c.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCPLUSPLUSLIBS = $(ILUHOME)/lib/libilu-c++.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCPLUSPLUSLIBS = $(ILUHOME)/lib/libilu-c++.a $(ILUHOME)/lib/libilu.a $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = $(ILUHOME)/lib/ilu.jar
--- 77,86 ----
--- 88,97 ----
#else
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCLIBS = -L$(ILUHOME)/lib -lilu-c -lilu $(SECURITYLIBS)
ILUCINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCLIBS = -L$(ILUHOME)/lib -lilu-c -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES)
! ILUCPLUSPLUSLIBS = $(ILUHOME)/lib/libilu-c++.a -L$(ILUHOME)/lib -lilu $(SECURITYLIBS)
ILUCPLUSPLUSINCLUDES = -I$(ILUHOME)/include $(SECURITYINCLUDES) $(BIGNUMINCLUDES)
! ILUCPLUSPLUSLIBS = -L$(ILUHOME)/lib -lilu-c++ -lilu $(SECURITYLIBS) $(ILU_ZLIB_LIBRARY)
JAVA_ILU_CLASS_DIR = $(ILUHOME)/lib/ilu.jar
diff -r -c ./runtime/c/Imakefile /home/cracauer/work/ilu2patch/./runtime/c/Imakefile
*** ./runtime/c/Imakefile Thu Sep 25 23:32:00 1997
--- /home/cracauer/work/ilu2patch/./runtime/c/Imakefile Tue Oct 7 13:53:13 1997
diff -rc ../work.orig/runtime/c/Imakefile ./runtime/c/Imakefile
*** ../work.orig/runtime/c/Imakefile Thu Nov 5 19:20:12 1998
--- ./runtime/c/Imakefile Mon Nov 30 20:52:38 1998
***************
*** 40,48 ****
*** 44,56 ****
OBJS = ilu.o orb.o
LibraryTarget(libilu-c.a, $(OBJS))
LibraryTarget(libilu-c.a, $(OBJS) $(BIGNUMOBJS))
InstallLibrary(libilu-c.a, $(DESTDIR)/lib)
InstallRO(iluchdrs.h ilucstub.h, $(DESTDIR)/include)
#ifdef ADD_C_SHARED_LIBRARY
SharedLibrary(libilu-c, $(OBJS),,)
#endif /* def ADD_C_SHARED_LIBRARY */
! all:: libilu-c.a
--- 40,50 ----
!
--- 44,57 ----
OBJS = ilu.o orb.o
LibraryTarget(libilu-c.a, $(OBJS))
+ SLibraryTarget(libilu-c.so.1, $(OBJS))
LibraryTarget(libilu-c.a, $(OBJS) $(BIGNUMOBJS))
+ SLibraryTarget(libilu-c.so, $(OBJS) $(BIGNUMOBJS))
InstallLibrary(libilu-c.a, $(DESTDIR)/lib)
+ InstallSLibrary(libilu-c.so.1, $(DESTDIR)/lib)
+ InstallSLibrary(libilu-c.so, $(DESTDIR)/lib)
InstallRO(iluchdrs.h ilucstub.h, $(DESTDIR)/include)
! all:: libilu-c.a libilu-c.so.1
#ifdef ADD_C_SHARED_LIBRARY
SharedLibrary(libilu-c, $(OBJS),,)
#endif /* def ADD_C_SHARED_LIBRARY */
diff -r -c ./runtime/kernel/Imakefile /home/cracauer/work/ilu2patch/./runtime/kernel/Imakefile
*** ./runtime/kernel/Imakefile Thu Sep 25 23:31:04 1997
--- /home/cracauer/work/ilu2patch/./runtime/kernel/Imakefile Tue Oct 7 13:53:02 1997
! all:: libilu-c.a libilu-c.so
diff -rc ../work.orig/runtime/kernel/Imakefile ./runtime/kernel/Imakefile
*** ../work.orig/runtime/kernel/Imakefile Thu Nov 5 19:19:08 1998
--- ./runtime/kernel/Imakefile Mon Nov 30 20:53:59 1998
***************
*** 242,251 ****
--- 242,259 ----
*** 266,274 ****
--- 266,282 ----
opaqval.o : $(PVTIFC) ilutypes.h opaqval.c
libilu.a : $(MF)
+ libilu.so.1 : $(MF)
+ libilu.so : $(MF)
LibraryTarget(libilu.a, $(OBJS))
+ SLibraryTarget(libilu.so, $(OBJS))
InstallLibrary(libilu.a, $(DESTDIR)/lib)
+ SLibraryTarget(libilu.so.1, $(OBJS))
+ InstallSLibrary(libilu.so.1, $(DESTDIR)/lib)
InstallRO($(PVTIFC), $(DESTDIR)/include)
+ InstallSLibrary(libilu.so, $(DESTDIR)/lib)
+
+ libilu.so: $(OBJS)
+ ibilu.so: $(OBJS)
+ $(RM) $@
+ ld -Bshareable -o $@ $(OBJS)
+
CProgramTarget(iluhashm,iluhashm.o,,)
CProgramTarget(decoderr,decoderr.o,,)
diff -r -c ./stubbers/parser/Imakefile /home/cracauer/work/ilu2patch/./stubbers/parser/Imakefile
*** ./stubbers/parser/Imakefile Thu Sep 25 23:29:51 1997
--- /home/cracauer/work/ilu2patch/./stubbers/parser/Imakefile Tue Oct 7 13:53:31 1997
#ifdef ADD_KERNEL_SHARED_LIBRARY
SharedLibrary(libilu, $(OBJS),,)
diff -rc ../work.orig/stubbers/parser/Imakefile ./stubbers/parser/Imakefile
*** ../work.orig/stubbers/parser/Imakefile Thu Nov 5 19:18:03 1998
--- ./stubbers/parser/Imakefile Mon Nov 30 20:55:15 1998
***************
*** 40,45 ****
--- 40,46 ----
*** 78,83 ****
--- 78,84 ----
#endif
LibraryTarget(libilu-parser.a, iluparse.o typeuid.o shs.o pathname.o malloc.o util.o aprintf.o $(IDLOBJS))
+ SLibraryTarget(libilu-parser.so.1, iluparse.o typeuid.o shs.o pathname.o malloc.o util.o aprintf.o $(IDLOBJS))
ProgramTarget(islscan, scan.o, libilu-parser.a,)
LibraryTarget(libilu-parser.a, $(COMMONOBJS) $(TYPEUID_OBJS) $(XMLIDL_OBJS) $(IDLOBJS) $(BIGNUM_OBJS))
+ SLibraryTarget(libilu-parser.so, $(COMMONOBJS) $(TYPEUID_OBJS) $(XMLIDL_OBJS) $(IDLOBJS) $(BIGNUM_OBJS))
ProgramTarget(islscan, scan.o, $(ILU_STUBBER_LIBRARIES),)
iluconf.h : ../../runtime/kernel/iluconf.h
***************
*** 63,68 ****
--- 64,70 ----
*** 101,106 ****
--- 102,108 ----
InstallProgram(islscan, $(DESTDIR)/bin)
InstallRO(libilu-parser.a, $(DESTDIR)/lib)
+ InstallRO(libilu-parser.so.1, $(DESTDIR)/lib)
+ InstallRO(libilu-parser.so, $(DESTDIR)/lib)
InstallRO(iluptype.h, $(DESTDIR)/include)
InstallRO(ilu.isl, $(DESTDIR)/interfaces)
InstallRO(iluhttp.isl, $(DESTDIR)/interfaces)
***************
*** 85,91 ****
make genregs
-rm -f ../../runtime/kernel/ilutpcod.c ../../runtime/kernel/ilutpcod.h
./genregs "../../runtime/kernel/ilutpcod"
! -rm -f genregs *.o *.a
$(DISTCLEAN)
genregs: version.h genregs.o libilu-parser.a
--- 87,93 ----
make genregs
-rm -f ../../runtime/kernel/ilutpcod.c ../../runtime/kernel/ilutpcod.h
./genregs "../../runtime/kernel/ilutpcod"
! -rm -f genregs *.o *.a *.so *.so.*.*
$(DISTCLEAN)
genregs: version.h genregs.o libilu-parser.a

View File

@ -1 +1 @@
Xerox PARC ILU, a CORBA-compatible multi-language object broker
ILU is a CORBA-compatible multi-language Object Request Broker.

View File

@ -1,32 +1,33 @@
The Inter-Language Unification system (ILU) is a multi-language object
interface system. The object interfaces provided by ILU hide
implementation distinctions between different languages, between
different address spaces, and between operating system types. ILU can
be used to build multi-lingual object-oriented libraries ("class
libraries") with well-specified language-independent interfaces. It
can also be used to implement distributed systems. It can also be
used to define and document interfaces between the modules of
non-distributed programs. ILU interfaces can be specified in either
the OMG's IDL language, or in ILU's Interface Specification Language,
which allows extensions to the CORBA spec. Programming languages
supported in 2.0alpha12 are ANSI C, Common Lisp, Java, and Python;
rough Guile Scheme and C++ support is also present. Additional ILU
support for Perl is freely available from outside sources. Operating
systems supported in 2.0alpha12 are all Windows platforms with Win32
and WinSock, and all UNIX platforms with BSD sockets and minimal POSIX
compliance. 2.0alpha12 supports interoperability with ONC RPC
services, OMG CORBA services, World Wide Web HTTP services, and XNS
Courier services. ``Plug-in'' extensibility is provided for RPC
message formats, message transport schemes, URL schemes, accounting
and authorization identity types, threading and event loop processing,
and various other things. ILU is provided free for unrestricted use.
ILU is a CORBA-compatible multi-language Object Request Broker.
You define class interfaces in a language-independent way and
implement them in a language of your choice. Currently supported
languages are C, Java (See Makefile how to enable Java Support on
FreeBSD), Common Lisp (Allegro CL 4.x in Linux emulation mode may work
on FreeBSD) and Python. Rough support for C++ (the old C++ support is
built by default on FreeBSD) and Guile Scheme (built if you have Guile
+ slib installed) is also present. perl support is available from the
net. ILU also runs on Win32 which means Unix and Win32 objects can
freely talk to each other.
2.0alpha13 supports interoperability with ONC RPC services, OMG CORBA
services, World Wide Web HTTP services, and W3C HTTP-NG services.
``Plug-in'' extensibility is provided for RPC message formats, message
transport schemes, URL schemes, accounting and authorization identity
types, threading and event loop processing, and various other things.
An implementation of the IETF's Common Authentication Technology
working group's Generic Security Service (GSS) is provided, and can be
used to wrap client-server connections in a security context. An XML
parser is provided. ILU is provided free for unrestricted use.
FreeBSD port notes:
- I enabled http protocol support by default.
- I enabled support for the http protocol support.
- The FreeBSD port has its own scheme to build and use shared
libraries. The official support is incomplete.
- Official ILU patches are not fetched from PARC, but I hold a proven
snapshot at one of my own sites.
snapshot that doesn't conflict with my patches at one of my own sites.
- configure --bindir/--mandir doesn't work with current ILU version.
I make symbolic links to ${PREFIX}/{bin,man}.
- The FreeBSD port builds shareds libs for C libraries.
- jdk-1.1 for FreeBSD works, but is disabled by default because the
FreeBSD jdk is still in aout object format.
- I don't use shared library version numbers on ELF systems for now.
- Shared library versioning scheme history for aout:
*.so.1: ilu-2.0a12, *.so.2: ilu-2.0a13