cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update adastrap tarball due to libm major bump. Bundle libm with adastrap

Browse Source 
as we do for libc since it's cheap to do and can save us some work in the
future.

ok pascal@
This commit is contained in:
tobiasu 2013-04-04 04:21:14 +00:00
parent 2f6e701f9c
commit 22ba0b47ce
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lang/gcc/4.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2013/03/21 08:46:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2013/04/04 04:21:14 tobiasu Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc64
BROKEN-sparc64 = ICE in libgcc
@ -7,10 +7,12 @@ V = 4.7.2
FULL_VERSION = $V
FULL_PKGVERSION = $V
ADASTRAP_LIBC-i386 = 63.0
ADASTRAP-i386 = adastrap-i386-$V-0.tar.xz
ADASTRAP_LIBC-amd64 = 66.0
ADASTRAP-amd64 = adastrap-amd64-$V-0.tar.xz
ADASTRAP_LIBC-i386 = 67.0
ADASTRAP_LIBM-i386 = 8.0
ADASTRAP-i386 = adastrap-i386-$V-1.tar.xz
ADASTRAP_LIBC-amd64 = 67.0
ADASTRAP_LIBM-amd64 = 8.0
ADASTRAP-amd64 = adastrap-amd64-$V-1.tar.xz
PKGNAME-main = gcc-${FULL_PKGVERSION}
PKGNAME-c++ = g++-${FULL_PKGVERSION}
@ -243,19 +245,27 @@ ADA_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-ada}.tgz
GCC_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-main}.tgz
adastrap: ${ADA_PACKAGE} ${GCC_PACKAGE}
.if !defined(ADASTRAP_LIBC-${MACHINE_ARCH})
@echo 1>&2 "Error: you must specify a libc to bundle"
.if !defined(ADASTRAP_LIBC-${MACHINE_ARCH}) || \
!defined(ADASTRAP_LIBM-${MACHINE_ARCH})
@echo 1>&2 "Error: you must specify libc and libm to bundle"
@exit 1
.else
mkdir -p ${WRKDIR}/prepare/bootstrap/system-libs
cp /usr/lib/libc.so.${ADASTRAP_LIBC-${MACHINE_ARCH}} \
${WRKDIR}/prepare/bootstrap/system-libs
cp /usr/lib/libm.so.${ADASTRAP_LIBM-${MACHINE_ARCH}} \
${WRKDIR}/prepare/bootstrap/system-libs
cd ${WRKDIR}/prepare/bootstrap && tar zxf ${ADA_PACKAGE}
cd ${WRKDIR}/prepare/bootstrap && tar zxf ${GCC_PACKAGE}
rm -rf ${WRKDIR}/prepare/bootstrap/{+*,info,man}
if ! ldd ${WRKDIR}/prepare/bootstrap/bin/egcc | \
fgrep libc.so.${ADASTRAP_LIBC-${MACHINE_ARCH}} >/dev/null; then \
echo 1>&2 "Error: adastrap egcc linked against wrong libc"; \
echo 1>&2 "Error: adastrap egcc linked against unbundled libc"; \
exit 1; \
fi
if ! ldd ${WRKDIR}/prepare/bootstrap/bin/egcc | \
fgrep libm.so.${ADASTRAP_LIBM-${MACHINE_ARCH}} >/dev/null; then \
echo 1>&2 "Error: adastrap egcc linked against unbundled libm"; \
exit 1; \
fi
cd ${WRKDIR}/prepare && tar cf - bootstrap | \

8
lang/gcc/4.7/distinfo
View File

@ -1,8 +1,8 @@
SHA256 (gcc/adastrap-amd64-4.7.2-0.tar.xz) = 6y44r5vz49SKyE8/hAGz5ix7hy1xyn5o6wGHz2qhbcY=
SHA256 (gcc/adastrap-i386-4.7.2-0.tar.xz) = 7zzkpP6UDkWQckJy9arvYOSEfhWpnqdzqETxdCE43a4=
SHA256 (gcc/adastrap-amd64-4.7.2-1.tar.xz) = uIeJisSWxun8CiXWgLf5EIbNmya8jbirErqpVcz3m5M=
SHA256 (gcc/adastrap-i386-4.7.2-1.tar.xz) = nUvIGYIo70n/bSQD2hq+nnPkqCZz2evqFXwjVSMTgKo=
SHA256 (gcc/ecj-4.5.jar) = mP0Sjx03TZ5C/Z1INr3SScbVEevGwN8X+8G535bD14E=
SHA256 (gcc/gcc-4.7.2.tar.bz2) = ipKD1wEPuf5ezjylB+CvXBlBJiY4T4pelDQlGuEAsIQ=
SIZE (gcc/adastrap-amd64-4.7.2-0.tar.xz) = 34066848
SIZE (gcc/adastrap-i386-4.7.2-0.tar.xz) = 30305556
SIZE (gcc/adastrap-amd64-4.7.2-1.tar.xz) = 33832064
SIZE (gcc/adastrap-i386-4.7.2-1.tar.xz) = 29323308
SIZE (gcc/ecj-4.5.jar) = 1470676
SIZE (gcc/gcc-4.7.2.tar.bz2) = 82884636