diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-10-01 20:54:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-10-01 20:54:53 +0100 |
| commit | 391b5b359a346aff490103da7dddc85047f83830 (patch) | |
| tree | 29eea460a0bd7e1ff21d43b9d6df9af4d8a175e1 /sys-apps/minijail | |
| parent | c719fdcee603a5a706a45d10cb598762d56a727d (diff) | |
gentoo resync : 01.10.2021
Diffstat (limited to 'sys-apps/minijail')
| -rw-r--r-- | sys-apps/minijail/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/minijail/files/minijail-9-makefile.patch | 44 |
2 files changed, 0 insertions, 45 deletions
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index d0a0295b9be4..213cfe26a682 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1,5 +1,4 @@ AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223613ee734a38be770ac91e128c3e4f26cbbdff197a0636cb8c3b094c70fbed08443560bea095407736327f9d485ac SHA512 c727ff4752345f08d89dab5bc7489793763bf459bc169f132a285bc40c1d8e1e40d366bc8336e35c5362f4e4b999ec9d07db2b3bcd5f394954dae54cb533515a -AUX minijail-9-makefile.patch 1589 BLAKE2B d2b253f769e79c179fce51b858ce9b7b70dec806e7f3f330928e5befc7a6fc12e4a09e5fca0e29404badbab2f389bb4c9385d0ecc555610d3b45df272c5d34e1 SHA512 38a3afe8c17f591e8172ad6725f04d5a898ee3ec3a97ee99c6118c1c12189061906a442b95243e7907031c194f0477c3bdbc6d96df4923b43487f60ededa403b DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2 DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf EBUILD minijail-12.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6 diff --git a/sys-apps/minijail/files/minijail-9-makefile.patch b/sys-apps/minijail/files/minijail-9-makefile.patch deleted file mode 100644 index 6ec44a8079ad..000000000000 --- a/sys-apps/minijail/files/minijail-9-makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/Makefile b/Makefile -index 54ee978..a50ee9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -46,8 +46,8 @@ ifeq ($(USE_SYSTEM_GTEST),no) - GTEST_CXXFLAGS := -std=gnu++14 - GTEST_LIBS := gtest.a - else --GTEST_CXXFLAGS := $(shell gtest-config --cxxflags) --GTEST_LIBS := $(shell gtest-config --libs) -+GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags) -+GTEST_LIBS ?= $(shell gtest-config --libs) - endif - - CORE_OBJECT_FILES := libminijail.o syscall_filter.o signal_handler.o \ -@@ -73,6 +73,7 @@ clean: CLEAN(minijail0) - - - CC_LIBRARY(libminijail.so): LDLIBS += -lcap -+CC_LIBRARY(libminijail.so): LDFLAGS += -Wl,-soname,libminijail.so - CC_LIBRARY(libminijail.so): $(CORE_OBJECT_FILES) - clean: CLEAN(libminijail.so) - -@@ -91,6 +92,7 @@ TEST(CXX_BINARY(libminijail_unittest)): CC_LIBRARY(libminijailpreload.so) - - - CC_LIBRARY(libminijailpreload.so): LDLIBS += -lcap -ldl -+CC_LIBRARY(libminijailpreload.so): LDFLAGS += -Wl,-soname,libminijail.so - CC_LIBRARY(libminijailpreload.so): libminijailpreload.o $(CORE_OBJECT_FILES) - clean: CLEAN(libminijailpreload.so) - -diff --git a/common.mk b/common.mk -index 77879d8..1cd815b 100644 ---- a/common.mk -+++ b/common.mk -@@ -323,7 +323,7 @@ COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \ - -fno-strict-aliasing $(SSP_CFLAGS) -O1 - CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14 - CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11 --CPPFLAGS += -D_FORTIFY_SOURCE=2 -+CPPFLAGS += - - # Enable large file support. - CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |