rpm/libselinux
SHA256
1
0
Fork 0
forked from pool/libselinux
Code Pull Requests Activity

Accepting request 308905 from home:dimstar:Factory

Browse Source 
Fix building of libselinux-bindings: make proper use of ruby 2.2

OBS-URL: https://build.opensuse.org/request/show/308905
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=81
This commit is contained in:
Vítězslav Čížek 2015-05-28 09:05:55 +00:00 committed by Git OBS Bridge
parent 0b8e4bc585
commit 2e246b5644
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libselinux-2.2-ruby.patch
View File

@ -1,19 +1,19 @@
Index: src/Makefile Index: src/Makefile
=================================================================== ===================================================================
--- src/Makefile.orig 2013-01-30 13:24:55.549631752 +0100 --- src/Makefile.orig
+++ src/Makefile 2013-01-30 13:25:56.148209843 +0100 +++ src/Makefile
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@ PYINC ?= $(shell pkg-config --cflags $(P
PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER) PYLIBDIR ?= $(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 ?= $(shell pkg-config --cflags ruby) -RUBYINC ?= $(shell pkg-config --cflags ruby)
-RUBYINSTALL ?= $(LIBDIR)/ruby/site_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']") +RUBYINC ?= $(shell ruby -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'].nil? ? '$(LIBDIR)/ruby/$(RUBYLIBVER)' : RbConfig::CONFIG['rubyhdrdir']")
+RUBYINSTALL ?= $(shell ruby -r rbconfig -e "print Config::CONFIG['vendorarchdir'].nil? ? '$(DESTDIR)'+Config::CONFIG['sitearchdir'] : '$(DESTDIR)'+Config::CONFIG['vendorarchdir']") +RUBYINSTALL ?= $(shell ruby -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir'].nil? ? '$(DESTDIR)'+RbConfig::CONFIG['sitearchdir'] : '$(DESTDIR)'+RbConfig::CONFIG['vendorarchdir']")
LIBBASE ?= $(shell basename $(LIBDIR)) LIBBASE ?= $(shell basename $(LIBDIR))
VERSION = $(shell cat ../VERSION) VERSION = $(shell cat ../VERSION)
@@ -103,7 +103,7 @@ $(SWIGLOBJ): $(SWIGCOUT) @@ -98,7 +98,7 @@ $(SWIGLOBJ): $(SWIGCOUT)
$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $< $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $<
$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)

6
libselinux-bindings.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 27 11:53:54 UTC 2015 - dimstar@opensuse.org
- Update libselinux-2.2-ruby.patch: use RbConfig instead of
deprecated Config.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 31 13:43:41 UTC 2013 - p.drouand@gmail.com Thu Oct 31 13:43:41 UTC 2013 - p.drouand@gmail.com

2
libselinux-bindings.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libselinux-bindings # spec file for package libselinux-bindings
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

2
libselinux.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libselinux # spec file for package libselinux
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed