| 1 |
commit: d90adc3f699c3a53acbc72aab4e0cc5830fcb1b4 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sun Sep 26 10:29:14 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 26 11:26:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90adc3f |
| 7 |
|
| 8 |
sys-apps/minijail: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22411 |
| 11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-apps/minijail/files/minijail-9-makefile.patch | 44 ----------------------- |
| 16 |
1 file changed, 44 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/minijail/files/minijail-9-makefile.patch b/sys-apps/minijail/files/minijail-9-makefile.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 6ec44a8079a..00000000000 |
| 21 |
--- a/sys-apps/minijail/files/minijail-9-makefile.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,44 +0,0 @@ |
| 24 |
-diff --git a/Makefile b/Makefile |
| 25 |
-index 54ee978..a50ee9a 100644 |
| 26 |
---- a/Makefile |
| 27 |
-+++ b/Makefile |
| 28 |
-@@ -46,8 +46,8 @@ ifeq ($(USE_SYSTEM_GTEST),no) |
| 29 |
- GTEST_CXXFLAGS := -std=gnu++14 |
| 30 |
- GTEST_LIBS := gtest.a |
| 31 |
- else |
| 32 |
--GTEST_CXXFLAGS := $(shell gtest-config --cxxflags) |
| 33 |
--GTEST_LIBS := $(shell gtest-config --libs) |
| 34 |
-+GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags) |
| 35 |
-+GTEST_LIBS ?= $(shell gtest-config --libs) |
| 36 |
- endif |
| 37 |
- |
| 38 |
- CORE_OBJECT_FILES := libminijail.o syscall_filter.o signal_handler.o \ |
| 39 |
-@@ -73,6 +73,7 @@ clean: CLEAN(minijail0) |
| 40 |
- |
| 41 |
- |
| 42 |
- CC_LIBRARY(libminijail.so): LDLIBS += -lcap |
| 43 |
-+CC_LIBRARY(libminijail.so): LDFLAGS += -Wl,-soname,libminijail.so |
| 44 |
- CC_LIBRARY(libminijail.so): $(CORE_OBJECT_FILES) |
| 45 |
- clean: CLEAN(libminijail.so) |
| 46 |
- |
| 47 |
-@@ -91,6 +92,7 @@ TEST(CXX_BINARY(libminijail_unittest)): CC_LIBRARY(libminijailpreload.so) |
| 48 |
- |
| 49 |
- |
| 50 |
- CC_LIBRARY(libminijailpreload.so): LDLIBS += -lcap -ldl |
| 51 |
-+CC_LIBRARY(libminijailpreload.so): LDFLAGS += -Wl,-soname,libminijail.so |
| 52 |
- CC_LIBRARY(libminijailpreload.so): libminijailpreload.o $(CORE_OBJECT_FILES) |
| 53 |
- clean: CLEAN(libminijailpreload.so) |
| 54 |
- |
| 55 |
-diff --git a/common.mk b/common.mk |
| 56 |
-index 77879d8..1cd815b 100644 |
| 57 |
---- a/common.mk |
| 58 |
-+++ b/common.mk |
| 59 |
-@@ -323,7 +323,7 @@ COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \ |
| 60 |
- -fno-strict-aliasing $(SSP_CFLAGS) -O1 |
| 61 |
- CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14 |
| 62 |
- CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11 |
| 63 |
--CPPFLAGS += -D_FORTIFY_SOURCE=2 |
| 64 |
-+CPPFLAGS += |
| 65 |
- |
| 66 |
- # Enable large file support. |
| 67 |
- CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
Archives