[Linux-cluster] [PATCH] libgulm not hadled correctly?

[Fabio Massimo Di Nitto]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi everybody,

while running an automated test to verify library integrity and consistency,
I noticed that libgulm.a was not an ar archive as it is supposed to be and
that libgulm.so.$(RELEASE_MAJOR) amd libgulm.so where not symlinks, but
plain copy of the library.

I am not sure if this was just an overlook or if it was intended to be that way.

The following patch does what I think is the right thing.

Please review before applying!

Thanks
Fabio M. Di Nitto

- --- gulm/Makefile.orig	2005-04-21 11:09:08.000000000 +0200
+++ gulm/Makefile	2005-04-21 11:21:30.507016896 +0200
@@ -80,16 +80,15 @@
 #######################################
 # build rules
 
- -all: src/lock_gulmd src/gulm_tool lib/libgulm.so lib/libgulm.so.$(RELEASE_MAJOR)
+all: src/lock_gulmd src/gulm_tool lib/libgulm.so lib/libgulm.so.$(RELEASE_MAJOR) lib/libgulm.a
 
 src/lock_gulmd: $(gulmd_src:.c=.o) 
 	${CC} ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} -lccs -o $@
 
 lib/libgulm.a: $(lib_src:.c=.o)
- -	${LD} ${LDFLAGS} -r $^ -o $@ --retain-symbols-file=lib/exported_symbols.sym
- -	#xdr_* functions still `visable'. for relocation i think.
+	${AR} cr $@ $^
 
- -lib/libgulm.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): lib/libgulm.a
+lib/libgulm.so.$(RELEASE_MAJOR).$(RELEASE_MINOR): $(lib_src:.c=.o)
 	${LD} -shared -soname libgulm.so.$(RELEASE_MAJOR) -o $@ $^ -lc
 
 lib/libgulm.so.$(RELEASE_MAJOR): lib/libgulm.so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
@@ -121,8 +120,8 @@
 	install -d ${libdir}
 	install -m644 lib/libgulm.a ${libdir}
 	install -m644 lib/libgulm.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
- -	install -m644 lib/libgulm.so.$(RELEASE_MAJOR) ${libdir}
- -	install -m644 lib/libgulm.so ${libdir}
+	cd $(libdir); ln -snf libgulm.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) libgulm.so.$(RELEASE_MAJOR); cd -
+	cd $(libdir); ln -snf libgulm.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) libgulm.so; cd -
 	install -d ${incdir}
 	install -m644 lib/libgulm.h ${incdir}
 	cd init.d && ${MAKE} install
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iQIVAwUBQmdw7FA6oBJjVJ+OAQLKIBAAiVkNZjBP7s8Oree6AtCrbiM6WbZPs7iH
ABXCZjLcjnIZUz2sJPCuOcQnULsUm6g3505gC/fLxf/0H9WbZwLjNtnYXKwdxgzW
oVvUwqw0qJNR1+fStO7Z/QLY8YeGII8qYtAap6RE/TpAwjh0LtSwYrXapMw8UWlS
lT0GdtTZWAAab4ri3pMmW81hd+SZ/1aYeD38XcF3UesHL4PkClCJtPXjFGin5Phg
WUG93W0gFVVAZwIykd+iixO7kByvUz8P+1TKUOqF/II0jyWhd2nSidkel0YUmSMQ
JhmMTMJcBewPtcUOG0pbKC6aoD7bV+8FAXxYOwSGZ0jNl0O1H6djbX3tveTC0C0n
aQJqIlP4G41MPeky3cKlayRJqKPunNI5ZAWun4YqMb1jp958gQRVigH0SEz47xkT
M1l78qH07/fH8FmqvMKrUuf9kjRhaDjJKdlfphL4vyQWJlFC5U6m3XjamgS75qCP
HTMbgQi+jEEL/bVaTeX+VI0Jp79OCSTkHMZiie6p2zI6lb6jKBJv8IicjVaUQmgY
X0vR2veYiNC9Sxd/ppO6xewZpW3szQsOYKxJxzHXhnoKKklFC8Tz8QL446Je+iih
L+72Oxq3QUBkEip4oIVuahgUmFOVmQ4AFrCpqpkQ4JMSX7AqnM7OVDHKAK9Gy92V
Fpe1FFaJ4tU=
=gUYv
-----END PGP SIGNATURE-----