Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/
Date: Tue, 28 Nov 2017 22:02:52
Message-Id: 1511906541.0d3c305bf0f475af324799516beedb809b15a55b.blueness@gentoo
1 commit: 0d3c305bf0f475af324799516beedb809b15a55b
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 28 22:02:21 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 28 22:02:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3c305b
7
8 sys-libs/uclibc-ng: version bump 1.0.27
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.3
11
12 sys-libs/uclibc-ng/Manifest | 1 +
13 sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild | 410 +++++++++++++++++++++++++++++
14 2 files changed, 411 insertions(+)
15
16 diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
17 index da52614c3ad..ed8e9dcd9cc 100644
18 --- a/sys-libs/uclibc-ng/Manifest
19 +++ b/sys-libs/uclibc-ng/Manifest
20 @@ -5,3 +5,4 @@ DIST uClibc-ng-1.0.23.tar.bz2 2350186 SHA256 3eeb53a2aa5a32f455fb9d197f7b598f2ff
21 DIST uClibc-ng-1.0.24.tar.bz2 2299126 SHA256 d7a3ddc0af8f750abd74e2f677664faafd491f40b62ae0676957e411ca203782 SHA512 4d25035f2355a2b5549fa89cdd7754fc20c6a5a1001a06a81ee47de18855db368e412eb10e38dcbe2e364d3108cefe50029379a3e222972ceced3b693f4ffcc4 WHIRLPOOL 05932258636f041ee12ca2aeec332098e4f61fff92f055a30d024fe7cc953014b93b0ba231cdca2bc0a600e526155734266a71f2f95135dfa305b984f2f2bcd5
22 DIST uClibc-ng-1.0.25.tar.bz2 2234505 SHA256 e20d4a2c78cd76554747e58f35220301afb0fb600ed18f8c9096c98179120a8b SHA512 3bc5e3f0626a529a688e56649b34c48d0ddf733c09279c84fad0954880aa7c0ec3440664811196d11bbc3f05cbea99f3ba47efaad7f315a55ba3d8d587d3b313 WHIRLPOOL f422d05e1d9aa6ae0ecfc0b7808dd115614877d5a602effdc815123e61808b43558c9a9a530ef4ef918bbd5793bb77eb690660f563bc1f97120cc2a3c0b3650b
23 DIST uClibc-ng-1.0.26.tar.bz2 2285709 SHA256 899e2ae37ba9266d20fc2bf290cece484455555b284140b6442c24a24cddb909 SHA512 48c37ab2000af13848ef007ce89f226bded5188f37839c11371bab48497670d30d39fda2a031c6aff95f429a4abadc431ddd77c0e023810a341e2c2d2645f71b WHIRLPOOL 32527dde77f30d1394271978e311fdc6ed69ef47b65d00f19efdf37b700a2dca4e6fc5b126c4cfa05321baf2a47fa1335d8d1843991e78eb1d44f4bfe032f818
24 +DIST uClibc-ng-1.0.27.tar.bz2 2306274 BLAKE2B 64ad0634ca548960ad3ff003d98981853b0658cad75fcf3b7391b5b965656dc15daa06ae312ca34672caa47a2a3e33fbe6291c94df10547eef5dc395c2cbd0cc SHA512 bf8f56f75465f7b793e0356df495a00a41ed2478ea90e8d686e8591dcb1bb75be27fadedd8adf2494f5053ceefa4b0ba2223758efa2a920ea0f55bf104e433a2
25
26 diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild
27 new file mode 100644
28 index 00000000000..3cd7177086e
29 --- /dev/null
30 +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild
31 @@ -0,0 +1,410 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI="6"
36 +
37 +inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
38 +
39 +if [[ ${PV} == "9999" ]] ; then
40 + EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
41 + inherit git-r3
42 + MY_P=uclibc-ng-${PV}
43 +else
44 + MY_P=uClibc-ng-${PV}
45 +fi
46 +
47 +DESCRIPTION="C library for developing embedded Linux systems"
48 +HOMEPAGE="http://www.uclibc-ng.org/"
49 +if [[ ${PV} != "9999" ]] ; then
50 + PATCH_VER=""
51 + SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
52 + KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
53 +fi
54 +
55 +LICENSE="LGPL-2"
56 +SLOT="0"
57 +IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only"
58 +RESTRICT="strip"
59 +
60 +# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
61 +# will delete the ld.so sym link prematurely and break the system. So we
62 +# will hard block and give manual migration instructions.
63 +# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using
64 +# the breakout library. The disadvantage here is that we have to sprinkle
65 +# LDFAGS=-liconv on build systems that need to link against libiconv.
66 +RDEPEND="
67 + !!sys-libs/uclibc
68 + iconv? ( dev-libs/libiconv )"
69 +
70 +S=${WORKDIR}/${MY_P}
71 +
72 +export CBUILD=${CBUILD:-${CHOST}}
73 +export CTARGET=${CTARGET:-${CHOST}}
74 +if [[ ${CHOST} == ${CTARGET} ]] ; then
75 + if [[ ${CATEGORY} == cross-* ]] ; then
76 + export CTARGET=${CATEGORY#cross-}
77 + fi
78 +fi
79 +
80 +is_crosscompile() {
81 + [[ ${CHOST} != ${CTARGET} ]]
82 +}
83 +
84 +alt_build_kprefix() {
85 + if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then
86 + echo /usr/include
87 + else
88 + echo /usr/${CTARGET}/usr/include
89 + fi
90 +}
91 +
92 +just_headers() {
93 + use crosscompile_opts_headers-only && is_crosscompile
94 +}
95 +
96 +uclibc_endian() {
97 + # XXX: this wont work for a toolchain which is bi-endian, but we
98 + # dont have any such thing at the moment, so not a big deal
99 + touch "${T}"/endian.s
100 + $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
101 + case $(file "${T}"/endian.o) in
102 + *" MSB "*) echo "BIG";;
103 + *" LSB "*) echo "LITTLE";;
104 + *) echo "NFC";;
105 + esac
106 + rm -f "${T}"/endian.{s,o}
107 +}
108 +
109 +kconfig_q_opt() {
110 + local flag=$1; shift
111 + case ${flag} in
112 + y|n) ;;
113 + *) flag=$(usex ${flag} y n) ;;
114 + esac
115 +
116 + local var="defs_${flag}"
117 + eval "${var}+=( $* )"
118 +}
119 +
120 +get_opt() {
121 + (
122 + unset ${1}
123 + . ${2:-"${S}"/.config}
124 + echo ${!1}
125 + )
126 +}
127 +
128 +make_oldconfig() {
129 + yes "" 2>/dev/null | emake -s oldconfig >/dev/null
130 +}
131 +
132 +make_config() {
133 + restore_config .config
134 + if [ -f .config ]; then
135 + make_oldconfig
136 + return 0
137 + else
138 + ewarn "Could not locate user configfile, so we will save a default one"
139 + fi
140 +
141 + emake ARCH=$1 defconfig >/dev/null
142 +
143 + local defs_{y,n}
144 +
145 + # These are forced off
146 + defs_n=(
147 + DOASSERTS
148 + DODEBUG_PT
149 + HAS_NO_THREADS
150 + PROPOLICE_BLOCK_ABRT
151 + SSP_QUICK_CANARY
152 + SUPPORT_LD_DEBUG_EARLY
153 + UCLIBC_HAS_CTYPE_UNSAFE
154 + UCLIBC_HAS_LOCALE
155 + UCLIBC_HAS_SSP_COMPAT
156 + )
157 +
158 + # These are forced on
159 + defs_y=(
160 + COMPAT_ATEXIT
161 + DO_C99_MATH
162 + DO_XSI_MATH
163 + FORCE_SHAREABLE_TEXT_SEGMENTS
164 + LDSO_GNU_HASH_SUPPORT
165 + LDSO_PRELINK_SUPPORT
166 + LDSO_PRELOAD_FILE_SUPPORT
167 + LDSO_RUNPATH_OF_EXECUTABLE
168 + LDSO_STANDALONE_SUPPORT
169 + MALLOC_GLIBC_COMPAT
170 + PROPOLICE_BLOCK_SEGV
171 + PTHREADS_DEBUG_SUPPORT
172 + UCLIBC_HAS_ARC4RANDOM
173 + UCLIBC_HAS_BACKTRACE
174 + UCLIBC_HAS_BSD_RES_CLOSE
175 + UCLIBC_HAS_CONTEXT_FUNCS
176 + UCLIBC_HAS_CTYPE_CHECKED
177 + UCLIBC_HAS_EXTRA_COMPAT_RES_STATE
178 + UCLIBC_HAS_FENV
179 + UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
180 + UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE
181 + UCLIBC_HAS_FOPEN_LARGEFILE_MODE
182 + UCLIBC_HAS_FTS
183 + UCLIBC_HAS_FTW
184 + UCLIBC_HAS_GETPT
185 + UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
186 + UCLIBC_HAS_GLIBC_CUSTOM_STREAMS
187 + UCLIBC_HAS_GNU_GLOB
188 + UCLIBC_HAS_HEXADECIMAL_FLOATS
189 + UCLIBC_HAS_LIBNSL_STUB
190 + UCLIBC_HAS_LIBRESOLV_STUB
191 + UCLIBC_HAS_LIBUTIL
192 + UCLIBC_HAS_NFTW
193 + UCLIBC_HAS_OBSOLETE_BSD_SIGNAL
194 + UCLIBC_HAS_OBSTACK
195 + UCLIBC_HAS_PRINTF_M_SPEC
196 + UCLIBC_HAS_PROGRAM_INVOCATION_NAME
197 + UCLIBC_HAS_RESOLVER_SUPPORT
198 + UCLIBC_HAS_SHA256_CRYPT_IMPL
199 + UCLIBC_HAS_SHA512_CRYPT_IMPL
200 + UCLIBC_HAS_SSP
201 + UCLIBC_HAS_STUBS
202 + UCLIBC_HAS_SYS_ERRLIST
203 + UCLIBC_HAS_SYS_SIGLIST
204 + UCLIBC_HAS_THREADS_NATIVE
205 + UCLIBC_HAS_TZ_FILE_READ_MANY
206 + UCLIBC_HAS_UTMP
207 + UCLIBC_HAS_UTMPX
208 + UCLIBC_HAS_WCHAR
209 + UCLIBC_HAS_WORDEXP
210 + UCLIBC_NTP_LEGACY
211 + UCLIBC_SUPPORT_AI_ADDRCONFIG
212 + UCLIBC_SUSV2_LEGACY
213 + UCLIBC_SUSV3_LEGACY
214 + UCLIBC_SUSV3_LEGACY_MACROS
215 + UCLIBC_SUSV4_LEGACY
216 + UCLIBC_USE_NETLINK
217 + )
218 +
219 + sed -i -e '/ARCH_.*_ENDIAN/d' .config
220 + kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
221 +
222 + kconfig_q_opt debug DODEBUG
223 + kconfig_q_opt debug SUPPORT_LD_DEBUG
224 + kconfig_q_opt debug UCLIBC_HAS_PROFILING
225 +
226 + kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
227 +
228 + kconfig_q_opt rpc UCLIBC_HAS_RPC
229 + kconfig_q_opt rpc UCLIBC_HAS_FULL_RPC
230 + kconfig_q_opt rpc UCLIBC_HAS_REENTRANT_RPC
231 +
232 + kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK
233 + kconfig_q_opt hardened UCLIBC_BUILD_NOW
234 + kconfig_q_opt hardened UCLIBC_BUILD_PIE
235 + kconfig_q_opt hardened UCLIBC_BUILD_RELRO
236 + kconfig_q_opt hardened UCLIBC_BUILD_SSP
237 +
238 + local count def
239 + for count in 1 2 ; do
240 + # Run twice as some config opts depend on others being enabled first.
241 + for def in ${defs_y[@]} ; do
242 + sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config
243 + done
244 + for def in ${defs_n[@]} ; do
245 + sed -i -e "s|${def}=y|# ${def} is not set|g" .config
246 + done
247 + make_oldconfig
248 + done
249 +
250 + einfo "Enabled options:"
251 + for def in ${defs_y[@]} ; do
252 + einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
253 + done
254 + einfo "Disabled options:"
255 + for def in ${defs_n[@]} ; do
256 + einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
257 + done
258 +
259 + # setup build and run paths
260 + sed -i \
261 + -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \
262 + -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \
263 + -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \
264 + -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \
265 + -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \
266 + -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \
267 + .config || die
268 +
269 + make_oldconfig
270 +}
271 +
272 +pkg_setup() {
273 + # Make sure our CHOST is a uclibc toolchain for native compiling
274 + if [[ ${CHOST} == ${CTARGET} ]]; then
275 + case ${CHOST} in
276 + *-uclinux*|*-uclibc*) ;;
277 + *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
278 + esac
279 + fi
280 +
281 + # uClibc-ng doesn't carry old Linux threads, and since we force
282 + # threading our only choice is NPTL which requires i486 and later.
283 + [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)."
284 +}
285 +
286 +src_prepare() {
287 + local version subversion extraversion
288 +
289 + # uclibc-ng tries to create a two sym link with ld.so,
290 + # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
291 + # where MAJOR_VERSION != 0 indicates the ABI verison.
292 + # We want to get rid of this and just have ABI = 0.
293 + eapply "${FILESDIR}"/uclibc-compat-r1.patch
294 +
295 + # We need to change the major.minor.sublevel of uclibc-ng.
296 + # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
297 + # If we really want the ABI bump, we'll have to hack the gcc
298 + # spec file and change the '*link:' rule.
299 + version=( $(get_version_components) )
300 + if [[ -z ${version[1]} ]]; then
301 + subversion=0
302 + extraversion=0
303 + else
304 + subversion=${version[1]}
305 + if [[ -z ${version[2]} ]]; then
306 + extraversion=0
307 + else
308 + extraversion=.${version[2]}
309 + fi
310 + fi
311 +
312 + sed -i \
313 + -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
314 + -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
315 + -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
316 + -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
317 + Rules.mak || die
318 +
319 + eapply_user
320 +}
321 +
322 +src_configure() {
323 + # Map our toolchain arch name to the name expected by uClibc-ng.
324 + local target=$(tc-arch)
325 + case ${target} in
326 + amd64) target="x86_64";;
327 + arm) target="arm";;
328 + mips) target="mips";;
329 + ppc) target="powerpc";;
330 + x86) target="i386";;
331 + esac
332 +
333 + # Do arch specific configuration by changing the defaults in
334 + # extra/Configs/Config.<arch>. If these are not overridden
335 + # by an save .config, they will be selected by default.
336 +
337 + # For i386, i486, i586 and i686
338 + local cpu
339 + if [[ ${target} == "i386" ]]; then
340 + [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86"
341 + sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \
342 + extra/Configs/Config.i386 || die
343 + fi
344 +
345 + # For arm
346 + if [[ ${target} == "arm" ]]; then
347 + sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm
348 + fi
349 +
350 + # We set HOSTCC to the proper tuple rather than just 'gcc'
351 + sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak
352 +
353 + make_config ${target}
354 +
355 + einfo
356 + einfo "Runtime Prefix: /"
357 + einfo "Devel Prefix: /usr"
358 + einfo "Kernel Prefix: $(alt_build_kprefix)"
359 + einfo "CBUILD: ${CBUILD}"
360 + einfo "CHOST: ${CHOST}"
361 + einfo "CTARGET: ${CTARGET}"
362 + einfo "ABI: ${ABI}"
363 + einfo "ENDIAN: $(uclibc_endian)"
364 + einfo
365 +}
366 +
367 +src_compile() {
368 + emake headers
369 + just_headers && return 0
370 +
371 + emake
372 + if is_crosscompile ; then
373 + emake -C utils hostutils
374 + else
375 + emake utils
376 + fi
377 +}
378 +
379 +src_test() {
380 + is_crosscompile && return 0
381 +
382 + # assert test fails on pax/grsec enabled kernels
383 + # normal vfork test fails in sandbox (both glibc/uclibc)
384 + emake UCLIBC_ONLY=1 check
385 +}
386 +
387 +src_install() {
388 + local sysroot=${D}
389 + is_crosscompile && sysroot+="/usr/${CTARGET}"
390 +
391 + local target="install"
392 + just_headers && target="install_headers"
393 + emake DESTDIR="${sysroot}" ${target}
394 +
395 + save_config .config
396 +
397 + # remove files coming from kernel-headers
398 + rm -rf "${sysroot}"/usr/include/{linux,asm*}
399 +
400 + # Make sure we install the sys-include symlink so that when
401 + # we build a 2nd stage cross-compiler, gcc finds the target
402 + # system headers correctly. See gcc/doc/gccinstall.info
403 + if is_crosscompile ; then
404 + dosym usr/include /usr/${CTARGET}/sys-include
405 + if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
406 + newbin utils/ldconfig.host ${CTARGET}-ldconfig
407 + newbin utils/ldd.host ${CTARGET}-ldd
408 + fi
409 + return 0
410 + fi
411 +
412 + if use symlink-compat; then
413 + dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0
414 + dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0
415 + dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0
416 + dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0
417 + dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0
418 + dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0
419 + dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0
420 + dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0
421 + fi
422 +
423 + emake DESTDIR="${D}" install_utils
424 + dobin extra/scripts/getent
425 + dodoc README docs/*.txt
426 +}
427 +
428 +pkg_postinst() {
429 + is_crosscompile && return 0
430 +
431 + if [ ! -e "${ROOT}"/etc/TZ ] ; then
432 + ewarn "Please remember to set your timezone in /etc/TZ"
433 + mkdir -p "${ROOT}"/etc
434 + echo "UTC" > "${ROOT}"/etc/TZ
435 + fi
436 + [ "${ROOT}" != "/" ] && return 0
437 + # update cache before reloading init
438 + ldconfig
439 + # reload init ...
440 + /sbin/telinit U 2>/dev/null
441 +}