Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/udk/
Date: Thu, 30 Apr 2020 12:00:35
Message-Id: 1588247996.2fa93f1257ee4c9727b8398fe76467a416961e91.juippis@gentoo
1 commit: 2fa93f1257ee4c9727b8398fe76467a416961e91
2 Author: Stéphane Veyret <stephane <AT> neptura <DOT> org>
3 AuthorDate: Wed Apr 29 16:40:40 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 30 11:59:56 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa93f12
7
8 sys-boot/udk: Remove colon from sed
9
10 Closes: https://bugs.gentoo.org/710816
11 Signed-off-by: Stéphane Veyret <stephane <AT> neptura.org>
12 Closes: https://github.com/gentoo/gentoo/pull/15568
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 sys-boot/udk/udk-2015-r1.ebuild | 54 ++++++++++++++++++++---------------------
16 sys-boot/udk/udk-2018-r1.ebuild | 20 +++++++--------
17 2 files changed, 37 insertions(+), 37 deletions(-)
18
19 diff --git a/sys-boot/udk/udk-2015-r1.ebuild b/sys-boot/udk/udk-2015-r1.ebuild
20 index ec568865288..0e6388c5e43 100644
21 --- a/sys-boot/udk/udk-2015-r1.ebuild
22 +++ b/sys-boot/udk/udk-2015-r1.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 +# Copyright 1999-2020 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=7
29 @@ -80,7 +80,7 @@ src_configure() {
30 || die "Failed to patch source file"
31 # Compile of Base Tools is required for further setting up the environment
32 # Base tools does not like parallel make
33 - sed -e "s:^\(CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \
34 + sed -e "s|^\(CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
35 -i "${S}/BaseTools/Source/C/Makefiles/header.makefile" \
36 || die "Failed to update makefile header"
37 local make_flags=(
38 @@ -105,17 +105,17 @@ src_configure() {
39 else
40 append-cflags $(test-flags-CC -m32) $(test-flags-CC -malign-double)
41 fi
42 - sed -e "s:^\(ACTIVE_PLATFORM\s*=\).*$:\1 MdeModulePkg/MdeModulePkg.dsc:" \
43 - -e "s:^\(TARGET\s*=\).*$:\1 RELEASE:" \
44 - -e "s:^\(TARGET_ARCH\s*=\).*$:\1 ${ARCH}:" \
45 - -e "s:^\(TOOL_CHAIN_TAG\s*=\).*$:\1 ${TOOLCHAIN_TAG}:" \
46 - -e "s:^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
47 + sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
48 + -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
49 + -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${ARCH}|" \
50 + -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
51 + -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
52 -i "${S}/Conf/target.txt" || die "Failed to configure target file"
53 - sed -e "s:«CC»:$(tc-getCC):" \
54 - -e "s:«AR»:$(tc-getAR):" \
55 - -e "s:«LD»:$(tc-getLD):" \
56 - -e "s:«OBJCOPY»:$(tc-getOBJCOPY):" \
57 - -e "s:«CFLAGS»:${CFLAGS}:" \
58 + sed -e "s|«CC»|$(tc-getCC)|" \
59 + -e "s|«AR»|$(tc-getAR)|" \
60 + -e "s|«LD»|$(tc-getLD)|" \
61 + -e "s|«OBJCOPY»|$(tc-getOBJCOPY)|" \
62 + -e "s|«CFLAGS»|${CFLAGS}|" \
63 "${FILESDIR}/${PV}-tools_def.template" >>"${S}/Conf/tools_def.txt" \
64 || die "Failed to prepare tools definition file"
65 }
66 @@ -181,23 +181,23 @@ copySourceFiles() {
67 # 3 - Path of the generated Makefile.
68 createMakefile() {
69 local static_libs=$(sed -n '/^STATIC_LIBRARY_FILES\s*=/,/^\s*\$(OUTPUT_DIR)/{/^\s*\$(OUTPUT_DIR)/b;p}' ${3} \
70 - | sed -e 's:^\s*\$(BIN_DIR).*/\([^/]*\)\.lib:\t-l\1:' -e 's:\\$:\\\\\\n:' | tr --delete '\n')
71 + | sed -e 's|^\s*\$(BIN_DIR).*/\([^/]*\)\.lib|\t-l\1|' -e 's|\\$|\\\\\\n|' | tr --delete '\n')
72 local pecoff_header_size;
73 [[ $ARCH == X64 ]] && pecoff_header_size='0x228' || pecoff_header_size='0x220'
74 - sed -e "s:«MODULE»:${2}:" \
75 - -e "s:«PACKAGE_NAME»:${PN}:" \
76 - -e "s:«STATIC_LIBS»:${static_libs}:" \
77 - -e "s:«MODULE_TYPE»:$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1):" \
78 - -e "s:«IMAGE_ENTRY_POINT»:$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3}):" \
79 - -e "s:«CP»:$(grep -e '^CP\s*=' ${3}):" \
80 - -e "s:«RM»:$(grep -e '^RM\s*=' ${3}):" \
81 - -e "s:«CC»:$(grep -e '^CC\s*=' ${3}):" \
82 - -e "s:«DLINK»:$(grep -e '^DLINK\s*=' ${3}):" \
83 - -e "s:«OBJCOPY»:$(grep -e '^OBJCOPY\s*=' ${3}):" \
84 - -e "s:«GENFW»:$(grep -e '^GENFW\s*=' ${3}):" \
85 - -e "s:«PECOFF_HEADER_SIZE»:${pecoff_header_size}:" \
86 - -e "s:«OBJCOPY_FLAGS»:$(grep -e '^OBJCOPY_FLAGS\s*=' ${3}):" \
87 - -e "s:«GENFW_FLAGS»:$(grep -e '^GENFW_FLAGS\s*=' ${3}):" \
88 + sed -e "s|«MODULE»|${2}|" \
89 + -e "s|«PACKAGE_NAME»|${PN}|" \
90 + -e "s|«STATIC_LIBS»|${static_libs}|" \
91 + -e "s|«MODULE_TYPE»|$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1)|" \
92 + -e "s|«IMAGE_ENTRY_POINT»|$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3})|" \
93 + -e "s|«CP»|$(grep -e '^CP\s*=' ${3})|" \
94 + -e "s|«RM»|$(grep -e '^RM\s*=' ${3})|" \
95 + -e "s|«CC»|$(grep -e '^CC\s*=' ${3})|" \
96 + -e "s|«DLINK»|$(grep -e '^DLINK\s*=' ${3})|" \
97 + -e "s|«OBJCOPY»|$(grep -e '^OBJCOPY\s*=' ${3})|" \
98 + -e "s|«GENFW»|$(grep -e '^GENFW\s*=' ${3})|" \
99 + -e "s|«PECOFF_HEADER_SIZE»|${pecoff_header_size}|" \
100 + -e "s|«OBJCOPY_FLAGS»|$(grep -e '^OBJCOPY_FLAGS\s*=' ${3})|" \
101 + -e "s|«GENFW_FLAGS»|$(grep -e '^GENFW_FLAGS\s*=' ${3})|" \
102 "${FILESDIR}/${PV}-makefile.template" >${1} \
103 || die "Failed to create Makefile"
104 }
105
106 diff --git a/sys-boot/udk/udk-2018-r1.ebuild b/sys-boot/udk/udk-2018-r1.ebuild
107 index 89f40f3e1a5..3ad3971c96a 100644
108 --- a/sys-boot/udk/udk-2018-r1.ebuild
109 +++ b/sys-boot/udk/udk-2018-r1.ebuild
110 @@ -1,4 +1,4 @@
111 -# Copyright 1999-2019 Gentoo Authors
112 +# Copyright 1999-2020 Gentoo Authors
113 # Distributed under the terms of the GNU General Public License v2
114
115 EAPI=7
116 @@ -84,9 +84,9 @@ src_unpack() {
117 }
118
119 src_configure() {
120 - sed -e "s:^\(BUILD_CFLAGS\s*=\).*$:\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC:" \
121 - -e "s:^\(BUILD_LFLAGS\s*=\).*$:\1 ${LDFLAGS}:" \
122 - -e "s:^\(BUILD_CXXFLAGS\s*=\).*$:\1 ${CXXFLAGS} -Wno-unused-result:" \
123 + sed -e "s|^\(BUILD_CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
124 + -e "s|^\(BUILD_LFLAGS\s*=\).*$|\1 ${LDFLAGS}|" \
125 + -e "s|^\(BUILD_CXXFLAGS\s*=\).*$|\1 ${CXXFLAGS} -Wno-unused-result|" \
126 -i "BaseTools/Source/C/Makefiles/header.makefile" \
127 || die "Failed to update makefile header"
128 }
129 @@ -103,11 +103,11 @@ src_compile() {
130 emake "${make_flags[@]}" -j1 -C BaseTools
131
132 # Update template parameter files
133 - sed -e "s:^\(ACTIVE_PLATFORM\s*=\).*$:\1 MdeModulePkg/MdeModulePkg.dsc:" \
134 - -e "s:^\(TARGET\s*=\).*$:\1 RELEASE:" \
135 - -e "s:^\(TARGET_ARCH\s*=\).*$:\1 ${EFIARCH}:" \
136 - -e "s:^\(TOOL_CHAIN_TAG\s*=\).*$:\1 ${TOOLCHAIN_TAG}:" \
137 - -e "s:^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
138 + sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
139 + -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
140 + -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${EFIARCH}|" \
141 + -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
142 + -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
143 -i "BaseTools/Conf/target.template" || die "Failed to configure target file"
144
145 # Clean unneeded files
146 @@ -118,7 +118,7 @@ src_compile() {
147 rm "${S}/EmulatorPkg/Unix/Host/X11IncludeHack" || die
148
149 # Create workspace script file
150 - sed -e "s:{EDK_BASE}:${EPREFIX}/usr/lib/${P}:" \
151 + sed -e "s|{EDK_BASE}|${EPREFIX}/usr/lib/${P}|" \
152 "${FILESDIR}"/udk-workspace.template \
153 > "${T}/udk-workspace" || die "Failed to build udk-workspace"
154 }