[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/, sys-libs/libsemanage/files/

[Jason Zaman]

commit:     c25bd87dfe740a26b0d57cf0c1c2098745b1b39e
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 04:38:08 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 18:14:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25bd87d

sys-libs/libsemanage: build paths patch is merged upstream

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libsemanage-2.7-build-paths.patch        | 37 ----------------------
 sys-libs/libsemanage/libsemanage-9999.ebuild       |  2 --
 2 files changed, 39 deletions(-)

diff --git a/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch b/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch
deleted file mode 100644
index 4c2ad0d9462..00000000000
--- a/sys-libs/libsemanage/files/libsemanage-2.7-build-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-there's no point in using -I/-L flags to the system paths and this breaks
-cross-compiling.  just drop them.
-
-diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile
-index ef25902..7aad334 100644
---- libsemanage/src/Makefile
-+++ libsemanage/src/Makefile
-@@ -61,7 +61,7 @@ CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-
- SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno-shadow \
- 		-Wno-unused-parameter
- 
--override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE 
-+override CFLAGS += -I../include -D_GNU_SOURCE
- RANLIB ?= ranlib
- 
- SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
-@@ -81,17 +81,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
- 	$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
- 
- $(SWIGSO): $(SWIGLOBJ)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage $(PYLIBS) -L$(LIBDIR)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lsemanage $(PYLIBS)
- 
- $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage $(RUBYLIBS) -L$(LIBDIR)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lsemanage $(RUBYLIBS)
- 
- $(LIBA): $(OBJS)
- 	$(AR) rcs $@ $^
- 	$(RANLIB) $@
- 
- $(LIBSO): $(LOBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -L$(LIBDIR) -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -lsepol -laudit -lselinux -lbz2 -Wl,-soname,$(LIBSO),--version-script=libsemanage.map,-z,defs
- 	ln -sf $@ $(TARGET)
- 
- $(LIBPC): $(LIBPC).in ../VERSION

diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 786c3994ea4..085031fc41e 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -71,8 +71,6 @@ src_prepare() {
 	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
 	echo "bzip-small=true" >> "${S}/src/semanage.conf"
 
-	eapply "${FILESDIR}"/${PN}-2.7-build-paths.patch
-
 	eapply_user
 
 	multilib_copy_sources