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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9DB9C138350 for ; Thu, 30 Apr 2020 12:00:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FF34E092B; Thu, 30 Apr 2020 12:00:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D2CDE092B for ; Thu, 30 Apr 2020 12:00:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6D3C34F03D for ; Thu, 30 Apr 2020 12:00:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23E1A211 for ; Thu, 30 Apr 2020 12:00:20 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1588247996.2fa93f1257ee4c9727b8398fe76467a416961e91.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/udk/udk-2015-r1.ebuild sys-boot/udk/udk-2018-r1.ebuild X-VCS-Directories: sys-boot/udk/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 2fa93f1257ee4c9727b8398fe76467a416961e91 X-VCS-Branch: master Date: Thu, 30 Apr 2020 12:00:20 +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: dc87b705-40d8-434b-9f48-9cf72c8cf137 X-Archives-Hash: eac58dcbddc69d0a4f4e9896e0e0c84f commit: 2fa93f1257ee4c9727b8398fe76467a416961e91 Author: Stéphane Veyret neptura org> AuthorDate: Wed Apr 29 16:40:40 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Apr 30 11:59:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa93f12 sys-boot/udk: Remove colon from sed Closes: https://bugs.gentoo.org/710816 Signed-off-by: Stéphane Veyret neptura.org> Closes: https://github.com/gentoo/gentoo/pull/15568 Signed-off-by: Joonas Niilola gentoo.org> sys-boot/udk/udk-2015-r1.ebuild | 54 ++++++++++++++++++++--------------------- sys-boot/udk/udk-2018-r1.ebuild | 20 +++++++-------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/sys-boot/udk/udk-2015-r1.ebuild b/sys-boot/udk/udk-2015-r1.ebuild index ec568865288..0e6388c5e43 100644 --- a/sys-boot/udk/udk-2015-r1.ebuild +++ b/sys-boot/udk/udk-2015-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -80,7 +80,7 @@ src_configure() { || die "Failed to patch source file" # Compile of Base Tools is required for further setting up the environment # Base tools does not like parallel make - sed -e "s:^\(CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \ + sed -e "s|^\(CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \ -i "${S}/BaseTools/Source/C/Makefiles/header.makefile" \ || die "Failed to update makefile header" local make_flags=( @@ -105,17 +105,17 @@ src_configure() { else append-cflags $(test-flags-CC -m32) $(test-flags-CC -malign-double) fi - sed -e "s:^\(ACTIVE_PLATFORM\s*=\).*$:\1 MdeModulePkg/MdeModulePkg.dsc:" \ - -e "s:^\(TARGET\s*=\).*$:\1 RELEASE:" \ - -e "s:^\(TARGET_ARCH\s*=\).*$:\1 ${ARCH}:" \ - -e "s:^\(TOOL_CHAIN_TAG\s*=\).*$:\1 ${TOOLCHAIN_TAG}:" \ - -e "s:^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \ + sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \ + -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \ + -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${ARCH}|" \ + -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \ + -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \ -i "${S}/Conf/target.txt" || die "Failed to configure target file" - sed -e "s:«CC»:$(tc-getCC):" \ - -e "s:«AR»:$(tc-getAR):" \ - -e "s:«LD»:$(tc-getLD):" \ - -e "s:«OBJCOPY»:$(tc-getOBJCOPY):" \ - -e "s:«CFLAGS»:${CFLAGS}:" \ + sed -e "s|«CC»|$(tc-getCC)|" \ + -e "s|«AR»|$(tc-getAR)|" \ + -e "s|«LD»|$(tc-getLD)|" \ + -e "s|«OBJCOPY»|$(tc-getOBJCOPY)|" \ + -e "s|«CFLAGS»|${CFLAGS}|" \ "${FILESDIR}/${PV}-tools_def.template" >>"${S}/Conf/tools_def.txt" \ || die "Failed to prepare tools definition file" } @@ -181,23 +181,23 @@ copySourceFiles() { # 3 - Path of the generated Makefile. createMakefile() { local static_libs=$(sed -n '/^STATIC_LIBRARY_FILES\s*=/,/^\s*\$(OUTPUT_DIR)/{/^\s*\$(OUTPUT_DIR)/b;p}' ${3} \ - | sed -e 's:^\s*\$(BIN_DIR).*/\([^/]*\)\.lib:\t-l\1:' -e 's:\\$:\\\\\\n:' | tr --delete '\n') + | sed -e 's|^\s*\$(BIN_DIR).*/\([^/]*\)\.lib|\t-l\1|' -e 's|\\$|\\\\\\n|' | tr --delete '\n') local pecoff_header_size; [[ $ARCH == X64 ]] && pecoff_header_size='0x228' || pecoff_header_size='0x220' - sed -e "s:«MODULE»:${2}:" \ - -e "s:«PACKAGE_NAME»:${PN}:" \ - -e "s:«STATIC_LIBS»:${static_libs}:" \ - -e "s:«MODULE_TYPE»:$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1):" \ - -e "s:«IMAGE_ENTRY_POINT»:$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3}):" \ - -e "s:«CP»:$(grep -e '^CP\s*=' ${3}):" \ - -e "s:«RM»:$(grep -e '^RM\s*=' ${3}):" \ - -e "s:«CC»:$(grep -e '^CC\s*=' ${3}):" \ - -e "s:«DLINK»:$(grep -e '^DLINK\s*=' ${3}):" \ - -e "s:«OBJCOPY»:$(grep -e '^OBJCOPY\s*=' ${3}):" \ - -e "s:«GENFW»:$(grep -e '^GENFW\s*=' ${3}):" \ - -e "s:«PECOFF_HEADER_SIZE»:${pecoff_header_size}:" \ - -e "s:«OBJCOPY_FLAGS»:$(grep -e '^OBJCOPY_FLAGS\s*=' ${3}):" \ - -e "s:«GENFW_FLAGS»:$(grep -e '^GENFW_FLAGS\s*=' ${3}):" \ + sed -e "s|«MODULE»|${2}|" \ + -e "s|«PACKAGE_NAME»|${PN}|" \ + -e "s|«STATIC_LIBS»|${static_libs}|" \ + -e "s|«MODULE_TYPE»|$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1)|" \ + -e "s|«IMAGE_ENTRY_POINT»|$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3})|" \ + -e "s|«CP»|$(grep -e '^CP\s*=' ${3})|" \ + -e "s|«RM»|$(grep -e '^RM\s*=' ${3})|" \ + -e "s|«CC»|$(grep -e '^CC\s*=' ${3})|" \ + -e "s|«DLINK»|$(grep -e '^DLINK\s*=' ${3})|" \ + -e "s|«OBJCOPY»|$(grep -e '^OBJCOPY\s*=' ${3})|" \ + -e "s|«GENFW»|$(grep -e '^GENFW\s*=' ${3})|" \ + -e "s|«PECOFF_HEADER_SIZE»|${pecoff_header_size}|" \ + -e "s|«OBJCOPY_FLAGS»|$(grep -e '^OBJCOPY_FLAGS\s*=' ${3})|" \ + -e "s|«GENFW_FLAGS»|$(grep -e '^GENFW_FLAGS\s*=' ${3})|" \ "${FILESDIR}/${PV}-makefile.template" >${1} \ || die "Failed to create Makefile" } diff --git a/sys-boot/udk/udk-2018-r1.ebuild b/sys-boot/udk/udk-2018-r1.ebuild index 89f40f3e1a5..3ad3971c96a 100644 --- a/sys-boot/udk/udk-2018-r1.ebuild +++ b/sys-boot/udk/udk-2018-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -84,9 +84,9 @@ src_unpack() { } src_configure() { - sed -e "s:^\(BUILD_CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \ - -e "s:^\(BUILD_LFLAGS\s*=\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(BUILD_CXXFLAGS\s*=\).*$:\1 ${CXXFLAGS} -Wno-unused-result:" \ + sed -e "s|^\(BUILD_CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \ + -e "s|^\(BUILD_LFLAGS\s*=\).*$|\1 ${LDFLAGS}|" \ + -e "s|^\(BUILD_CXXFLAGS\s*=\).*$|\1 ${CXXFLAGS} -Wno-unused-result|" \ -i "BaseTools/Source/C/Makefiles/header.makefile" \ || die "Failed to update makefile header" } @@ -103,11 +103,11 @@ src_compile() { emake "${make_flags[@]}" -j1 -C BaseTools # Update template parameter files - sed -e "s:^\(ACTIVE_PLATFORM\s*=\).*$:\1 MdeModulePkg/MdeModulePkg.dsc:" \ - -e "s:^\(TARGET\s*=\).*$:\1 RELEASE:" \ - -e "s:^\(TARGET_ARCH\s*=\).*$:\1 ${EFIARCH}:" \ - -e "s:^\(TOOL_CHAIN_TAG\s*=\).*$:\1 ${TOOLCHAIN_TAG}:" \ - -e "s:^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \ + sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \ + -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \ + -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${EFIARCH}|" \ + -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \ + -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \ -i "BaseTools/Conf/target.template" || die "Failed to configure target file" # Clean unneeded files @@ -118,7 +118,7 @@ src_compile() { rm "${S}/EmulatorPkg/Unix/Host/X11IncludeHack" || die # Create workspace script file - sed -e "s:{EDK_BASE}:${EPREFIX}/usr/lib/${P}:" \ + sed -e "s|{EDK_BASE}|${EPREFIX}/usr/lib/${P}|" \ "${FILESDIR}"/udk-workspace.template \ > "${T}/udk-workspace" || die "Failed to build udk-workspace" }