diff options
Diffstat (limited to 'hardened/toolchain/branches/pieworld/sys-libs/glibc')
| -rw-r--r-- | hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest | 8 | ||||
| -rw-r--r-- | hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5-r1.ebuild | 20 |
2 files changed, 4 insertions, 24 deletions
diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest index 20e5c9c..5d6448d 100644 --- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest +++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest @@ -35,10 +35,10 @@ DIST glibc-2.5.tar.bz2 15321839 RMD160 25a0a460c0db1e5b7c570e5087461696f2096fd2 DIST glibc-libidn-2.5.tar.bz2 102330 RMD160 e10e85e0ee7cdab2e5518a93978cb688ccabee88 SHA1 ee7e019e01aa338e28db1eeb34abb2cb09d2f30a SHA256 de77e49e0beee6061d4c6e480f322566ba25d4e5e018c456a18ea4a8da5c0ede DIST glibc-linuxthreads-2.5.tar.bz2 242445 RMD160 788484d035d53ac39aac18f6e3409a912eea1cfa SHA1 eb7765e5c0a14c7475f1c8b92cbe1f625a8fd76f SHA256 ee27aeba6124a8b351c720eb898917f0f8874d9a384cc2f17aa111a3d679bd2c DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40725 SHA1 7da6257e641759ed29c4d316700fce6f604bc812 SHA256 80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463 -EBUILD glibc-2.5-r1.ebuild 40687 RMD160 d362b490fa31d6a5b88ea5e560212c142f837a35 SHA1 7e09b38e071b1743ddc6bad581329fd73a0770f4 SHA256 d36a6269eaa0be2000e7f13730066a2f833446af33351ded268529642b8b4d76 -MD5 960673c487d64542ca473f4861893979 glibc-2.5-r1.ebuild 40687 -RMD160 d362b490fa31d6a5b88ea5e560212c142f837a35 glibc-2.5-r1.ebuild 40687 -SHA256 d36a6269eaa0be2000e7f13730066a2f833446af33351ded268529642b8b4d76 glibc-2.5-r1.ebuild 40687 +EBUILD glibc-2.5-r1.ebuild 39927 RMD160 46506b8d94e7c9134ee738f25414b340936485ec SHA1 114c5afd352128e8add1f63be3c92d5b97f6f056 SHA256 949cf1859506d85fecff8000cf2eb10a739d3a48f66518c949fd2f3e883b5d42 +MD5 d46d28b4b7f80169c482fd932046ccec glibc-2.5-r1.ebuild 39927 +RMD160 46506b8d94e7c9134ee738f25414b340936485ec glibc-2.5-r1.ebuild 39927 +SHA256 949cf1859506d85fecff8000cf2eb10a739d3a48f66518c949fd2f3e883b5d42 glibc-2.5-r1.ebuild 39927 MD5 5b7e320e8b8b1a96ace60aa95385c122 files/digest-glibc-2.5-r1 1286 RMD160 6302561abceb3a88449dfe74bd6f2e373f00dec3 files/digest-glibc-2.5-r1 1286 SHA256 c20b8f42085597085e3589fbfd2dc5351f0c63a5492a55f82b59a1481b2a28f3 files/digest-glibc-2.5-r1 1286 diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5-r1.ebuild b/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5-r1.ebuild index 6f8463b..6feb1dc 100644 --- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5-r1.ebuild +++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/glibc-2.5-r1.ebuild @@ -739,23 +739,6 @@ setup_flags() { # Don't let the compiler automatically build PIEs unless USE=hardened. use hardened || filter-flags -fPIE - - # When building hardened, define PIC always as many files use libtool-style - # macro PIC rather than the builtin macro __PIC__ to differentiate. -#1 if use hardened; then -#1 mkdir -p ${T}/include -#1 [[ -f ${T}/include/define-pic.h ]] || -#1 cat > ${T}/include/define-pic.h <<-EOF -#1 #if defined __PIC__ && !defined PIC -#1 # define PIC -#1 #endif -#1 EOF -#1 append-flags "-I${T}/include -imacrosdefine-pic.h" -#1 # Note; the glibc build process filters out -I* from CFLAGS - -#1 # define-pic.h will be moved to the build directory in -#1 # the configure phase. -#1 fi -#2 #use hardened && append-flags -DPIC } check_kheader_version() { @@ -954,9 +937,6 @@ glibc_do_configure() { local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 mkdir -p "${GBUILDDIR}" cd "${GBUILDDIR}" -#1 # Copy define-pic.h into the build directory, where glibc's build process -#1 # will find it. -#1 use hardened && cp ${T}/include/define-pic.h . einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" "${S}"/configure ${myconf} || die "failed to configure glibc" } |