1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
diff -ur LCG-DM-1.7.3.1.orig/config/Imake.rules LCG-DM-1.7.3.1/config/Imake.rules
--- LCG-DM-1.7.3.1.orig/config/Imake.rules 2009-09-26 11:26:50.095112437 +0200
+++ LCG-DM-1.7.3.1/config/Imake.rules 2009-09-26 11:27:12.522113078 +0200
@@ -156,7 +156,16 @@
dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
cp $? $@.rev @@\
-rm $@ @@\
- ln -s $?.rev $@
+ ln -s $?.rev $@ @@\
+ -rm $@.`echo rev|cut -f1 -d.` @@\
+ ln -s $?.rev $@.`echo rev|cut -f1 -d.`
+#endif
+
+#ifndef InstallPlugin
+#define InstallPlugin(libname,rev,dest) @@\
+dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
+ -mv $@ dest/OLD$? @@\
+ cp $? $@
#endif
#ifndef MakeDir
diff -ur LCG-DM-1.7.3.1.orig/security/Imakefile LCG-DM-1.7.3.1/security/Imakefile
--- LCG-DM-1.7.3.1.orig/security/Imakefile 2009-09-26 11:26:50.105114271 +0200
+++ LCG-DM-1.7.3.1/security/Imakefile 2009-09-26 11:27:12.523114634 +0200
@@ -214,11 +214,11 @@
MakeDir($(LIB),root,bin,0755)
-InstallSharedLibrary(Csec_plugin_ID,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_GSI,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_GSI_thread,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_KRB5,$(VERSION),$(LIB))
-InstallSharedLibrary(Csec_plugin_KRB4,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_ID,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_GSI,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_GSI_thread,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_KRB5,$(VERSION),$(LIB))
+InstallPlugin(Csec_plugin_KRB4,$(VERSION),$(LIB))
MakeDir($(LIBMANDIR),root,bin,0755)
diff -ur LCG-DM-1.7.3.1.orig/shlib/Imakefile LCG-DM-1.7.3.1/shlib/Imakefile
--- LCG-DM-1.7.3.1.orig/shlib/Imakefile 2009-09-26 11:26:50.106115448 +0200
+++ LCG-DM-1.7.3.1/shlib/Imakefile 2009-09-26 11:27:38.631113134 +0200
@@ -60,7 +60,9 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; case $$i in *.a) $(AR) x ../$$i; rm -f $(SYMTABNAM) ;; esac) done
- (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) -L .. -llcgdm $(LIBCSEC))
+ @-rm $@.`echo $(VERSION)|cut -f1 -d.`
+ @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
@-rm -rf tmp
liblcgdm.sl liblcgdm.so liblcgdm.dynlib: $(COMMONLIB) $(SECURITYLIB)
@@ -69,7 +71,9 @@
@mkdir tmp
@for i in $^ ;\
do (cd tmp; $(AR) x ../$$i; rm -f $(SYMTABNAM)) done
- (cd tmp; $(CC) $(SHLIBLDFLAGS) -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
+ (cd tmp; $(CC) $(SHLIBLDFLAGS) -Wl,-soname,$@.`echo $(VERSION)|cut -f1 -d.` -o ../$@ *.o $(SHLIBREQLIBS) $(LIBCSEC))
+ @-rm $@.`echo $(VERSION)|cut -f1 -d.`
+ @-ln -s $@ $@.`echo $(VERSION)|cut -f1 -d.`
@-rm -rf tmp
libdpm.dll: $(RFIOLIB) $(NSLIB) $(DPMLIB)
@@ -101,6 +105,7 @@
@echo cleaning in CurDir
-@RemoveFiles(FilesToClean)
-@rm -rf tmp > /dev/null 2>&1
+ -@rm -f *.so.*
#endif
clobber: clean
|
