| 1 |
commit: 9fee6768dc4188a51c8f588f2e9d835f111e0989 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 6 23:45:02 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 23:45:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fee6768 |
| 7 |
|
| 8 |
sys-libs/musl: version bump to 1.1.15 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
sys-libs/musl/Manifest | 1 + |
| 13 |
sys-libs/musl/musl-1.1.15.ebuild | 137 +++++++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 138 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest |
| 17 |
index 052ec7f..dac3d77 100644 |
| 18 |
--- a/sys-libs/musl/Manifest |
| 19 |
+++ b/sys-libs/musl/Manifest |
| 20 |
@@ -3,3 +3,4 @@ DIST getent.c 9438 SHA256 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd |
| 21 |
DIST iconv.c 2577 SHA256 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf WHIRLPOOL 8b067d7f3e5b8c9862cf78cf727fa748d9b6b23be518df382251d1e3e0a6eb386b1fd7788ba3b36dadba03aa5b43e25eb25528efcadc74fa543c38a61650c5bc |
| 22 |
DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c |
| 23 |
DIST musl-1.1.14.tar.gz 894971 SHA256 35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5 SHA512 9016246b44a7e6ef51477f0a246373c79f3e796c70031c3323be1b6c4c0518a2d4578f1aa712adfd9a80cdc1d71918bd7a35855052a0452b854755bf0cc2424e WHIRLPOOL e675ed13888021376812c65addf245906bfca00c5291ca5979cb4894cbe72b3a1b69c0fd793bd49f9cef2154131f717b15b52398b43c68fcfb7c5530b1258e72 |
| 24 |
+DIST musl-1.1.15.tar.gz 911600 SHA256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa SHA512 9e923572c0d6bad3dc2d2646d4b0699c10b477ce6300ac6c6224895192a90667f581ddf6eda2ab8c4c16f47bde4bccb03bb90478638d136d9df721430f4d0163 WHIRLPOOL 68c510cf7d4216ccc5775466fa23f76ebecf1658552d613dee523bb7cc3a9f824959fe76355d1ce47326b276bf2657c9b4f3f557d81bf9c1a873f18405ad8ebf |
| 25 |
|
| 26 |
diff --git a/sys-libs/musl/musl-1.1.15.ebuild b/sys-libs/musl/musl-1.1.15.ebuild |
| 27 |
new file mode 100644 |
| 28 |
index 0000000..906de18 |
| 29 |
--- /dev/null |
| 30 |
+++ b/sys-libs/musl/musl-1.1.15.ebuild |
| 31 |
@@ -0,0 +1,137 @@ |
| 32 |
+# Copyright 1999-2016 Gentoo Foundation |
| 33 |
+# Distributed under the terms of the GNU General Public License v2 |
| 34 |
+# $Id$ |
| 35 |
+ |
| 36 |
+EAPI=6 |
| 37 |
+ |
| 38 |
+inherit eutils flag-o-matic multilib toolchain-funcs |
| 39 |
+if [[ ${PV} == "9999" ]] ; then |
| 40 |
+ EGIT_REPO_URI="git://git.musl-libc.org/musl" |
| 41 |
+ inherit git-r3 |
| 42 |
+ SRC_URI=" |
| 43 |
+ http://dev.gentoo.org/~blueness/musl-misc/getconf.c |
| 44 |
+ http://dev.gentoo.org/~blueness/musl-misc/getent.c |
| 45 |
+ http://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
| 46 |
+ KEYWORDS="" |
| 47 |
+else |
| 48 |
+ SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz |
| 49 |
+ http://dev.gentoo.org/~blueness/musl-misc/getconf.c |
| 50 |
+ http://dev.gentoo.org/~blueness/musl-misc/getent.c |
| 51 |
+ http://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
| 52 |
+ KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" |
| 53 |
+fi |
| 54 |
+ |
| 55 |
+export CBUILD=${CBUILD:-${CHOST}} |
| 56 |
+export CTARGET=${CTARGET:-${CHOST}} |
| 57 |
+if [[ ${CTARGET} == ${CHOST} ]] ; then |
| 58 |
+ if [[ ${CATEGORY} == cross-* ]] ; then |
| 59 |
+ export CTARGET=${CATEGORY#cross-} |
| 60 |
+ fi |
| 61 |
+fi |
| 62 |
+ |
| 63 |
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" |
| 64 |
+HOMEPAGE="http://www.musl-libc.org/" |
| 65 |
+LICENSE="MIT LGPL-2 GPL-2" |
| 66 |
+SLOT="0" |
| 67 |
+IUSE="crosscompile_opts_headers-only" |
| 68 |
+ |
| 69 |
+QA_SONAME="/usr/lib/libc.so" |
| 70 |
+QA_DT_NEEDED="/usr/lib/libc.so" |
| 71 |
+ |
| 72 |
+is_crosscompile() { |
| 73 |
+ [[ ${CHOST} != ${CTARGET} ]] |
| 74 |
+} |
| 75 |
+ |
| 76 |
+just_headers() { |
| 77 |
+ use crosscompile_opts_headers-only && is_crosscompile |
| 78 |
+} |
| 79 |
+ |
| 80 |
+musl_endian() { |
| 81 |
+ # XXX: this wont work for bi-endian, but we dont have any |
| 82 |
+ touch "${T}"/endian.s || die |
| 83 |
+ $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o |
| 84 |
+ case $(file "${T}"/endian.o) in |
| 85 |
+ *" MSB "*) echo "";; |
| 86 |
+ *" LSB "*) echo "el";; |
| 87 |
+ *) echo "nfc";; # We shouldn't be here |
| 88 |
+ esac |
| 89 |
+} |
| 90 |
+ |
| 91 |
+pkg_setup() { |
| 92 |
+ if [ ${CTARGET} == ${CHOST} ] ; then |
| 93 |
+ case ${CHOST} in |
| 94 |
+ *-musl*) ;; |
| 95 |
+ *) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
| 96 |
+ esac |
| 97 |
+ fi |
| 98 |
+} |
| 99 |
+ |
| 100 |
+src_configure() { |
| 101 |
+ tc-getCC ${CTARGET} |
| 102 |
+ just_headers && export CC=true |
| 103 |
+ |
| 104 |
+ local sysroot |
| 105 |
+ is_crosscompile && sysroot=/usr/${CTARGET} |
| 106 |
+ ./configure \ |
| 107 |
+ --target=${CTARGET} \ |
| 108 |
+ --prefix=${sysroot}/usr \ |
| 109 |
+ --syslibdir=${sysroot}/lib \ |
| 110 |
+ --disable-gcc-wrapper |
| 111 |
+} |
| 112 |
+ |
| 113 |
+src_compile() { |
| 114 |
+ emake obj/include/bits/alltypes.h |
| 115 |
+ just_headers && return 0 |
| 116 |
+ |
| 117 |
+ emake |
| 118 |
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf |
| 119 |
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent |
| 120 |
+ $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv |
| 121 |
+} |
| 122 |
+ |
| 123 |
+src_install() { |
| 124 |
+ local target="install" |
| 125 |
+ just_headers && target="install-headers" |
| 126 |
+ emake DESTDIR="${D}" ${target} |
| 127 |
+ just_headers && return 0 |
| 128 |
+ |
| 129 |
+ # musl provides ldd via a sym link to its ld.so |
| 130 |
+ local sysroot |
| 131 |
+ is_crosscompile && sysroot=/usr/${CTARGET} |
| 132 |
+ local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
| 133 |
+ dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
| 134 |
+ |
| 135 |
+ if [[ ${CATEGORY} != cross-* ]] ; then |
| 136 |
+ # TODO: We may be able to simplify this code by obtianing the arch name with |
| 137 |
+ # /usr/lib/libc.so 2>&1 | sed -n 's/^.*(\(.*\))$/\1/;1p' |
| 138 |
+ local target=$(tc-arch) arch |
| 139 |
+ local endian=$(musl_endian) |
| 140 |
+ case ${target} in |
| 141 |
+ amd64) arch="x86_64";; |
| 142 |
+ arm) arch="armhf";; # We only have hardfloat right now |
| 143 |
+ mips) arch="mips${endian}";; |
| 144 |
+ ppc) arch="powerpc";; |
| 145 |
+ x86) arch="i386";; |
| 146 |
+ esac |
| 147 |
+ cp "${FILESDIR}"/ldconfig.in "${T}" || die |
| 148 |
+ sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
| 149 |
+ into / |
| 150 |
+ dosbin "${T}"/ldconfig |
| 151 |
+ into /usr |
| 152 |
+ dobin "${T}"/getconf |
| 153 |
+ dobin "${T}"/getent |
| 154 |
+ dobin "${T}"/iconv |
| 155 |
+ echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die |
| 156 |
+ doenvd "${T}"/00musl || die |
| 157 |
+ fi |
| 158 |
+} |
| 159 |
+ |
| 160 |
+pkg_postinst() { |
| 161 |
+ is_crosscompile && return 0 |
| 162 |
+ |
| 163 |
+ [ "${ROOT}" != "/" ] && return 0 |
| 164 |
+ |
| 165 |
+ ldconfig |
| 166 |
+ # reload init ... |
| 167 |
+ /sbin/telinit U 2>/dev/null |
| 168 |
+} |
Archives