From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B6D9158091 for ; Sat, 11 Jun 2022 18:45:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AD5BE076B; Sat, 11 Jun 2022 18:45:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11A68E076B for ; Sat, 11 Jun 2022 18:45:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C0DE341224 for ; Sat, 11 Jun 2022 18:45:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D018303 for ; Sat, 11 Jun 2022 18:45:38 +0000 (UTC) From: "Aisha Tammy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aisha Tammy" Message-ID: <1654973072.bdee3cbf91ca28a6e6946b3b66f7cb698dc96785.epsilon-0@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-crypt/intel-ipsec-mb/, app-crypt/intel-ipsec-mb/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.2_remove-werror-and-O3.patch app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild X-VCS-Directories: app-crypt/intel-ipsec-mb/files/ app-crypt/intel-ipsec-mb/ X-VCS-Committer: epsilon-0 X-VCS-Committer-Name: Aisha Tammy X-VCS-Revision: bdee3cbf91ca28a6e6946b3b66f7cb698dc96785 X-VCS-Branch: dev Date: Sat, 11 Jun 2022 18:45:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4df9670f-17ff-4738-8494-a79bf199eec1 X-Archives-Hash: b38c5d4b49cdbfd0f8dc1d433283bc75 commit: bdee3cbf91ca28a6e6946b3b66f7cb698dc96785 Author: Aisha Tammy aisha cc> AuthorDate: Sat Jun 11 18:44:32 2022 +0000 Commit: Aisha Tammy aisha cc> CommitDate: Sat Jun 11 18:44:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bdee3cbf app-crypt/intel-ipsec-mb: update patch fix compile error when library is already installed Signed-off-by: Aisha Tammy aisha.cc> .../intel-ipsec-mb-1.2_remove-werror-and-O3.patch | 159 +++++++++++++++++++++ app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild | 2 +- .../intel-ipsec-mb/intel-ipsec-mb-9999.ebuild | 2 +- 3 files changed, 161 insertions(+), 2 deletions(-) diff --git a/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.2_remove-werror-and-O3.patch b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.2_remove-werror-and-O3.patch new file mode 100644 index 000000000..3c2cfb1f3 --- /dev/null +++ b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.2_remove-werror-and-O3.patch @@ -0,0 +1,159 @@ +diff --git a/lib/Makefile b/lib/Makefile +index f364b619..854357db 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -117,10 +117,10 @@ YASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I $i) + NASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I$i/) + ifneq ($(MINGW),0) + YASM_FLAGS := -f x64 -f win64 -X gnu -g dwarf2 -DWIN_ABI $(YASM_INCLUDES) +-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES) ++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES) + else + YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__ $(YASM_INCLUDES) +-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES) ++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES) + endif + + DEBUG_OPT ?= -O0 +@@ -170,7 +170,6 @@ endif + + # prevent SIMD optimizations for non-aesni modules + CFLAGS_NO_SIMD = $(CFLAGS) -O1 +-CFLAGS += $(OPT) + + # Set generic architectural optimizations + OPT_X86 := -msse4.2 +@@ -746,7 +745,7 @@ install: $(LIB_DIR)/$(LIBNAME) + install -m 0444 $(MAN2) $(MAN_DIR) + install -d $(LIB_INSTALL_DIR) + ifeq ($(SHARED),y) +- install -s -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR) ++ install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR) + else + # must not strip symbol table for static libs + install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR) +diff --git a/lib/win_x64.mak b/lib/win_x64.mak +index 17c58f72..93da855a 100644 +--- a/lib/win_x64.mak ++++ b/lib/win_x64.mak +@@ -131,7 +131,7 @@ LINK_TOOL = link + LINKFLAGS = $(DLFLAGS) /nologo /machine:X64 + + AS = nasm +-AFLAGS = $(DAFLAGS) -Werror -fwin64 -Xvc -DWIN_ABI -Iinclude/ \ ++AFLAGS = $(DAFLAGS) -fwin64 -Xvc -DWIN_ABI -Iinclude/ \ + -I./ -Iavx/ -Iavx2/ -Iavx512/ -Isse/ + + # dependency +diff --git a/perf/Makefile b/perf/Makefile +index f204e575..9db08180 100644 +--- a/perf/Makefile ++++ b/perf/Makefile +@@ -45,9 +45,9 @@ endif + + ifeq ($(MINGW),0) + CFLAGS += -DLINUX +-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ ++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ + else +-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI ++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI + endif + + # if "-z ibt" is supported then assume "-z shstk, -z cet-report=error" are also supported +@@ -62,21 +62,21 @@ CFLAGS += -fcf-protection=full + endif + + ifeq ($(MINGW),0) +-LDFLAGS = -fPIE -z noexecstack -z relro -z now -pthread ++LDFLAGS += -fPIE -z noexecstack -z relro -z now -pthread + endif + ifeq ($(CC_HAS_CET),1) + LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error + endif + LDLIBS = -lIPSec_MB + +-ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes") ++#ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes") + # library installed +-CFLAGS += +-else ++#CFLAGS += ++#else + # library not installed + CFLAGS += -I../lib/include -I../lib + LDFLAGS += -L$(LIB_DIR) +-endif ++#endif + + DEBUG_OPT ?= -O0 + ifeq ($(DEBUG),y) +diff --git a/perf/win_x64.mak b/perf/win_x64.mak +index b0b864db..03c3b584 100644 +--- a/perf/win_x64.mak ++++ b/perf/win_x64.mak +@@ -75,7 +75,7 @@ LNK = link + LFLAGS = /out:$(APP).exe $(DLFLAGS) + + AS = nasm +-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI ++AFLAGS = -fwin64 -Xvc -DWIN_ABI + + OBJECTS = ipsec_perf.obj msr.obj misc.obj + +diff --git a/test/Makefile b/test/Makefile +index b03700a5..380a954a 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -66,15 +66,15 @@ endif + YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__ + ifeq ($(MINGW),0) + CFLAGS += -DLINUX +-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ ++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ + else +-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI ++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI + endif + + ifeq ($(MINGW),0) +-LDFLAGS = -fPIE -z noexecstack -z relro -z now ++LDFLAGS += -fPIE -z noexecstack -z relro -z now + else +-LDFLAGS = -fPIE ++LDFLAGS += -fPIE + endif + + ifeq ($(CC_HAS_CET),1) +@@ -82,14 +82,14 @@ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error + endif + LDLIBS = -lIPSec_MB + +-ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes") ++#ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes") + # library installed +-CFLAGS += +-else ++#CFLAGS += ++#else + # library not installed + CFLAGS += -I../lib/include -I../lib + LDFLAGS += -L$(LIB_DIR) +-endif ++#endif + + FUZZ_CFLAGS = -I../lib -L../lib $(CFLAGS) -g -fsanitize=fuzzer,address,leak + +diff --git a/test/win_x64.mak b/test/win_x64.mak +index a3bd0b00..a7ff51f5 100644 +--- a/test/win_x64.mak ++++ b/test/win_x64.mak +@@ -74,7 +74,7 @@ TEST_LFLAGS = /out:$(TEST_APP).exe $(DLFLAGS) + XVALID_LFLAGS = /out:$(XVALID_APP).exe $(DLFLAGS) + + AS = nasm +-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI ++AFLAGS = -fwin64 -Xvc -DWIN_ABI + + # dependency + !ifndef DEPTOOL diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild index 7650520da..4d8f17f15 100644 --- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild +++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild @@ -25,7 +25,7 @@ BDEPEND=" >=dev-lang/nasm-2.13.03 " -PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.1_remove-werror-and-O3.patch" ) +PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.2_remove-werror-and-O3.patch" ) src_configure(){ tc-export CC LD AR diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild index 7650520da..4d8f17f15 100644 --- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild +++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild @@ -25,7 +25,7 @@ BDEPEND=" >=dev-lang/nasm-2.13.03 " -PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.1_remove-werror-and-O3.patch" ) +PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.2_remove-werror-and-O3.patch" ) src_configure(){ tc-export CC LD AR