[libsemanage] Update to upstream * python wrapper makefile changes
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Aug 30 20:50:14 UTC 2011
commit e7fd74843d141e38804f35571a368a76e81f8998
Author: Dan Walsh <dwalsh at redhat.com>
Date: Tue Aug 30 16:50:02 2011 -0400
Update to upstream
* python wrapper makefile changes
libsemanage-rhat.patch | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index cca964d..1e791c8 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -1,26 +1,3 @@
-diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile
-index d21e972..d9120c0 100644
---- a/libsemanage/src/Makefile
-+++ b/libsemanage/src/Makefile
-@@ -10,7 +10,8 @@ LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(PREFIX)/lib
- INCLUDEDIR ?= $(PREFIX)/include
- PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" % sys.version_info[0:2])')
--PYINC ?= $(shell pkg-config --cflags `basename $(PYTHON)`)
-+PYINC ?= $(shell pkg-config --cflags $(PYPREFIX))
-+PYTHONLIBDIR ?= $(shell pkg-config --libs $(PYPREFIX))
- PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
- RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
- RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
-@@ -76,7 +77,7 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
- $(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $<
-
- $(SWIGSO): $(SWIGLOBJ)
-- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage -L$(LIBDIR) -Wl,-soname,$@,-z,defs
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage -L$(LIBDIR) $(PYTHONLIBDIR) -Wl,-soname,$@,-z,defs
-
- $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage -L$(LIBDIR) -Wl,-soname,$@
diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
index aac1974..3dfa279 100644
--- a/libsemanage/src/direct_api.c
More information about the scm-commits
mailing list