forked from pool/libselinux
4835d98054
update to libselinux-2.1.9, needed for rpm-4.10.0 update OBS-URL: https://build.opensuse.org/request/show/123445 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=41
23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
--- ./src/Makefile.orig 2012-06-04 08:20:19.000000000 +0000
|
|
+++ ./src/Makefile 2012-06-04 09:43:23.000000000 +0000
|
|
@@ -15,8 +15,8 @@ PYTHONLIBDIR ?= $(shell pkg-config --lib
|
|
PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
|
|
RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
|
|
RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
|
|
-RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
|
|
-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))
|
|
|
|
VERSION = $(shell cat ../VERSION)
|
|
@@ -76,7 +76,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
|
|
$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
|
|
|
|
$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
|
|
- $(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 $@ $<
|
|
|
|
$(SWIGSO): $(SWIGLOBJ)
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) $(PYTHONLIBDIR) -Wl,-soname,$@,-z,defs
|