summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Julien Pivotto <roidelapluie@inuits.eu> 2017-01-14 22:27:39 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-01-19 00:04:10 +0100
commit1bfb848b45221dffb7e3611eddfb1ebe4b0740de (patch)
tree5120a12f8a32b03897fd939caecefd36d3f6c771
parent3527ac01fb34683773acc7002f642e9407b32b4b (diff)
downloadselinux-1bfb848b45221dffb7e3611eddfb1ebe4b0740de.tar.gz
selinux-1bfb848b45221dffb7e3611eddfb1ebe4b0740de.tar.xz
security/libselinux: version bump to 2.6
Change-Id: Id6d34403f42ad70bac8f71bff824eac223f48a02 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> Reviewed-on: https://galileo.mailstation.de/gerrit/8025 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/security/libselinux/files/libselinux-prefix-build-tools.patch42
-rw-r--r--packages/security/libselinux/libselinux-2.6.exheres-0 (renamed from packages/security/libselinux/libselinux-2.5.exheres-0)3
2 files changed, 1 insertions, 44 deletions
diff --git a/packages/security/libselinux/files/libselinux-prefix-build-tools.patch b/packages/security/libselinux/files/libselinux-prefix-build-tools.patch
deleted file mode 100644
index eeda423..0000000
--- a/packages/security/libselinux/files/libselinux-prefix-build-tools.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Source: exherbo-specific
-Upstream: yes
-Reason: Use prefixed build tools
-
-diff --git a/src/Makefile b/src/Makefile
-index d0021ae..67c2d47 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -5,6 +5,7 @@ PYTHON ?= python
- PYPREFIX ?= $(notdir $(PYTHON))
- RUBY ?= ruby
- RUBYPREFIX ?= $(notdir $(RUBY))
-+PKG_CONFIG ?= pkg-config
-
- # Installation directories.
- PREFIX ?= $(DESTDIR)/usr
-@@ -12,11 +13,11 @@ LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(DESTDIR)/lib
- INCLUDEDIR ?= $(PREFIX)/include
- PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" % sys.version_info[0:2])')
--PYINC ?= $(shell pkg-config --cflags $(PYPREFIX))
-+PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX))
- 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)
-+RUBYINC ?= $(shell $(PKG_CONFIG) --cflags ruby)
- RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
- LIBBASE ?= $(shell basename $(LIBDIR))
-
-diff --git a/src/exception.sh b/src/exception.sh
-index b7cff7e..a58bf3f 100755
---- a/src/exception.sh
-+++ b/src/exception.sh
-@@ -15,6 +15,6 @@ echo "
- ;;
- esac
- }
--gcc -x c -c -I../include - -aux-info temp.aux < ../include/selinux/selinux.h
-+${CC:-gcc} -x c -c -I../include - -aux-info temp.aux < ../include/selinux/selinux.h
- for i in `awk '/<stdin>.*extern int/ { print $6 }' temp.aux`; do except $i ; done
- rm -f -- temp.aux -.o
diff --git a/packages/security/libselinux/libselinux-2.5.exheres-0 b/packages/security/libselinux/libselinux-2.6.exheres-0
index ccae5f2..d53ed1e 100644
--- a/packages/security/libselinux/libselinux-2.5.exheres-0
+++ b/packages/security/libselinux/libselinux-2.6.exheres-0
@@ -23,8 +23,6 @@ DEPENDENCIES="
python? ( dev-lang/swig )
"
-DEFAULT_SRC_PREPARE_PATCHES+=( "${FILES}/${PN}-prefix-build-tools.patch" )
-
DEFAULT_SRC_INSTALL_PARAMS=(
DESTDIR="${IMAGE}"
PREFIX="${IMAGE}/usr/$(exhost --target)"
@@ -45,6 +43,7 @@ install_one_multibuild(){
default
optionq python && emake install-pywrap \
"${DEFAULT_SRC_INSTALL_PARAMS[@]}" \
+ PYSITEDIR="${IMAGE}$(python_get_sitedir)" \
PYTHON="${PYTHON}"
}