summaryrefslogtreecommitdiff
path: root/devel/ilu/files/shlib-elf.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--devel/ilu/files/shlib-elf.patch199
1 files changed, 106 insertions, 93 deletions
diff --git a/devel/ilu/files/shlib-elf.patch b/devel/ilu/files/shlib-elf.patch
index 0f611bad92f6..2d1d998d1661 100644
--- a/devel/ilu/files/shlib-elf.patch
+++ b/devel/ilu/files/shlib-elf.patch
@@ -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)
-! all:: libilu-c.a
+ #ifdef ADD_C_SHARED_LIBRARY
+ SharedLibrary(libilu-c, $(OBJS),,)
+ #endif /* def ADD_C_SHARED_LIBRARY */
---- 40,50 ----
+! all:: libilu-c.a
+!
+--- 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