forked from pool/libselinux
0586d2c8c0
- update to 2.1.12 - update to 2.1.12 - added the recent libselinux-rhat.patch * Add support for lxc_contexts_path * utils: add service to getdefaultcon * libsemanage: do not set soname needlessly * libsemanage: remove PYTHONLIBDIR and ruby equivalent * boolean name equivalency * getsebool: support boolean name substitution * Add man page for new selinux_boolean_sub function. * expose selinux_boolean_sub * matchpathcon: add -m option to force file type check * utils: avcstat: clear sa_mask set * seusers: Check for strchr failure * booleans: initialize pointer to silence coveriety * stop messages when SELinux disabled * Ensure that we only close the selinux netlink socket once. * improve the file_contexts.5 manual page * Fortify source now requires all code to be compiled with -O flag * asprintf return code must be checked * avc_netlink_recieve handle EINTR * audit2why: silence -Wmissing-prototypes warning * libsemanage: remove build warning when build swig c files * matchpathcon: bad handling of symlinks in / * seusers: remove unused lineno * seusers: getseuser: gracefully handle NULL service * New Android property labeling backend * label_android_property whitespace cleanups * additional makefile support for rubywrap OBS-URL: https://build.opensuse.org/request/show/150434 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=60
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
Index: src/Makefile
|
|
===================================================================
|
|
--- src/Makefile.orig 2013-01-30 13:24:55.549631752 +0100
|
|
+++ src/Makefile 2013-01-30 13:25:56.148209843 +0100
|
|
@@ -16,8 +16,8 @@ PYINC ?= $(shell pkg-config --cflags $(P
|
|
PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
|
|
RUBYLIBVER ?= $(shell $(RUBY) -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
|
|
RUBYPLATFORM ?= $(shell $(RUBY) -e 'print RUBY_PLATFORM')
|
|
-RUBYINC ?= $(shell pkg-config --cflags ruby)
|
|
-RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
|
|
+RUBYINC ?= $(shell ruby -r rbconfig -e "print Config::CONFIG['rubyhdrdir'].nil? ? '$(LIBDIR)/ruby/$(RUBYLIBVER)' : Config::CONFIG['rubyhdrdir']")
|
|
+RUBYINSTALL ?= $(shell ruby -r rbconfig -e "print Config::CONFIG['vendorarchdir'].nil? ? '$(DESTDIR)'+Config::CONFIG['sitearchdir'] : '$(DESTDIR)'+Config::CONFIG['vendorarchdir']")
|
|
LIBBASE=$(shell basename $(LIBDIR))
|
|
|
|
LDFLAGS ?= -lpcre -lpthread
|
|
@@ -103,7 +103,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
|
|
$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $<
|
|
|
|
$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
|
|
- $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
|
|
+ $(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -I$(RUBYINC)/$(RUBYPLATFORM) -fPIC -DSHARED -c -o $@ $<
|
|
|
|
$(SWIGSO): $(SWIGLOBJ)
|
|
$(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
|