| 1 |
commit: 11c3c8ee81bcbd256e05d1e1c7319fc419d4a095 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun May 27 11:58:49 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 27 16:09:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c3c8ee |
| 7 |
|
| 8 |
sys-libs/libselinux: remove unused patch(es) |
| 9 |
|
| 10 |
...x-2.6-0007-build-related-fixes-bug-500674.patch | 91 ---------------------- |
| 11 |
1 file changed, 91 deletions(-) |
| 12 |
|
| 13 |
diff --git a/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch b/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch |
| 14 |
deleted file mode 100644 |
| 15 |
index 83596e8e0a7..00000000000 |
| 16 |
--- a/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch |
| 17 |
+++ /dev/null |
| 18 |
@@ -1,91 +0,0 @@ |
| 19 |
-https://bugs.gentoo.org/500674 |
| 20 |
- |
| 21 |
-random fixes: |
| 22 |
-- make sure PCRE_CFLAGS get used |
| 23 |
-- use PCRE_LIBS via pkg-config |
| 24 |
-- move LDFLAGS to before objects, not after |
| 25 |
-- do not hardcode -L$(LIBDIR) (let the toolchain handle it) |
| 26 |
-- do not hardcode -I$(INCLUDEDIR) (let the toolchain handle it) |
| 27 |
- |
| 28 |
-diff --git a/libselinux/Makefile b/libselinux/Makefile |
| 29 |
-index baa0db3..4dc5aa0 100644 |
| 30 |
---- libselinux/Makefile |
| 31 |
-+++ libselinux/Makefile |
| 32 |
-@@ -1,5 +1,6 @@ |
| 33 |
- SUBDIRS = src include utils man |
| 34 |
- |
| 35 |
-+PKG_CONFIG ?= pkg-config |
| 36 |
- DISABLE_SETRANS ?= n |
| 37 |
- DISABLE_RPM ?= n |
| 38 |
- ANDROID_HOST ?= n |
| 39 |
-@@ -20,10 +21,11 @@ export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST |
| 40 |
- |
| 41 |
- USE_PCRE2 ?= n |
| 42 |
- ifeq ($(USE_PCRE2),y) |
| 43 |
-- PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 |
| 44 |
-- PCRE_LDFLAGS := -lpcre2-8 |
| 45 |
-+ PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 $(shell $(PKG_CONFIG) --cflags libpcre2-8) |
| 46 |
-+ PCRE_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpcre2-8) |
| 47 |
- else |
| 48 |
-- PCRE_LDFLAGS := -lpcre |
| 49 |
-+ PCRE_CFLAGS := $(shell $(PKG_CONFIG) --cflags libpcre) |
| 50 |
-+ PCRE_LDFLAGS := $(shell $(PKG_CONFIG) --libs libpcre) |
| 51 |
- endif |
| 52 |
- export PCRE_CFLAGS PCRE_LDFLAGS |
| 53 |
- |
| 54 |
-diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile |
| 55 |
-index 13501cd..42cb2f6 100644 |
| 56 |
---- libselinux/src/Makefile |
| 57 |
-+++ libselinux/src/Makefile |
| 58 |
-@@ -67,7 +67,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi |
| 59 |
- |
| 60 |
- PCRE_LDFLAGS ?= -lpcre |
| 61 |
- |
| 62 |
--override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) |
| 63 |
-+override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) |
| 64 |
- |
| 65 |
- SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-parameter \ |
| 66 |
- -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes -Wno-missing-declarations |
| 67 |
-@@ -107,17 +107,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) |
| 68 |
- $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $< |
| 69 |
- |
| 70 |
- $(SWIGSO): $(SWIGLOBJ) |
| 71 |
-- $(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) -L$(LIBDIR) |
| 72 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux |
| 73 |
- |
| 74 |
- $(SWIGRUBYSO): $(SWIGRUBYLOBJ) |
| 75 |
-- $(CC) $(CFLAGS) -shared -o $@ $^ -L. -lselinux $(LDFLAGS) -L$(LIBDIR) |
| 76 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux |
| 77 |
- |
| 78 |
- $(LIBA): $(OBJS) |
| 79 |
- $(AR) rcs $@ $^ |
| 80 |
- $(RANLIB) $@ |
| 81 |
- |
| 82 |
- $(LIBSO): $(LOBJS) |
| 83 |
-- $(CC) $(CFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro |
| 84 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) -ldl -Wl,-soname,$(LIBSO),-z,defs,-z,relro |
| 85 |
- ln -sf $@ $(TARGET) |
| 86 |
- |
| 87 |
- $(LIBPC): $(LIBPC).in ../VERSION |
| 88 |
-@@ -130,7 +130,7 @@ $(AUDIT2WHYLOBJ): audit2why.c |
| 89 |
- $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< |
| 90 |
- |
| 91 |
- $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) |
| 92 |
-- $(CC) $(CFLAGS) -shared -o $@ $^ -L. $(LDFLAGS) -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) |
| 93 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a |
| 94 |
- |
| 95 |
- %.o: %.c policy.h |
| 96 |
- $(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $< |
| 97 |
-diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile |
| 98 |
-index e56a953..6fd205a 100644 |
| 99 |
---- libselinux/utils/Makefile |
| 100 |
-+++ libselinux/utils/Makefile |
| 101 |
-@@ -25,7 +25,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissi |
| 102 |
- -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \ |
| 103 |
- -Werror -Wno-aggregate-return -Wno-redundant-decls |
| 104 |
- override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) |
| 105 |
--LDLIBS += -L../src -lselinux -L$(LIBDIR) |
| 106 |
-+LDLIBS += -L../src -lselinux |
| 107 |
- PCRE_LDFLAGS ?= -lpcre |
| 108 |
- |
| 109 |
- ifeq ($(ANDROID_HOST),y) |
Archives