* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/files/, sys-libs/uclibc-ng/
@ 2017-05-22 14:32 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2017-05-22 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 7e05387894905203abef04bac72fde7c3003df94
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 14:31:52 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 22 14:32:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e053878
sys-libs/uclibc-ng: fix bug #619190
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../files/uclibc-ng-update-reboot_h.patch | 41 ++
sys-libs/uclibc-ng/uclibc-ng-1.0.24-r1.ebuild | 412 +++++++++++++++++++++
2 files changed, 453 insertions(+)
diff --git a/sys-libs/uclibc-ng/files/uclibc-ng-update-reboot_h.patch b/sys-libs/uclibc-ng/files/uclibc-ng-update-reboot_h.patch
new file mode 100644
index 00000000000..70d7d709b62
--- /dev/null
+++ b/sys-libs/uclibc-ng/files/uclibc-ng-update-reboot_h.patch
@@ -0,0 +1,41 @@
+From 5a305695ad09696bc27c1928deedabbc9e93da55 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Mon, 22 May 2017 09:57:27 -0400
+Subject: [PATCH] include/sys/reboot.h: add constants RB_SW_SUSPEND and
+ RB_KEXEC
+
+This syncs up <sys/reboot.h> with the GNU C library, see their
+commit 1a09dc56. These constants are needed by init systems like
+openrc.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ include/sys/reboot.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/include/sys/reboot.h b/include/sys/reboot.h
+index bc685aebb..fafd2fb0c 100644
+--- a/include/sys/reboot.h
++++ b/include/sys/reboot.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -38,6 +38,12 @@
+ /* Stop system and switch power off if possible. */
+ #define RB_POWER_OFF 0x4321fedc
+
++/* Suspend system using software suspend. */
++#define RB_SW_SUSPEND 0xd000fce2
++
++/* Reboot system into new kernel. */
++#define RB_KEXEC 0x45584543
++
+ __BEGIN_DECLS
+
+ /* Reboot or halt the system. */
+--
+2.13.0
+
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.24-r1.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.24-r1.ebuild
new file mode 100644
index 00000000000..de763355387
--- /dev/null
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.24-r1.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
+ inherit git-r3
+ MY_P=uclibc-ng-${PV}
+else
+ MY_P=uClibc-ng-${PV}
+fi
+
+DESCRIPTION="C library for developing embedded Linux systems"
+HOMEPAGE="http://www.uclibc-ng.org/"
+if [[ ${PV} != "9999" ]] ; then
+ PATCH_VER=""
+ SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
+ #KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
+# will delete the ld.so sym link prematurely and break the system. So we
+# will hard block and give manual migration instructions.
+# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using
+# the breakout library. The disadvantage here is that we have to sprinkle
+# LDFAGS=-liconv on build systems that need to link against libiconv.
+RDEPEND="
+ !!sys-libs/uclibc
+ iconv? ( dev-libs/libiconv )"
+
+S=${WORKDIR}/${MY_P}
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CHOST} == ${CTARGET} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+alt_build_kprefix() {
+ if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then
+ echo /usr/include
+ else
+ echo /usr/${CTARGET}/usr/include
+ fi
+}
+
+just_headers() {
+ use crosscompile_opts_headers-only && is_crosscompile
+}
+
+uclibc_endian() {
+ # XXX: this wont work for a toolchain which is bi-endian, but we
+ # dont have any such thing at the moment, so not a big deal
+ touch "${T}"/endian.s
+ $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+ case $(file "${T}"/endian.o) in
+ *" MSB "*) echo "BIG";;
+ *" LSB "*) echo "LITTLE";;
+ *) echo "NFC";;
+ esac
+ rm -f "${T}"/endian.{s,o}
+}
+
+kconfig_q_opt() {
+ local flag=$1; shift
+ case ${flag} in
+ y|n) ;;
+ *) flag=$(usex ${flag} y n) ;;
+ esac
+
+ local var="defs_${flag}"
+ eval "${var}+=( $* )"
+}
+
+get_opt() {
+ (
+ unset ${1}
+ . ${2:-"${S}"/.config}
+ echo ${!1}
+ )
+}
+
+make_oldconfig() {
+ yes "" 2>/dev/null | emake -s oldconfig >/dev/null
+}
+
+make_config() {
+ restore_config .config
+ if [ -f .config ]; then
+ make_oldconfig
+ return 0
+ else
+ ewarn "Could not locate user configfile, so we will save a default one"
+ fi
+
+ emake ARCH=$1 defconfig >/dev/null
+
+ local defs_{y,n}
+
+ # These are forced off
+ defs_n=(
+ DOASSERTS
+ DODEBUG_PT
+ HAS_NO_THREADS
+ PROPOLICE_BLOCK_ABRT
+ SSP_QUICK_CANARY
+ SUPPORT_LD_DEBUG_EARLY
+ UCLIBC_HAS_CTYPE_UNSAFE
+ UCLIBC_HAS_LOCALE
+ UCLIBC_HAS_SSP_COMPAT
+ )
+
+ # These are forced on
+ defs_y=(
+ COMPAT_ATEXIT
+ DO_C99_MATH
+ DO_XSI_MATH
+ FORCE_SHAREABLE_TEXT_SEGMENTS
+ LDSO_GNU_HASH_SUPPORT
+ LDSO_PRELINK_SUPPORT
+ LDSO_PRELOAD_FILE_SUPPORT
+ LDSO_RUNPATH_OF_EXECUTABLE
+ LDSO_STANDALONE_SUPPORT
+ MALLOC_GLIBC_COMPAT
+ PROPOLICE_BLOCK_SEGV
+ PTHREADS_DEBUG_SUPPORT
+ UCLIBC_HAS_ARC4RANDOM
+ UCLIBC_HAS_BACKTRACE
+ UCLIBC_HAS_BSD_RES_CLOSE
+ UCLIBC_HAS_CONTEXT_FUNCS
+ UCLIBC_HAS_CTYPE_CHECKED
+ UCLIBC_HAS_EXTRA_COMPAT_RES_STATE
+ UCLIBC_HAS_FENV
+ UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
+ UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE
+ UCLIBC_HAS_FOPEN_LARGEFILE_MODE
+ UCLIBC_HAS_FTS
+ UCLIBC_HAS_FTW
+ UCLIBC_HAS_GETPT
+ UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
+ UCLIBC_HAS_GLIBC_CUSTOM_STREAMS
+ UCLIBC_HAS_GNU_GLOB
+ UCLIBC_HAS_HEXADECIMAL_FLOATS
+ UCLIBC_HAS_LIBNSL_STUB
+ UCLIBC_HAS_LIBRESOLV_STUB
+ UCLIBC_HAS_LIBUTIL
+ UCLIBC_HAS_NFTW
+ UCLIBC_HAS_OBSOLETE_BSD_SIGNAL
+ UCLIBC_HAS_OBSTACK
+ UCLIBC_HAS_PRINTF_M_SPEC
+ UCLIBC_HAS_PROGRAM_INVOCATION_NAME
+ UCLIBC_HAS_RESOLVER_SUPPORT
+ UCLIBC_HAS_SHA256_CRYPT_IMPL
+ UCLIBC_HAS_SHA512_CRYPT_IMPL
+ UCLIBC_HAS_SSP
+ UCLIBC_HAS_STUBS
+ UCLIBC_HAS_SYS_ERRLIST
+ UCLIBC_HAS_SYS_SIGLIST
+ UCLIBC_HAS_THREADS_NATIVE
+ UCLIBC_HAS_TZ_FILE_READ_MANY
+ UCLIBC_HAS_UTMP
+ UCLIBC_HAS_UTMPX
+ UCLIBC_HAS_WCHAR
+ UCLIBC_HAS_WORDEXP
+ UCLIBC_NTP_LEGACY
+ UCLIBC_SUPPORT_AI_ADDRCONFIG
+ UCLIBC_SUSV2_LEGACY
+ UCLIBC_SUSV3_LEGACY
+ UCLIBC_SUSV3_LEGACY_MACROS
+ UCLIBC_SUSV4_LEGACY
+ UCLIBC_USE_NETLINK
+ )
+
+ sed -i -e '/ARCH_.*_ENDIAN/d' .config
+ kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
+
+ kconfig_q_opt debug DODEBUG
+ kconfig_q_opt debug SUPPORT_LD_DEBUG
+ kconfig_q_opt debug UCLIBC_HAS_PROFILING
+
+ kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
+
+ kconfig_q_opt rpc UCLIBC_HAS_RPC
+ kconfig_q_opt rpc UCLIBC_HAS_FULL_RPC
+ kconfig_q_opt rpc UCLIBC_HAS_REENTRANT_RPC
+
+ kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK
+ kconfig_q_opt hardened UCLIBC_BUILD_NOW
+ kconfig_q_opt hardened UCLIBC_BUILD_PIE
+ kconfig_q_opt hardened UCLIBC_BUILD_RELRO
+ kconfig_q_opt hardened UCLIBC_BUILD_SSP
+
+ local count def
+ for count in 1 2 ; do
+ # Run twice as some config opts depend on others being enabled first.
+ for def in ${defs_y[@]} ; do
+ sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config
+ done
+ for def in ${defs_n[@]} ; do
+ sed -i -e "s|${def}=y|# ${def} is not set|g" .config
+ done
+ make_oldconfig
+ done
+
+ einfo "Enabled options:"
+ for def in ${defs_y[@]} ; do
+ einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
+ done
+ einfo "Disabled options:"
+ for def in ${defs_n[@]} ; do
+ einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
+ done
+
+ # setup build and run paths
+ sed -i \
+ -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \
+ -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \
+ -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \
+ -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \
+ -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \
+ -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \
+ .config || die
+
+ make_oldconfig
+}
+
+pkg_setup() {
+ # Make sure our CHOST is a uclibc toolchain for native compiling
+ if [[ ${CHOST} == ${CTARGET} ]]; then
+ case ${CHOST} in
+ *-uclinux*|*-uclibc*) ;;
+ *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
+ esac
+ fi
+
+ # uClibc-ng doesn't carry old Linux threads, and since we force
+ # threading our only choice is NPTL which requires i486 and later.
+ [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)."
+}
+
+src_prepare() {
+ local version subversion extraversion
+
+ # uclibc-ng tries to create a two sym link with ld.so,
+ # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-<version>.so
+ # where MAJOR_VERSION != 0 indicates the ABI verison.
+ # We want to get rid of this and just have ABI = 0.
+ eapply "${FILESDIR}"/uclibc-compat-r1.patch
+ eapply "${FILESDIR}"/${PN}-update-reboot_h.patch
+
+ # We need to change the major.minor.sublevel of uclibc-ng.
+ # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
+ # If we really want the ABI bump, we'll have to hack the gcc
+ # spec file and change the '*link:' rule.
+ version=( $(get_version_components) )
+ if [[ -z ${version[1]} ]]; then
+ subversion=0
+ extraversion=0
+ else
+ subversion=${version[1]}
+ if [[ -z ${version[2]} ]]; then
+ extraversion=0
+ else
+ extraversion=.${version[2]}
+ fi
+ fi
+
+ sed -i \
+ -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
+ -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+ -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
+ -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
+ Rules.mak || die
+
+ eapply_user
+}
+
+src_configure() {
+ # Map our toolchain arch name to the name expected by uClibc-ng.
+ local target=$(tc-arch)
+ case ${target} in
+ amd64) target="x86_64";;
+ arm) target="arm";;
+ mips) target="mips";;
+ ppc) target="powerpc";;
+ x86) target="i386";;
+ esac
+
+ # Do arch specific configuration by changing the defaults in
+ # extra/Configs/Config.<arch>. If these are not overridden
+ # by an save .config, they will be selected by default.
+
+ # For i386, i486, i586 and i686
+ local cpu
+ if [[ ${target} == "i386" ]]; then
+ [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86"
+ sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \
+ extra/Configs/Config.i386 || die
+ fi
+
+ # For arm
+ if [[ ${target} == "arm" ]]; then
+ sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm
+ fi
+
+ # We set HOSTCC to the proper tuple rather than just 'gcc'
+ sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak
+
+ make_config ${target}
+
+ einfo
+ einfo "Runtime Prefix: /"
+ einfo "Devel Prefix: /usr"
+ einfo "Kernel Prefix: $(alt_build_kprefix)"
+ einfo "CBUILD: ${CBUILD}"
+ einfo "CHOST: ${CHOST}"
+ einfo "CTARGET: ${CTARGET}"
+ einfo "ABI: ${ABI}"
+ einfo "ENDIAN: $(uclibc_endian)"
+ einfo
+}
+
+src_compile() {
+ emake headers
+ just_headers && return 0
+
+ emake
+ if is_crosscompile ; then
+ emake -C utils hostutils
+ else
+ emake utils
+ fi
+}
+
+src_test() {
+ is_crosscompile && return 0
+
+ # assert test fails on pax/grsec enabled kernels
+ # normal vfork test fails in sandbox (both glibc/uclibc)
+ emake UCLIBC_ONLY=1 check
+}
+
+src_install() {
+ local sysroot=${D}
+ is_crosscompile && sysroot+="/usr/${CTARGET}"
+
+ local target="install"
+ just_headers && target="install_headers"
+ emake DESTDIR="${sysroot}" ${target}
+
+ save_config .config
+
+ # remove files coming from kernel-headers
+ rm -rf "${sysroot}"/usr/include/{linux,asm*}
+
+ # Make sure we install the sys-include symlink so that when
+ # we build a 2nd stage cross-compiler, gcc finds the target
+ # system headers correctly. See gcc/doc/gccinstall.info
+ if is_crosscompile ; then
+ dosym usr/include /usr/${CTARGET}/sys-include
+ if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig
+ newbin utils/ldd.host ${CTARGET}-ldd
+ fi
+ return 0
+ fi
+
+ if use symlink-compat; then
+ dosym libc.so.0 "${DESTDIR}"/lib/libcrypt.so.0
+ dosym libc.so.0 "${DESTDIR}"/lib/libdl.so.0
+ dosym libc.so.0 "${DESTDIR}"/lib/libm.so.0
+ dosym libc.so.0 "${DESTDIR}"/lib/libpthread.so.0
+ dosym libc.so.0 "${DESTDIR}"/lib/librt.so.0
+ dosym libc.so.0 "${DESTDIR}"/lib/libresolv.so.0
+ dosym libc.so.0 "${DESTDIR}"/lib/libubacktrace.so.0
+ dosym libc.so.0 "${DESTDIR}"/lib/libutil.so.0
+ fi
+
+ emake DESTDIR="${D}" install_utils
+ dobin extra/scripts/getent
+ dodoc README docs/*.txt
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ if [ ! -e "${ROOT}"/etc/TZ ] ; then
+ ewarn "Please remember to set your timezone in /etc/TZ"
+ mkdir -p "${ROOT}"/etc
+ echo "UTC" > "${ROOT}"/etc/TZ
+ fi
+ [ "${ROOT}" != "/" ] && return 0
+ # update cache before reloading init
+ ldconfig
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/files/, sys-libs/uclibc-ng/
@ 2018-04-29 19:47 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2018-04-29 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 4fdf45d8786ac98ac9f1240948453594f3460fba
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 19:46:13 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 19:47:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdf45d8
sys-libs/uclibc-ng: fix ld.so.cache on amd64
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/uclibc-ng-1.0.30-fix-ld.so.cache.patch | 48 ++++++++++++++++++++++
...ng-1.0.30.ebuild => uclibc-ng-1.0.30-r1.ebuild} | 3 ++
2 files changed, 51 insertions(+)
diff --git a/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch
new file mode 100644
index 00000000000..6b13e0890d2
--- /dev/null
+++ b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch
@@ -0,0 +1,48 @@
+commit 92d250d387e247029900c9074150f45866b29781
+Author: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun Apr 29 19:34:11 2018 +0200
+
+ Revert "ldconfig: add glibc compatibility fix"
+
+ This reverts commit 2a3bb4daf5778c5875674cd26a3c75b3d460a042.
+
+ This is breaking ld.so.cache usage. Seen on Gentoo/amd64.
+
+ Reported-by: "Anthony G. Basile" <basile@freeharbor.net>
+
+diff --git a/utils/ldconfig.c b/utils/ldconfig.c
+index 58939d689..e6b788118 100644
+--- a/utils/ldconfig.c
++++ b/utils/ldconfig.c
+@@ -184,9 +184,10 @@ static char *readsoname(char *name, FILE *infile, int expected_type,
+ res = readsoname32(name, infile, expected_type, type);
+ else {
+ res = readsoname64(name, infile, expected_type, type);
+-
+- // For 64-bit glibc compatibility
+- *type |= FLAG_X8664_LIB64;
++#if 0
++ /* relies on multilib support which we dont have ... */
++ *type |= LIB_ELF64;
++#endif
+ }
+
+ return res;
+@@ -757,7 +758,7 @@ void cache_print(void)
+
+ for (fd = 0; fd < header->nlibs; fd++) {
+ printf("\t%s ", strs + libent[fd].sooffset);
+- switch (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) {
++ switch (libent[fd].flags & ~LIB_ELF64) {
+ case LIB_DLL:
+ printf("(libc4)");
+ break;
+@@ -770,7 +771,7 @@ void cache_print(void)
+ case LIB_ELF_LIBC5:
+ case LIB_ELF_LIBC6:
+ printf("(libc%d%s)",
+- (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) + 3,
++ (libent[fd].flags & ~LIB_ELF64) + 3,
+ libent[fd].flags & LIB_ELF64 ? "/64" : "");
+ break;
+ default:
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.30.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
similarity index 99%
rename from sys-libs/uclibc-ng/uclibc-ng-1.0.30.ebuild
rename to sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
index 3b31357d804..ca35a2cc5bc 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.30.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
@@ -252,6 +252,9 @@ src_prepare() {
# We want to get rid of this and just have ABI = 0.
eapply "${FILESDIR}"/uclibc-compat-r1.patch
+ # Critical fix for ld.so.cache
+ eapply "${FILESDIR}"/${P}-fix-ld.so.cache.patch
+
# We need to change the major.minor.sublevel of uclibc-ng.
# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
# If we really want the ABI bump, we'll have to hack the gcc
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/files/, sys-libs/uclibc-ng/
@ 2020-01-15 0:31 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2020-01-15 0:31 UTC (permalink / raw
To: gentoo-commits
commit: 632605dca9cd6c3b2b31172f01079871b228d63c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 00:30:22 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 00:30:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632605dc
sys-libs/uclibc-ng: fall back on 1.0.30 for arm
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-libs/uclibc-ng/Manifest | 1 +
.../files/uclibc-ng-1.0.30-fix-ld.so.cache.patch | 48 ++++++++++++++++++++++
...ng-1.0.31.ebuild => uclibc-ng-1.0.30-r1.ebuild} | 7 +++-
sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild | 4 +-
sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild | 2 +-
5 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index de7fae1db80..5d5669a9a97 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -1,2 +1,3 @@
+DIST uClibc-ng-1.0.30.tar.bz2 2302796 BLAKE2B 21888dfe5a68f83b7ba56bb557ecc5aa19fd75cedc82f2ed48073f47655888719feb27943e0309f8101a24fd2fd9165af31d5679f21c00b12f27ebfccf354bac SHA512 ddd1d91dcfdf7be8471afecf13196563ad348c41e2fa8b63ae50b83f103cf8ed8d9f003b51a54a58db2935b84692b7c011a4779582f30610ede44cb583aae742
DIST uClibc-ng-1.0.31.tar.bz2 2351728 BLAKE2B e2cad8500fdafdd98db11cbc756f3277845fedf545598c9861b1d1ef51b3a24744afe635d6894929eb537891323b0627577c2a5e5dbe1ff0ae588c5aa53a1219 SHA512 489e5f5e8952ebfad1d8a5528a04420d9d2e58fa5092029ccdae91d81dfcf8b3e00092453432da94c76fc18cab542192040bfb271e367fa42ca4926f4b45c372
DIST uClibc-ng-1.0.32.tar.bz2 2352471 BLAKE2B 887b67f7f03fc8610d8236a18f90584720a78bfc3a036cd6616453bea6e31140f5fd1dfd1d207cc5100854bf3e0c5cc1ca38fe6c31cf97b631892767ae23ec27 SHA512 1de5d4e99b94eeeada4233c53a95ea1b9e704ce1d4aa19ca9b17535c0328b2372ed93d24591c6ea5bfbc0b950aa575c18dcf6950fb04342924bb2b5f9ee235e8
diff --git a/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch
new file mode 100644
index 00000000000..6b13e0890d2
--- /dev/null
+++ b/sys-libs/uclibc-ng/files/uclibc-ng-1.0.30-fix-ld.so.cache.patch
@@ -0,0 +1,48 @@
+commit 92d250d387e247029900c9074150f45866b29781
+Author: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sun Apr 29 19:34:11 2018 +0200
+
+ Revert "ldconfig: add glibc compatibility fix"
+
+ This reverts commit 2a3bb4daf5778c5875674cd26a3c75b3d460a042.
+
+ This is breaking ld.so.cache usage. Seen on Gentoo/amd64.
+
+ Reported-by: "Anthony G. Basile" <basile@freeharbor.net>
+
+diff --git a/utils/ldconfig.c b/utils/ldconfig.c
+index 58939d689..e6b788118 100644
+--- a/utils/ldconfig.c
++++ b/utils/ldconfig.c
+@@ -184,9 +184,10 @@ static char *readsoname(char *name, FILE *infile, int expected_type,
+ res = readsoname32(name, infile, expected_type, type);
+ else {
+ res = readsoname64(name, infile, expected_type, type);
+-
+- // For 64-bit glibc compatibility
+- *type |= FLAG_X8664_LIB64;
++#if 0
++ /* relies on multilib support which we dont have ... */
++ *type |= LIB_ELF64;
++#endif
+ }
+
+ return res;
+@@ -757,7 +758,7 @@ void cache_print(void)
+
+ for (fd = 0; fd < header->nlibs; fd++) {
+ printf("\t%s ", strs + libent[fd].sooffset);
+- switch (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) {
++ switch (libent[fd].flags & ~LIB_ELF64) {
+ case LIB_DLL:
+ printf("(libc4)");
+ break;
+@@ -770,7 +771,7 @@ void cache_print(void)
+ case LIB_ELF_LIBC5:
+ case LIB_ELF_LIBC6:
+ printf("(libc%d%s)",
+- (libent[fd].flags & ~LIB_ELF64 & FLAG_TYPE_MASK) + 3,
++ (libent[fd].flags & ~LIB_ELF64) + 3,
+ libent[fd].flags & LIB_ELF64 ? "/64" : "");
+ break;
+ default:
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
similarity index 98%
copy from sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
copy to sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
index 36f1b9db8bb..ffc8453e07f 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.30-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
if [[ ${PV} != "9999" ]] ; then
PATCH_VER=""
SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="-* amd64 arm ~mips ppc x86"
+ KEYWORDS="-* ~arm"
fi
LICENSE="LGPL-2"
@@ -253,6 +253,9 @@ src_prepare() {
# We want to get rid of this and just have ABI = 0.
eapply "${FILESDIR}"/uclibc-compat-r1.patch
+ # Critical fix for ld.so.cache
+ eapply "${FILESDIR}"/${P}-fix-ld.so.cache.patch
+
# We need to change the major.minor.sublevel of uclibc-ng.
# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
# If we really want the ABI bump, we'll have to hack the gcc
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
index 36f1b9db8bb..93b0b01a0fc 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
if [[ ${PV} != "9999" ]] ; then
PATCH_VER=""
SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="-* amd64 arm ~mips ppc x86"
+ KEYWORDS="-* amd64 ~mips ppc x86"
fi
LICENSE="LGPL-2"
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
index fae0c97e7b5..82ccf77573e 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.32.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
if [[ ${PV} != "9999" ]] ; then
PATCH_VER=""
SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="-* amd64 -arm ~mips ppc x86"
+ KEYWORDS="-* amd64 ~mips ppc x86"
fi
LICENSE="LGPL-2"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-15 0:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-22 14:32 [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/files/, sys-libs/uclibc-ng/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2018-04-29 19:47 Anthony G. Basile
2020-01-15 0:31 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox