-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/I/LMACgkQrlYvE4MpobPIHQCgx3oOeOmfDeovNMQGZnUcsfLg 3YcAoJdHqjczg/cjXqzTWg4D7MQ+0PAX =Pc6O -----END PGP SIGNATURE-----
>From 1f1976460e7f4a1425fee3f9cdd70a21a46e6641 Mon Sep 17 00:00:00 2001 From: Eric Paris <eparis@xxxxxxxxxx> Date: Fri, 1 Jun 2012 11:30:26 -0400 Subject: [PATCH 89/90] libselinux: libsemanage: do not set soname needlessly We explicitly set the soname of the python and ruby files. We don't need this. We are using the -o name as the soname, so just let the toolchain do its thing. It just makes the Makefile nicer to read. Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- libselinux/src/Makefile | 4 ++-- libsemanage/src/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index b333f07..0ff2def 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -109,7 +109,7 @@ $(SWIGSO): $(SWIGLOBJ) $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) $(PYTHONLIBDIR) $(SWIGRUBYSO): $(SWIGRUBYLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) $(LIBA): $(OBJS) $(AR) rcs $@ $^ @@ -129,7 +129,7 @@ $(AUDIT2WHYLOBJ): audit2why.c $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) -Wl,-soname,$@ + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) %.o: %.c policy.h $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile index fc64919..ba73c42 100644 --- a/libsemanage/src/Makefile +++ b/libsemanage/src/Makefile @@ -84,10 +84,10 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< $(SWIGSO): $(SWIGLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage -L$(LIBDIR) -Wl,-soname,$@ + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage -L$(LIBDIR) $(SWIGRUBYSO): $(SWIGRUBYLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage -L$(LIBDIR) -Wl,-soname,$@ + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage -L$(LIBDIR) $(LIBA): $(OBJS) $(AR) rcs $@ $^ -- 1.7.10.2
