forked from pool/libselinux
rebase
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=44
This commit is contained in:
parent
5fb9d20e5b
commit
8dbca95ae6
@ -1,7 +1,9 @@
|
|||||||
--- ./src/Makefile.orig 2012-06-04 08:20:19.000000000 +0000
|
Index: src/Makefile
|
||||||
+++ ./src/Makefile 2012-06-04 09:43:23.000000000 +0000
|
===================================================================
|
||||||
@@ -15,8 +15,8 @@ PYTHONLIBDIR ?= $(shell pkg-config --lib
|
--- src/Makefile.orig 2010-12-20 21:13:33.000000000 +0100
|
||||||
PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
|
+++ src/Makefile 2012-06-11 11:17:42.465960993 +0200
|
||||||
|
@@ -9,8 +9,8 @@ PYLIB ?= /usr/lib/$(PYLIBVER)
|
||||||
|
PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
|
||||||
RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
|
RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
|
||||||
RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
|
RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
|
||||||
-RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
|
-RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
|
||||||
@ -11,12 +13,12 @@
|
|||||||
LIBBASE=$(shell basename $(LIBDIR))
|
LIBBASE=$(shell basename $(LIBDIR))
|
||||||
|
|
||||||
VERSION = $(shell cat ../VERSION)
|
VERSION = $(shell cat ../VERSION)
|
||||||
@@ -76,7 +76,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
|
@@ -73,7 +73,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
|
||||||
$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
|
$(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
|
||||||
|
|
||||||
$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
|
$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
|
||||||
- $(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $<
|
- $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $<
|
||||||
+ $(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -I$(RUBYINC)/$(RUBYPLATFORM) -fPIC -DSHARED -c -o $@ $<
|
+ $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -I$(RUBYINC)/$(RUBYPLATFORM) -fPIC -DSHARED -c -o $@ $<
|
||||||
|
|
||||||
$(SWIGSO): $(SWIGLOBJ)
|
$(SWIGSO): $(SWIGLOBJ)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) $(PYTHONLIBDIR) -Wl,-soname,$@,-z,defs
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
|
||||||
|
@ -164,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_sbindir}/selinuxconlist
|
%{_sbindir}/selinuxconlist
|
||||||
%{_sbindir}/selinuxdefcon
|
%{_sbindir}/selinuxdefcon
|
||||||
%{_sbindir}/selinuxenabled
|
%{_sbindir}/selinuxenabled
|
||||||
%{_sbindir}/selinuxexeccon
|
|
||||||
%{_sbindir}/setenforce
|
%{_sbindir}/setenforce
|
||||||
%{_sbindir}/togglesebool
|
%{_sbindir}/togglesebool
|
||||||
%{_sbindir}/selinux-ready
|
%{_sbindir}/selinux-ready
|
||||||
|
Loading…
Reference in New Issue
Block a user