public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-16 16:12 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-16 16:12 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/16 16:12:07

  Modified:             ChangeLog
  Added:                freebsd-lib-9.0-r2.ebuild
  Log:
  Change the way we install freebsd-lib: install everything in /usr and use gen_usr_ldscript -a to move the core libraries to /. This simplifies the ebuild, avoids QA warnings for symlinks crossing the /usr boundary and makes / smaller.
  
  (Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

Revision  Changes    Path
1.115                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.114&r2=1.115

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog	13 May 2012 16:34:31 -0000	1.114
+++ ChangeLog	16 May 2012 16:12:07 -0000	1.115
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.114 2012/05/13 16:34:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.115 2012/05/16 16:12:07 aballier Exp $
+
+*freebsd-lib-9.0-r2 (16 May 2012)
+
+  16 May 2012; Alexis Ballier <aballier@gentoo.org> +freebsd-lib-9.0-r2.ebuild:
+  Change the way we install freebsd-lib: install everything in /usr and use
+  gen_usr_ldscript -a to move the core libraries to /. This simplifies the
+  ebuild, avoids QA warnings for symlinks crossing the /usr boundary and makes
+  / smaller.
 
   13 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r1.ebuild:
   preinstall some more headers fixing build of a cross-compiler



1.1                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.1 2012/05/16 16:12:07 aballier Exp $

EAPI=2

inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs

DESCRIPTION="FreeBSD's base system libraries"
SLOT="0"
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"

# Crypto is needed to have an internal OpenSSL header
# sys is needed for libalias, probably we can just extract that instead of
# extracting the whole tarball
SRC_URI="mirror://gentoo/${LIB}.tar.bz2
		mirror://gentoo/${CONTRIB}.tar.bz2
		mirror://gentoo/${CRYPTO}.tar.bz2
		mirror://gentoo/${LIBEXEC}.tar.bz2
		mirror://gentoo/${ETC}.tar.bz2
		mirror://gentoo/${INCLUDE}.tar.bz2
		mirror://gentoo/${USBIN}.tar.bz2
		mirror://gentoo/${GNU}.tar.bz2
		build? (
			mirror://gentoo/${SYS}.tar.bz2 )
		zfs? (
			mirror://gentoo/${CDDL}.tar.bz2 )"

if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
	RDEPEND="ssl? ( dev-libs/openssl )
		hesiod? ( net-dns/hesiod )
		kerberos? ( virtual/krb5 )
		usb? ( !dev-libs/libusb )
		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
		>=dev-libs/expat-2.0.1
		!sys-libs/libutempter
		!sys-freebsd/freebsd-headers"
	DEPEND="${RDEPEND}
		>=sys-devel/flex-2.5.31-r2
		=sys-freebsd/freebsd-sources-${RV}*
		!bootstrap? ( app-arch/bzip2 )"
else
	SRC_URI="${SRC_URI}
			mirror://gentoo/${SYS}.tar.bz2"
fi

DEPEND="${DEPEND}
		=sys-freebsd/freebsd-mk-defs-${RV}*"

S="${WORKDIR}/lib"

export CTARGET=${CTARGET:-${CHOST}}
if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
	export CTARGET=${CATEGORY/cross-}
fi

IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
	build bootstrap crosscompile_opts_headers-only zfs
	userland_GNU userland_BSD"

pkg_setup() {
	[ -c /dev/zero ] || \
		die "You forgot to mount /dev; the compiled libc would break."

	if ! use ssl && use kerberos; then
		eerror "If you want kerberos support you need to enable ssl support, too."
	fi

	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "

	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "

	if [ "${CTARGET}" != "${CHOST}" ]; then
		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
	fi
}

PATCHES=(
	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
	"${FILESDIR}/${PN}-6.1-csu.patch"
	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
	"${FILESDIR}/${PN}-9.0-liblink.patch"
	"${FILESDIR}/${PN}-bsdxml2expat.patch" )

# Here we disable and remove source which we don't need or want
# In order:
# - ncurses stuff
# - libexpat creates a bsdxml library which is the same as expat
# - archiving libraries (have their own ebuild)
# - sendmail libraries (they are installed by sendmail)
# - SNMP library and dependency (have their own ebuilds)
#
# The rest are libraries we already have somewhere else because
# they are contribution.
# Note: libtelnet is an internal lib used by telnet and telnetd programs
# as it's not used in freebsd-lib package itself, it's pointless building
# it here.
REMOVE_SUBDIRS="ncurses \
	libexpat \
	libz libbz2 libarchive liblzma \
	libsm libsmdb libsmutil \
	libbegemot libbsnmp \
	libpam libpcap bind libwrap libmagic \
	libcom_err libtelnet
	libelf libedit"

src_prepare() {
	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
	sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile"

	# Upstream Display Managers default to using VT7
	# We should make FreeBSD allow this by default
	local x=
	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
		sed -i.bak \
			-e '/ttyv5[[:space:]]/ a\
# Display Managers default to VT7.\
# If you use the xdm init script, keep ttyv6 commented out\
# unless you force a different VT for the DM being used.' \
			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
			|| die "Failed to sed ${x}"
		rm "${x}".bak
	done

	# This one is here because it also
	# patches "${WORKDIR}/include"
	cd "${WORKDIR}"
	epatch "${FILESDIR}/${PN}-includes.patch"
	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"

	# Don't install the hesiod man page or header
	rm "${WORKDIR}"/include/hesiod.h || die
	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
	"${WORKDIR}"/lib/libc/net/Makefile.inc || die

	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
	cd "${S}"
	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
		die "Problem fixing \"${dir}/Makefile"
	done
	if use build; then
		cd "${WORKDIR}"
		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
		# Preinstall includes so we don't use the system's ones.
		mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
		install_includes "/include_proper"
		return 0
	fi

	if [ "${CTARGET}" = "${CHOST}" ]; then
		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
	else
		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
			"${S}/libc/rpc/Makefile.inc" \
			"${S}/libc/yp/Makefile.inc"
	fi

	if install --version 2> /dev/null | grep -q GNU; then
		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
	fi

	# Preinstall includes so we don't use the system's ones.
	mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
	install_includes "/include_proper"

	# Let arch-specific includes to be found
	local machine
	machine=$(tc-arch-kernel ${CTARGET})
	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
		die "Couldn't make ${machine}/include symlink."

	cd "${S}"
	use bootstrap && dummy_mk libstand
	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
		-i "${S}/csu/i386-elf/Makefile" \
		-i "${S}/csu/ia64/Makefile" || die
	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
	# BSD's sed on BSD.
	if use userland_GNU; then
		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
	fi
}

src_compile() {
	# Does not work with GNU sed
	# Force BSD's sed on BSD.
	if use userland_BSD ; then
		export ESED=/usr/bin/sed
		unalias sed
	fi

	cd "${WORKDIR}/include"
	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"

	use crosscompile_opts_headers-only && return 0

	# Bug #270098
	append-flags $(test-flags -fno-strict-aliasing)

	strip-flags
	if [ "${CTARGET}" != "${CHOST}" ]; then
		export YACC='yacc -by'
		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="

		local machine
		machine=$(tc-arch-kernel ${CTARGET})

		local csudir
		if [ -d "${S}/csu/${machine}-elf" ]; then
			csudir="${S}/csu/${machine}-elf"
		else
			csudir="${S}/csu/${machine}"
		fi
		export RAW_LDFLAGS=$(raw-ldflags)
		cd "${csudir}"
		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"

		append-flags "-isystem /usr/${CTARGET}/usr/include"
		append-flags "-isystem ${WORKDIR}/lib/libutil"
		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
		append-flags "-B ${csudir}"
		append-ldflags "-B ${csudir}"

		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"

		export RAW_LDFLAGS=$(raw-ldflags)
		cd "${S}/libc"
		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
		cd "${S}/msun"
		append-ldflags "-L${WORKDIR}/lib/libc"
		export RAW_LDFLAGS=$(raw-ldflags)
		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
		cd "${WORKDIR}/lib/libthr/" || die "missing libthr"
		$(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed"
	else
		# Forces to use the local copy of headers as they might be outdated in
		# the system
		append-flags "-isystem '${WORKDIR}/include_proper'"

		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
		einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"."
		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
		NOFLAGSTRIP=yes freebsd_src_compile
		# Hack libssp_nonshared.a into libc & others since we don't have
		# the linker script in place yet.
		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
		einfo "Compiling libc."
		cd "${S}"
		export RAW_LDFLAGS=$(raw-ldflags)
		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
		cd "${WORKDIR}/gnu/lib/libregex" || die
		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
	fi
}

src_install() {
	[ "${CTARGET}" = "${CHOST}" ] \
		&& INCLUDEDIR="/usr/include" \
		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
	dodir ${INCLUDEDIR}
	einfo "Installing for ${CTARGET} in ${CHOST}.."
	install_includes ${INCLUDEDIR}

	use crosscompile_opts_headers-only && return 0
	local mylibdir=$(get_libdir)

	if [ "${CTARGET}" != "${CHOST}" ]; then
		local csudir
		if [ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
		else
			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
		fi
		cd "${csudir}"
		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"

		cd "${S}/libc"
		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libc failed"

		cd "${S}/msun"
		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install msun failed"

		cd "${WORKDIR}/gnu/lib/libssp/"
		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"

		cd "${WORKDIR}/lib/libthr/"
		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed"

		dosym "usr/include" "/usr/${CTARGET}/sys-include"
	else
		# Set SHLIBDIR and LIBDIR for multilib
		cd "${WORKDIR}/gnu/lib/libssp"
		SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ssp failed."
		cd "${S}"
		SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install failed"
		cd "${WORKDIR}/gnu/lib/libregex"
		SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install libregex failed"
	fi

	# Don't install the rest of the configuration files if crosscompiling
	if [ "${CTARGET}" != "${CHOST}" ] ; then
		# This is to get it stripped with the correct tools, otherwise it gets
		# stripped with the host strip.
		export CHOST=${CTARGET}
		return 0
	fi

	# Symlink libbsdxml to libexpat as we use expat in favor of the renaming done
	# on FreeBSD.
	dosym libexpat.so /usr/${mylibdir}/libbsdxml.so
	dosym libexpat.a /usr/${mylibdir}/libbsdxml.a

	# install libstand files
	dodir /usr/include/libstand
	insinto /usr/include/libstand
	doins "${S}"/libstand/*.h

	cd "${WORKDIR}/etc/"
	insinto /etc
	doins auth.conf nls.alias mac.conf netconfig

	# Install ttys file
	local MACHINE="$(tc-arch-kernel)"
	doins "etc.${MACHINE}"/*

	# Generate ldscripts for core libraries that will go in /
	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
		kvm md procstat sbuf thr ufs util

	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
	# this is done to avoid having to touch gcc spec file as it is currently
	# done on FreeBSD upstream, mostly because their binutils aren't able to
	# cope with linker scripts yet.
	# Taken from toolchain-funcs.eclass:
	local output_format
	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
	# Clear the symlink.
	rm -f "${D}/usr/${mylibdir}/libc.so"
	# Move the library
	mv "${D}"/usr/${mylibdir}/libc.so.* "${D}/${mylibdir}/" || die

	cat > "${D}/usr/${mylibdir}/libc.so" <<-END_LDSCRIPT
/* GNU ld script
   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
   this symbol was provided by a shared libc. So we link in
   libssp_nonshared.a from here.
 */
${output_format}
GROUP ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a )
END_LDSCRIPT

	dodir /etc/sandbox.d
	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
# /dev/crypto is used mostly by OpenSSL on *BSD platforms
# leave it available as packages might use OpenSSL commands
# during compile or install phase.
SANDBOX_PREDICT="/dev/crypto"
EOF

	# Install a libusb.pc for better compat with Linux's libusb
	if use usb ; then
		dodir /usr/$(get_libdir)/pkgconfig
		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
	fi
}

install_includes()
{
	local INCLUDEDIR="$1"

	# The idea is to be called from either install or unpack.
	# During unpack it's required to install them as portage's user.
	if [[ "${EBUILD_PHASE}" == "install" ]]; then
		local DESTDIR="${D}"
		BINOWN="root"
		BINGRP="wheel"
	else
		local DESTDIR="${WORKDIR}"
		[[ -z "${USER}" ]] && USER="portage"
		BINOWN="${USER}"
		[[ -z "${GROUPS}" ]] && GROUPS="portage"
		BINGRP="${GROUPS}"
	fi

	# This is for ssp/ssp.h.
	einfo "Building ssp.h"
	cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp"
	$(freebsd_get_bmake) ssp.h || die "problem building ssp.h"

	# Must exist before we use it.
	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
	cd "${WORKDIR}/include"

	local MACHINE="$(tc-arch-kernel)"

	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
	$(freebsd_get_bmake) installincludes \
		MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \
		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
		BINGRP="${BINGRP}" || die "install_includes() failed"
	einfo "includes installed ok."
	EXTRA_INCLUDES="gnu/lib/libssp lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
	for i in $EXTRA_INCLUDES; do
		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
		cd "${WORKDIR}/$i" || die
		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
			BINGRP="${BINGRP}" || die "problem installing $i includes."
		einfo "$i includes installed ok."
	done
}






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 12:46 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 12:46 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 12:46:57

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  oops libm should be in / too
  
  (Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

Revision  Changes    Path
1.116                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.115&r2=1.116

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog	16 May 2012 16:12:07 -0000	1.115
+++ ChangeLog	17 May 2012 12:46:57 -0000	1.116
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.115 2012/05/16 16:12:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.116 2012/05/17 12:46:57 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  oops libm should be in / too
 
 *freebsd-lib-9.0-r2 (16 May 2012)
 



1.2                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.1&r2=1.2

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freebsd-lib-9.0-r2.ebuild	16 May 2012 16:12:07 -0000	1.1
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 12:46:57 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.1 2012/05/16 16:12:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.2 2012/05/17 12:46:57 aballier Exp $
 
 EAPI=2
 
@@ -354,7 +354,7 @@
 
 	# Generate ldscripts for core libraries that will go in /
 	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm md procstat sbuf thr ufs util
+		kvm m md procstat sbuf thr ufs util
 
 	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
 	# this is done to avoid having to touch gcc spec file as it is currently






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 12:48 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 12:48 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 12:48:52

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  openssl takes care of predicting /dev/crypto these days, no need to have it twice.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.117                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.116&r2=1.117

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog	17 May 2012 12:46:57 -0000	1.116
+++ ChangeLog	17 May 2012 12:48:52 -0000	1.117
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.116 2012/05/17 12:46:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.117 2012/05/17 12:48:52 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  openssl takes care of predicting /dev/crypto these days, no need to have it
+  twice.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   oops libm should be in / too



1.3                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.2&r2=1.3

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 12:46:57 -0000	1.2
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 12:48:52 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.2 2012/05/17 12:46:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.3 2012/05/17 12:48:52 aballier Exp $
 
 EAPI=2
 
@@ -380,14 +380,6 @@
 GROUP ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a )
 END_LDSCRIPT
 
-	dodir /etc/sandbox.d
-	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
-# /dev/crypto is used mostly by OpenSSL on *BSD platforms
-# leave it available as packages might use OpenSSL commands
-# during compile or install phase.
-SANDBOX_PREDICT="/dev/crypto"
-EOF
-
 	# Install a libusb.pc for better compat with Linux's libusb
 	if use usb ; then
 		dodir /usr/$(get_libdir)/pkgconfig






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 13:59 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 13:59 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 13:59:16

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  drop the compat symlink libbsdxml -> libexpat now that freebsd_rename_libraries rename them automagically.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.118                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.117&r2=1.118

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog	17 May 2012 12:48:52 -0000	1.117
+++ ChangeLog	17 May 2012 13:59:16 -0000	1.118
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.117 2012/05/17 12:48:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.118 2012/05/17 13:59:16 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  drop the compat symlink libbsdxml -> libexpat now that
+  freebsd_rename_libraries rename them automagically.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   openssl takes care of predicting /dev/crypto these days, no need to have it



1.4                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.3&r2=1.4

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 12:48:52 -0000	1.3
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 13:59:16 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.3 2012/05/17 12:48:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.4 2012/05/17 13:59:16 aballier Exp $
 
 EAPI=2
 
@@ -334,11 +334,6 @@
 		return 0
 	fi
 
-	# Symlink libbsdxml to libexpat as we use expat in favor of the renaming done
-	# on FreeBSD.
-	dosym libexpat.so /usr/${mylibdir}/libbsdxml.so
-	dosym libexpat.a /usr/${mylibdir}/libbsdxml.a
-
 	# install libstand files
 	dodir /usr/include/libstand
 	insinto /usr/include/libstand






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 14:33 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 14:33 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 14:33:46

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  stop installing libstand headers manually
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.119                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.119&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.119&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.118&r2=1.119

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog	17 May 2012 13:59:16 -0000	1.118
+++ ChangeLog	17 May 2012 14:33:46 -0000	1.119
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.118 2012/05/17 13:59:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.119 2012/05/17 14:33:46 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  stop installing libstand headers manually
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   drop the compat symlink libbsdxml -> libexpat now that



1.5                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.4&r2=1.5

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 13:59:16 -0000	1.4
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 14:33:46 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.4 2012/05/17 13:59:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.5 2012/05/17 14:33:46 aballier Exp $
 
 EAPI=2
 
@@ -334,11 +334,6 @@
 		return 0
 	fi
 
-	# install libstand files
-	dodir /usr/include/libstand
-	insinto /usr/include/libstand
-	doins "${S}"/libstand/*.h
-
 	cd "${WORKDIR}/etc/"
 	insinto /etc
 	doins auth.conf nls.alias mac.conf netconfig






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 16:25 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 16:25 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 16:25:29

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Factorize some code. Install all the cross-compile libraries in the same place. Build and install libutil for the cross-compiler too.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.120                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.119&r2=1.120

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog	17 May 2012 14:33:46 -0000	1.119
+++ ChangeLog	17 May 2012 16:25:29 -0000	1.120
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.119 2012/05/17 14:33:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.120 2012/05/17 16:25:29 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Factorize some code. Install all the cross-compile libraries in the same
+  place. Build and install libutil for the cross-compiler too.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   stop installing libstand headers manually



1.6                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.5&r2=1.6

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 14:33:46 -0000	1.5
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 16:25:29 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.5 2012/05/17 14:33:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.6 2012/05/17 16:25:29 aballier Exp $
 
 EAPI=2
 
@@ -249,10 +249,10 @@
 		append-ldflags "-L${WORKDIR}/lib/libc"
 		export RAW_LDFLAGS=$(raw-ldflags)
 		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
-		cd "${WORKDIR}/lib/libthr/" || die "missing libthr"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed"
+		for i in gnu/lib/libssp lib/libthr lib/libutil ; do
+			cd "${WORKDIR}/${i}" || die "missing ${i}."
+			$(freebsd_get_bmake) ${mymakeopts} || die "make ${i} failed"
+		done
 	else
 		# Forces to use the local copy of headers as they might be outdated in
 		# the system
@@ -287,43 +287,27 @@
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		local csudir
-		if [ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		if [ -d "${WORKDIR}/lib/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
+			csudir="lib/csu/$(tc-arch-kernel ${CTARGET})-elf"
 		else
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+			csudir="lib/csu/$(tc-arch-kernel ${CTARGET})"
 		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
-			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
 
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libc failed"
-
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install msun failed"
-
-		cd "${WORKDIR}/gnu/lib/libssp/"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"
-
-		cd "${WORKDIR}/lib/libthr/"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed"
+		for i in "${csudir}" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil ; do
+			cd "${WORKDIR}/${i}/" || die "missing ${i}."
+			$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+				INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+				FILESDIR="/usr/${CTARGET}/usr/lib" \
+				SHLIBDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ${i} failed"
+		done
 
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		# Set SHLIBDIR and LIBDIR for multilib
-		cd "${WORKDIR}/gnu/lib/libssp"
-		SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ssp failed."
-		cd "${S}"
-		SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install failed"
-		cd "${WORKDIR}/gnu/lib/libregex"
-		SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install libregex failed"
+		for i in gnu/lib/libssp lib gnu/lib/libregex ; do
+			cd "${WORKDIR}/${i}/" || die "Missing ${i}."
+			SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ${i} failed."
+		done
 	fi
 
 	# Don't install the rest of the configuration files if crosscompiling






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 16:58 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 16:58 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 16:58:27

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  factorize the way of getting the csudir
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.121                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.120&r2=1.121

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog	17 May 2012 16:25:29 -0000	1.120
+++ ChangeLog	17 May 2012 16:58:27 -0000	1.121
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.120 2012/05/17 16:25:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.121 2012/05/17 16:58:27 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  factorize the way of getting the csudir
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Factorize some code. Install all the cross-compile libraries in the same



1.7                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.6&r2=1.7

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 16:25:29 -0000	1.6
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 16:58:27 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.6 2012/05/17 16:25:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.7 2012/05/17 16:58:27 aballier Exp $
 
 EAPI=2
 
@@ -196,6 +196,14 @@
 	fi
 }
 
+get_csudir() {
+	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
+		echo "lib/csu/$1-elf"
+	else
+		echo "lib/csu/$1"
+	fi
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -221,21 +229,16 @@
 		local machine
 		machine=$(tc-arch-kernel ${CTARGET})
 
-		local csudir
-		if [ -d "${S}/csu/${machine}-elf" ]; then
-			csudir="${S}/csu/${machine}-elf"
-		else
-			csudir="${S}/csu/${machine}"
-		fi
+		local csudir="$(get_csudir ${machine})"
 		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${csudir}"
+		cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
 		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
 		append-flags "-isystem ${WORKDIR}/lib/libutil"
 		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
-		append-flags "-B ${csudir}"
-		append-ldflags "-B ${csudir}"
+		append-flags "-B ${WORKDIR}/${csudir}"
+		append-ldflags "-B ${WORKDIR}/${csudir}"
 
 		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
 		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
@@ -286,14 +289,7 @@
 	local mylibdir=$(get_libdir)
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
-		local csudir
-		if [ -d "${WORKDIR}/lib/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
-			csudir="lib/csu/$(tc-arch-kernel ${CTARGET})-elf"
-		else
-			csudir="lib/csu/$(tc-arch-kernel ${CTARGET})"
-		fi
-
-		for i in "${csudir}" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil ; do
+		for i in "$(get_csudir $(tc-arch-kernel ${CTARGET}))" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil ; do
 			cd "${WORKDIR}/${i}/" || die "missing ${i}."
 			$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
 				INCLUDEDIR="/usr/${CTARGET}/usr/include" \






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 17:59 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 17:59 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 17:59:53

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Use mkinstall when cross-compiling too. Factorize the native and cross builds install.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.122                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.122&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.122&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.121&r2=1.122

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog	17 May 2012 16:58:27 -0000	1.121
+++ ChangeLog	17 May 2012 17:59:53 -0000	1.122
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.121 2012/05/17 16:58:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.122 2012/05/17 17:59:53 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Use mkinstall when cross-compiling too. Factorize the native and cross builds
+  install.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   factorize the way of getting the csudir



1.8                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.7&r2=1.8

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 16:58:27 -0000	1.7
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 17:59:53 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.7 2012/05/17 16:58:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.8 2012/05/17 17:59:53 aballier Exp $
 
 EAPI=2
 
@@ -289,23 +289,25 @@
 	local mylibdir=$(get_libdir)
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
-		for i in "$(get_csudir $(tc-arch-kernel ${CTARGET}))" lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil ; do
-			cd "${WORKDIR}/${i}/" || die "missing ${i}."
-			$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-				INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-				FILESDIR="/usr/${CTARGET}/usr/lib" \
-				SHLIBDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ${i} failed"
-		done
+		BMAKE="$(freebsd_get_bmake)"
+		mymakeopts="${mymakeopts} NO_MAN= \
+			INCLUDEDIR=/usr/${CTARGET}/usr/include \
+			SHLIBDIR=/usr/${CTARGET}/usr/lib \
+			LIBDIR=/usr/${CTARGET}/usr/lib"
+		SUBDIRS="$(get_csudir $(tc-arch-kernel ${CTARGET})) lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
 
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		# Set SHLIBDIR and LIBDIR for multilib
-		for i in gnu/lib/libssp lib gnu/lib/libregex ; do
-			cd "${WORKDIR}/${i}/" || die "Missing ${i}."
-			SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ${i} failed."
-		done
+		mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
+		SUBDIRS="gnu/lib/libssp lib gnu/lib/libregex"
 	fi
 
+	for i in ${SUBDIRS} ; do
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		mkinstall || die "Install ${i} failed"
+	done
+
 	# Don't install the rest of the configuration files if crosscompiling
 	if [ "${CTARGET}" != "${CHOST}" ] ; then
 		# This is to get it stripped with the correct tools, otherwise it gets






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 18:13 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 18:13 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 18:13:00

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Remove -isystem append-flags that are now useless since we pre-install the headers.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.123                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.123&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.123&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.122&r2=1.123

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- ChangeLog	17 May 2012 17:59:53 -0000	1.122
+++ ChangeLog	17 May 2012 18:13:00 -0000	1.123
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.122 2012/05/17 17:59:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.123 2012/05/17 18:13:00 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Remove -isystem append-flags that are now useless since we pre-install the
+  headers.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Use mkinstall when cross-compiling too. Factorize the native and cross builds



1.9                  sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.8&r2=1.9

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 17:59:53 -0000	1.8
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 18:13:00 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.8 2012/05/17 17:59:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.9 2012/05/17 18:13:00 aballier Exp $
 
 EAPI=2
 
@@ -235,8 +235,6 @@
 		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-isystem ${WORKDIR}/lib/libutil"
-		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
 		append-flags "-B ${WORKDIR}/${csudir}"
 		append-ldflags "-B ${WORKDIR}/${csudir}"
 






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 18:31 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 18:31 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 18:31:44

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  split out the csu bootstrapping code in its own function
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.124                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.124&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.124&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.123&r2=1.124

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- ChangeLog	17 May 2012 18:13:00 -0000	1.123
+++ ChangeLog	17 May 2012 18:31:44 -0000	1.124
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.123 2012/05/17 18:13:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.124 2012/05/17 18:31:44 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  split out the csu bootstrapping code in its own function
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Remove -isystem append-flags that are now useless since we pre-install the



1.10                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.9&r2=1.10

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 18:13:00 -0000	1.9
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 18:31:44 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.9 2012/05/17 18:13:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.10 2012/05/17 18:31:44 aballier Exp $
 
 EAPI=2
 
@@ -204,6 +204,16 @@
 	fi
 }
 
+bootstrap_csu() {
+	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
+	export RAW_LDFLAGS=$(raw-ldflags)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	append-flags "-B ${WORKDIR}/${csudir}"
+	append-ldflags "-B ${WORKDIR}/${csudir}"
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -226,17 +236,9 @@
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
 
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir="$(get_csudir ${machine})"
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+		bootstrap_csu
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-B ${WORKDIR}/${csudir}"
-		append-ldflags "-B ${WORKDIR}/${csudir}"
 
 		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
 		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 18:46 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 18:46 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 18:46:14

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  use freebsd_src_install rather than mkinstall
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.125                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.124&r2=1.125

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog	17 May 2012 18:31:44 -0000	1.124
+++ ChangeLog	17 May 2012 18:46:14 -0000	1.125
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.124 2012/05/17 18:31:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.125 2012/05/17 18:46:14 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  use freebsd_src_install rather than mkinstall
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   split out the csu bootstrapping code in its own function



1.11                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.10&r2=1.11

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 18:31:44 -0000	1.10
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 18:46:14 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.10 2012/05/17 18:31:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.11 2012/05/17 18:46:14 aballier Exp $
 
 EAPI=2
 
@@ -289,7 +289,6 @@
 	local mylibdir=$(get_libdir)
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
-		BMAKE="$(freebsd_get_bmake)"
 		mymakeopts="${mymakeopts} NO_MAN= \
 			INCLUDEDIR=/usr/${CTARGET}/usr/include \
 			SHLIBDIR=/usr/${CTARGET}/usr/lib \
@@ -305,7 +304,7 @@
 
 	for i in ${SUBDIRS} ; do
 		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		mkinstall || die "Install ${i} failed"
+		freebsd_src_install || die "Install ${i} failed"
 	done
 
 	# Don't install the rest of the configuration files if crosscompiling






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 19:04 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 19:04 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 19:04:25

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  factorize the libssp_nonshared bootstrapping code
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.126                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.125&r2=1.126

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog	17 May 2012 18:46:14 -0000	1.125
+++ ChangeLog	17 May 2012 19:04:25 -0000	1.126
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.125 2012/05/17 18:46:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.126 2012/05/17 19:04:25 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  factorize the libssp_nonshared bootstrapping code
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   use freebsd_src_install rather than mkinstall



1.12                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.11&r2=1.12

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 18:46:14 -0000	1.11
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 19:04:25 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.11 2012/05/17 18:46:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.12 2012/05/17 19:04:25 aballier Exp $
 
 EAPI=2
 
@@ -214,6 +214,13 @@
 	append-ldflags "-B ${WORKDIR}/${csudir}"
 }
 
+# Compile libssp_nonshared.a and add it's path to LDFLAGS.
+bootstrap_libssp_nonshared() {
+	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+	NOFLAGSTRIP=yes freebsd_src_compile
+	append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -240,10 +247,7 @@
 
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
 
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+		bootstrap_libssp_nonshared
 
 		export RAW_LDFLAGS=$(raw-ldflags)
 		cd "${S}/libc"
@@ -261,17 +265,14 @@
 		# the system
 		append-flags "-isystem '${WORKDIR}/include_proper'"
 
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"."
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		NOFLAGSTRIP=yes freebsd_src_compile
-		# Hack libssp_nonshared.a into libc & others since we don't have
-		# the linker script in place yet.
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+		bootstrap_libssp_nonshared
+
 		einfo "Compiling libc."
 		cd "${S}"
 		export RAW_LDFLAGS=$(raw-ldflags)
 		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
+		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
+		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
 		cd "${WORKDIR}/gnu/lib/libregex" || die
 		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
 	fi






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 19:21 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 19:21 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 19:21:37

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  factorize the src_compile code between the cross and native builds.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.127                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.126&r2=1.127

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- ChangeLog	17 May 2012 19:04:25 -0000	1.126
+++ ChangeLog	17 May 2012 19:21:37 -0000	1.127
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.126 2012/05/17 19:04:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.127 2012/05/17 19:21:37 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  factorize the src_compile code between the cross and native builds.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   factorize the libssp_nonshared bootstrapping code



1.13                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.12&r2=1.13

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 19:04:25 -0000	1.12
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 19:21:37 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.12 2012/05/17 19:04:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.13 2012/05/17 19:21:37 aballier Exp $
 
 EAPI=2
 
@@ -241,7 +241,7 @@
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
+		mymakeopts="${mymakeopts} NLS="
 
 		bootstrap_csu
 
@@ -249,17 +249,10 @@
 
 		bootstrap_libssp_nonshared
 
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${S}/msun"
 		append-ldflags "-L${WORKDIR}/lib/libc"
 		export RAW_LDFLAGS=$(raw-ldflags)
-		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		for i in gnu/lib/libssp lib/libthr lib/libutil ; do
-			cd "${WORKDIR}/${i}" || die "missing ${i}."
-			$(freebsd_get_bmake) ${mymakeopts} || die "make ${i} failed"
-		done
+
+		SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
 	else
 		# Forces to use the local copy of headers as they might be outdated in
 		# the system
@@ -267,15 +260,16 @@
 
 		bootstrap_libssp_nonshared
 
-		einfo "Compiling libc."
-		cd "${S}"
 		export RAW_LDFLAGS=$(raw-ldflags)
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
-		cd "${WORKDIR}/gnu/lib/libregex" || die
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
+
+		SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
 	fi
+
+	# Everything is now setup, build it!
+	for i in ${SUBDIRS} ; do
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
+	done
 }
 
 src_install() {






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-17 20:03 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 20:03 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 20:03:01

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Generate the libc ldscript for the cross-compiled library too.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.128                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.127&r2=1.128

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- ChangeLog	17 May 2012 19:21:37 -0000	1.127
+++ ChangeLog	17 May 2012 20:03:01 -0000	1.128
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.127 2012/05/17 19:21:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.128 2012/05/17 20:03:01 aballier Exp $
+
+  17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Generate the libc ldscript for the cross-compiled library too.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   factorize the src_compile code between the cross and native builds.



1.14                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.13&r2=1.14

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 19:21:37 -0000	1.13
+++ freebsd-lib-9.0-r2.ebuild	17 May 2012 20:03:01 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.13 2012/05/17 19:21:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.14 2012/05/17 20:03:01 aballier Exp $
 
 EAPI=2
 
@@ -272,6 +272,41 @@
 	done
 }
 
+gen_libc_ldscript() {
+	# Parameters:
+	#   $1 = target libdir
+	#   $2 = source libc dir
+	#   $3 = source libssp_nonshared dir
+
+	# Clear the symlink.
+	rm -f "${D}/$2/libc.so" || die
+
+	# Move the library if needed
+	if [ "$1" != "$2" ] ; then
+		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
+	fi
+
+	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
+	# this is done to avoid having to touch gcc spec file as it is currently
+	# done on FreeBSD upstream, mostly because their binutils aren't able to
+	# cope with linker scripts yet.
+	# Taken from toolchain-funcs.eclass:
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
+/* GNU ld script
+   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
+   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
+   this symbol was provided by a shared libc. So we link in
+   libssp_nonshared.a from here.
+ */
+${output_format}
+GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
+END_LDSCRIPT
+}
+
 src_install() {
 	[ "${CTARGET}" = "${CHOST}" ] \
 		&& INCLUDEDIR="/usr/include" \
@@ -306,7 +341,9 @@
 	if [ "${CTARGET}" != "${CHOST}" ] ; then
 		# This is to get it stripped with the correct tools, otherwise it gets
 		# stripped with the host strip.
+		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
 		export CHOST=${CTARGET}
+		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
 		return 0
 	fi
 
@@ -322,29 +359,7 @@
 	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
 		kvm m md procstat sbuf thr ufs util
 
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-	# Clear the symlink.
-	rm -f "${D}/usr/${mylibdir}/libc.so"
-	# Move the library
-	mv "${D}"/usr/${mylibdir}/libc.so.* "${D}/${mylibdir}/" || die
-
-	cat > "${D}/usr/${mylibdir}/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a )
-END_LDSCRIPT
+	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
 
 	# Install a libusb.pc for better compat with Linux's libusb
 	if use usb ; then






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-18  1:31 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-18  1:31 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/18 01:31:08

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Set the NOSTRIPFLAG variable only once
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.129                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.128&r2=1.129

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- ChangeLog	17 May 2012 20:03:01 -0000	1.128
+++ ChangeLog	18 May 2012 01:31:08 -0000	1.129
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.128 2012/05/17 20:03:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.129 2012/05/18 01:31:08 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Set the NOSTRIPFLAG variable only once
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Generate the libc ldscript for the cross-compiled library too.



1.15                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.14&r2=1.15

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freebsd-lib-9.0-r2.ebuild	17 May 2012 20:03:01 -0000	1.14
+++ freebsd-lib-9.0-r2.ebuild	18 May 2012 01:31:08 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.14 2012/05/17 20:03:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.15 2012/05/18 01:31:08 aballier Exp $
 
 EAPI=2
 
@@ -217,7 +217,7 @@
 # Compile libssp_nonshared.a and add it's path to LDFLAGS.
 bootstrap_libssp_nonshared() {
 	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	NOFLAGSTRIP=yes freebsd_src_compile
+	freebsd_src_compile
 	append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
 }
 
@@ -237,7 +237,10 @@
 	# Bug #270098
 	append-flags $(test-flags -fno-strict-aliasing)
 
+	# strip flags and do not do it later, we only add safe, and in fact
+	# needed flags after all
 	strip-flags
+	export NOFLAGSTRIP=yes
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
@@ -268,7 +271,7 @@
 	# Everything is now setup, build it!
 	for i in ${SUBDIRS} ; do
 		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
+		LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
 	done
 }
 






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-18  1:35 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-18  1:35 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/18 01:35:07

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Factorize some more code and regroup variable assignments.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.130                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.130&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.130&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.129&r2=1.130

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- ChangeLog	18 May 2012 01:31:08 -0000	1.129
+++ ChangeLog	18 May 2012 01:35:07 -0000	1.130
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.129 2012/05/18 01:31:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.130 2012/05/18 01:35:07 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Factorize some more code and regroup variable assignments.
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Set the NOSTRIPFLAG variable only once



1.16                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.15&r2=1.16

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- freebsd-lib-9.0-r2.ebuild	18 May 2012 01:31:08 -0000	1.15
+++ freebsd-lib-9.0-r2.ebuild	18 May 2012 01:35:07 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.15 2012/05/18 01:31:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.16 2012/05/18 01:35:07 aballier Exp $
 
 EAPI=2
 
@@ -245,16 +245,13 @@
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NLS="
+		append-flags "-isystem /usr/${CTARGET}/usr/include"
+		append-ldflags "-L${WORKDIR}/lib/libc"
 
 		bootstrap_csu
 
-		append-flags "-isystem /usr/${CTARGET}/usr/include"
-
 		bootstrap_libssp_nonshared
 
-		append-ldflags "-L${WORKDIR}/lib/libc"
-		export RAW_LDFLAGS=$(raw-ldflags)
-
 		SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
 	else
 		# Forces to use the local copy of headers as they might be outdated in
@@ -263,11 +260,11 @@
 
 		bootstrap_libssp_nonshared
 
-		export RAW_LDFLAGS=$(raw-ldflags)
-
 		SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
 	fi
 
+	export RAW_LDFLAGS=$(raw-ldflags)
+
 	# Everything is now setup, build it!
 	for i in ${SUBDIRS} ; do
 		cd "${WORKDIR}/${i}/" || die "missing ${i}."






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-18  1:48 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-18  1:48 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/18 01:48:00

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Preinstall headers only with USE=build
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.131                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.130&r2=1.131

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- ChangeLog	18 May 2012 01:35:07 -0000	1.130
+++ ChangeLog	18 May 2012 01:48:00 -0000	1.131
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.130 2012/05/18 01:35:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.131 2012/05/18 01:48:00 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Preinstall headers only with USE=build
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Factorize some more code and regroup variable assignments.



1.17                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.16&r2=1.17

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- freebsd-lib-9.0-r2.ebuild	18 May 2012 01:35:07 -0000	1.16
+++ freebsd-lib-9.0-r2.ebuild	18 May 2012 01:48:00 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.16 2012/05/18 01:35:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.17 2012/05/18 01:48:00 aballier Exp $
 
 EAPI=2
 
@@ -173,10 +173,6 @@
 		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
 	fi
 
-	# Preinstall includes so we don't use the system's ones.
-	mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
-	install_includes "/include_proper"
-
 	# Let arch-specific includes to be found
 	local machine
 	machine=$(tc-arch-kernel ${CTARGET})
@@ -254,9 +250,9 @@
 
 		SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
 	else
-		# Forces to use the local copy of headers as they might be outdated in
-		# the system
-		append-flags "-isystem '${WORKDIR}/include_proper'"
+		# Forces to use the local copy of headers with USE=build as they might
+		# be outdated in the system. Assume they are fine otherwise.
+		use build && append-flags "-isystem '${WORKDIR}/include_proper'"
 
 		bootstrap_libssp_nonshared
 






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-18  2:03 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-18  2:03 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/18 02:03:29

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Set the ssp_nonshared LDADD in its bootstrapping function. Add it only with USE=build, assume we have the ldscript in place if not.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.132                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.131&r2=1.132

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog	18 May 2012 01:48:00 -0000	1.131
+++ ChangeLog	18 May 2012 02:03:29 -0000	1.132
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.131 2012/05/18 01:48:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.132 2012/05/18 02:03:29 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Set the ssp_nonshared LDADD in its bootstrapping function. Add it only with
+  USE=build, assume we have the ldscript in place if not.
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Preinstall headers only with USE=build



1.18                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.17&r2=1.18

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- freebsd-lib-9.0-r2.ebuild	18 May 2012 01:48:00 -0000	1.17
+++ freebsd-lib-9.0-r2.ebuild	18 May 2012 02:03:29 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.17 2012/05/18 01:48:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.18 2012/05/18 02:03:29 aballier Exp $
 
 EAPI=2
 
@@ -215,6 +215,7 @@
 	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
 	freebsd_src_compile
 	append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	export LDADD="-lssp_nonshared"
 }
 
 src_compile() {
@@ -254,7 +255,7 @@
 		# be outdated in the system. Assume they are fine otherwise.
 		use build && append-flags "-isystem '${WORKDIR}/include_proper'"
 
-		bootstrap_libssp_nonshared
+		use build && bootstrap_libssp_nonshared
 
 		SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
 	fi
@@ -264,7 +265,7 @@
 	# Everything is now setup, build it!
 	for i in ${SUBDIRS} ; do
 		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		LDADD="-lssp_nonshared" freebsd_src_compile || die "make ${i} failed"
+		freebsd_src_compile || die "make ${i} failed"
 	done
 }
 






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-18 16:17 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-18 16:17 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/18 16:17:08

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Add two variables for non native and native subdirs and define it in only one place.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.133                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.132&r2=1.133

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- ChangeLog	18 May 2012 02:03:29 -0000	1.132
+++ ChangeLog	18 May 2012 16:17:08 -0000	1.133
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.132 2012/05/18 02:03:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.133 2012/05/18 16:17:08 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Add two variables for non native and native subdirs and define it in only one
+  place.
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Set the ssp_nonshared LDADD in its bootstrapping function. Add it only with



1.19                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.18&r2=1.19

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- freebsd-lib-9.0-r2.ebuild	18 May 2012 02:03:29 -0000	1.18
+++ freebsd-lib-9.0-r2.ebuild	18 May 2012 16:17:08 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.18 2012/05/18 02:03:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.19 2012/05/18 16:17:08 aballier Exp $
 
 EAPI=2
 
@@ -218,6 +218,13 @@
 	export LDADD="-lssp_nonshared"
 }
 
+# What to build for a non-native build: cross-compiler, non-native abi in
+# multilib. We also need the csu but this has to be handled separately.
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
+
+# Subdirs for a native build:
+NATIVE_SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -249,7 +256,7 @@
 
 		bootstrap_libssp_nonshared
 
-		SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
+		SUBDIRS="${NON_NATIVE_SUBDIRS}"
 	else
 		# Forces to use the local copy of headers with USE=build as they might
 		# be outdated in the system. Assume they are fine otherwise.
@@ -257,7 +264,7 @@
 
 		use build && bootstrap_libssp_nonshared
 
-		SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
+		SUBDIRS="${NATIVE_SUBDIRS}"
 	fi
 
 	export RAW_LDFLAGS=$(raw-ldflags)
@@ -320,13 +327,13 @@
 			INCLUDEDIR=/usr/${CTARGET}/usr/include \
 			SHLIBDIR=/usr/${CTARGET}/usr/lib \
 			LIBDIR=/usr/${CTARGET}/usr/lib"
-		SUBDIRS="$(get_csudir $(tc-arch-kernel ${CTARGET})) lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
+		SUBDIRS="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${NON_NATIVE_SUBDIRS}"
 
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		# Set SHLIBDIR and LIBDIR for multilib
 		mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-		SUBDIRS="gnu/lib/libssp lib gnu/lib/libregex"
+		SUBDIRS="${NATIVE_SUBDIRS}"
 	fi
 
 	for i in ${SUBDIRS} ; do






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-18 16:37 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-18 16:37 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/18 16:37:26

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  bootstrap the csu with USE=build too
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.134                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.133&r2=1.134

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ChangeLog	18 May 2012 16:17:08 -0000	1.133
+++ ChangeLog	18 May 2012 16:37:26 -0000	1.134
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.133 2012/05/18 16:17:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.134 2012/05/18 16:37:26 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  bootstrap the csu with USE=build too
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Add two variables for non native and native subdirs and define it in only one



1.20                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.19&r2=1.20

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- freebsd-lib-9.0-r2.ebuild	18 May 2012 16:17:08 -0000	1.19
+++ freebsd-lib-9.0-r2.ebuild	18 May 2012 16:37:26 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.19 2012/05/18 16:17:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.20 2012/05/18 16:37:26 aballier Exp $
 
 EAPI=2
 
@@ -262,6 +262,7 @@
 		# be outdated in the system. Assume they are fine otherwise.
 		use build && append-flags "-isystem '${WORKDIR}/include_proper'"
 
+		use build && bootstrap_csu
 		use build && bootstrap_libssp_nonshared
 
 		SUBDIRS="${NATIVE_SUBDIRS}"






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-18 17:38 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-18 17:38 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/18 17:38:01

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  factorize the bootstrapping code between cross and native builds.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.135                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.134&r2=1.135

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog	18 May 2012 16:37:26 -0000	1.134
+++ ChangeLog	18 May 2012 17:38:01 -0000	1.135
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.134 2012/05/18 16:37:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.135 2012/05/18 17:38:01 aballier Exp $
+
+  18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  factorize the bootstrapping code between cross and native builds.
 
   18 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   bootstrap the csu with USE=build too



1.21                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.20&r2=1.21

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- freebsd-lib-9.0-r2.ebuild	18 May 2012 16:37:26 -0000	1.20
+++ freebsd-lib-9.0-r2.ebuild	18 May 2012 17:38:01 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.20 2012/05/18 16:37:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.21 2012/05/18 17:38:01 aballier Exp $
 
 EAPI=2
 
@@ -225,6 +225,18 @@
 # Subdirs for a native build:
 NATIVE_SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
 
+# Do we need to bootstrap the csu and libssp_nonshared?
+need_bootstrap() {
+	[ "${CTARGET}" != "${CHOST}" ] || use build
+}
+
+# Bootstrap the core libraries and setup the flags so that the other parts can
+# build against it.
+do_bootstrap() {
+	bootstrap_csu
+	bootstrap_libssp_nonshared
+}
+
 src_compile() {
 	# Does not work with GNU sed
 	# Force BSD's sed on BSD.
@@ -251,23 +263,16 @@
 		mymakeopts="${mymakeopts} NLS="
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
 		append-ldflags "-L${WORKDIR}/lib/libc"
-
-		bootstrap_csu
-
-		bootstrap_libssp_nonshared
-
 		SUBDIRS="${NON_NATIVE_SUBDIRS}"
 	else
 		# Forces to use the local copy of headers with USE=build as they might
 		# be outdated in the system. Assume they are fine otherwise.
 		use build && append-flags "-isystem '${WORKDIR}/include_proper'"
-
-		use build && bootstrap_csu
-		use build && bootstrap_libssp_nonshared
-
 		SUBDIRS="${NATIVE_SUBDIRS}"
 	fi
 
+	need_bootstrap && do_bootstrap
+
 	export RAW_LDFLAGS=$(raw-ldflags)
 
 	# Everything is now setup, build it!






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-23 21:46 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-23 21:46 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/23 21:46:50

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Add the grounds for multilib and a very very basic multilib support: we only build the csu parts for now.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.138                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.137&r2=1.138

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- ChangeLog	22 May 2012 16:04:30 -0000	1.137
+++ ChangeLog	23 May 2012 21:46:50 -0000	1.138
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.137 2012/05/22 16:04:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.138 2012/05/23 21:46:50 aballier Exp $
+
+  23 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Add the grounds for multilib and a very very basic multilib support: we only
+  build the csu parts for now.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> freebsd-lib-8.0.ebuild,
   freebsd-lib-8.2-r1.ebuild, freebsd-lib-9.0-r1.ebuild,



1.24                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.23&r2=1.24

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- freebsd-lib-9.0-r2.ebuild	22 May 2012 16:04:30 -0000	1.23
+++ freebsd-lib-9.0-r2.ebuild	23 May 2012 21:46:50 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.23 2012/05/22 16:04:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.24 2012/05/23 21:46:50 aballier Exp $
 
 EAPI=2
 
@@ -56,7 +56,7 @@
 
 IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
 	build bootstrap crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD"
+	userland_GNU userland_BSD multilib"
 
 pkg_setup() {
 	[ -c /dev/zero ] || \
@@ -114,6 +114,11 @@
 	libcom_err libtelnet
 	libelf libedit"
 
+# Are we building a cross-compiler?
+is_crosscompile() {
+	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
+}
+
 src_prepare() {
 	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
 	sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile"
@@ -150,6 +155,10 @@
 		libsmb; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
 		die "Problem fixing \"${dir}/Makefile"
 	done
+	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
+	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
+		-i "${S}/csu/i386-elf/Makefile" \
+		-i "${S}/csu/ia64/Makefile" || die
 	if use build; then
 		cd "${WORKDIR}"
 		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
@@ -161,7 +170,7 @@
 		return 0
 	fi
 
-	if [ "${CTARGET}" = "${CHOST}" ]; then
+	if ! is_crosscompile ; then
 		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
 	else
 		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
@@ -181,10 +190,6 @@
 
 	cd "${S}"
 	use bootstrap && dummy_mk libstand
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
 	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
 	# BSD's sed on BSD.
 	if use userland_GNU; then
@@ -225,16 +230,71 @@
 # Subdirs for a native build:
 NATIVE_SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
 
+# Is my $ABI native ?
+is_native_abi() {
+	is_crosscompile && return 0
+	use multilib || return 1
+	[ "${ABI}" = "${DEFAULT_ABI}" ]
+}
+
 # Do we need to bootstrap the csu and libssp_nonshared?
 need_bootstrap() {
-	[ "${CTARGET}" != "${CHOST}" ] || use build
+	is_crosscompile || use build || !is_native_abi
+}
+
+# Get the subdirs we are building.
+get_subdirs() {
+	local ret=""
+	if is_native_abi ; then
+		# If we are building for the native ABI, build everything
+		ret="${NATIVE_SUBDIRS}"
+	elif is_crosscompile ; then
+		# With a cross-compiler we only build the very core parts.
+		ret="${NON_NATIVE_SUBDIRS}"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			# Add the csu dir first when installing. We treat it separately for
+			# compiling.
+			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
+		fi
+	elif use build ; then
+		# For the non-native ABIs we only build the csu parts.
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST}))"
+		fi
+	else
+		# Only build the csu parts for now.
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST}))"
+		fi
+		# Finally, with a non-native ABI without USE=build, we build everything
+		# too.
+		#ret="${NATIVE_SUBDIRS}"
+	fi
+	echo "${ret}"
 }
 
 # Bootstrap the core libraries and setup the flags so that the other parts can
 # build against it.
 do_bootstrap() {
+	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
 	bootstrap_csu
-	bootstrap_libssp_nonshared
+	is_native_abi && bootstrap_libssp_nonshared
+}
+
+# Compile it. Assume we have the toolchain setup correctly.
+do_compile() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	need_bootstrap && do_bootstrap
+
+	export RAW_LDFLAGS=$(raw-ldflags)
+
+	# Everything is now setup, build it!
+	for i in $(get_subdirs) ; do
+		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_compile || die "make ${i} failed"
+	done
 }
 
 src_compile() {
@@ -257,29 +317,53 @@
 	# needed flags after all
 	strip-flags
 	export NOFLAGSTRIP=yes
-	if [ "${CTARGET}" != "${CHOST}" ]; then
+	if is_crosscompile ; then
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NLS="
 		append-flags "-isystem /usr/${CTARGET}/usr/include"
 		append-ldflags "-L${WORKDIR}/lib/libc"
-		SUBDIRS="${NON_NATIVE_SUBDIRS}"
-	else
+	fi
+
+	if is_crosscompile ; then
+		do_compile
+	elif ! use multilib ; then
 		# Forces to use the local copy of headers with USE=build as they might
 		# be outdated in the system. Assume they are fine otherwise.
 		use build && append-flags "-isystem '${WORKDIR}/include_proper'"
-		SUBDIRS="${NATIVE_SUBDIRS}"
+		do_compile
+	else
+		for ABI in $(get_all_abis) ; do
+			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				export ${i}_SAVE="${!i}"
+			done
+
+			multilib_toolchain_setup ${ABI}
+
+			local target="$(tc-arch-kernel ${CHOST})"
+			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
+			if ! is_native_abi ; then
+				mymakeopts="${mymakeopts} COMPAT_32BIT="
+				einfo "Pre-installing includes in include_proper_${ABI}"
+				mkdir "${WORKDIR}/include_proper_${ABI}" || die
+				CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
+				CC="${CC} -isystem ${WORKDIR}/include_proper_${ABI}"
+			else
+				use build && append-flags "-isystem '${WORKDIR}/include_proper'" ;
+			fi
+
+			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
+
+			CTARGET="${CHOST}" do_compile
+
+			# Restore the variables now.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				ii="${i}_SAVE"
+				export ${i}="${!ii}"
+			done
+		done
 	fi
-
-	need_bootstrap && do_bootstrap
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	# Everything is now setup, build it!
-	for i in ${SUBDIRS} ; do
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
 }
 
 gen_libc_ldscript() {
@@ -317,6 +401,14 @@
 END_LDSCRIPT
 }
 
+do_install() {
+	for i in $(get_subdirs) ; do
+		einfo "Installing in ${i}..."
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_install || die "Install ${i} failed"
+	done
+}
+
 src_install() {
 	[ "${CTARGET}" = "${CHOST}" ] \
 		&& INCLUDEDIR="/usr/include" \
@@ -328,27 +420,32 @@
 	use crosscompile_opts_headers-only && return 0
 	local mylibdir=$(get_libdir)
 
-	if [ "${CTARGET}" != "${CHOST}" ]; then
+	if is_crosscompile ; then
 		mymakeopts="${mymakeopts} NO_MAN= \
 			INCLUDEDIR=/usr/${CTARGET}/usr/include \
 			SHLIBDIR=/usr/${CTARGET}/usr/lib \
 			LIBDIR=/usr/${CTARGET}/usr/lib"
-		SUBDIRS="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${NON_NATIVE_SUBDIRS}"
 
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+		do_install
 	else
-		# Set SHLIBDIR and LIBDIR for multilib
-		mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
-		SUBDIRS="${NATIVE_SUBDIRS}"
+		if ! use multilib ; then
+			# Set SHLIBDIR and LIBDIR for multilib
+			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
+			do_install
+		else
+			for ABI in $(get_all_abis) ; do
+				mymakeopts_SAVE="${mymakeopts}"
+				multilib_toolchain_setup ${ABI}
+				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+				do_install
+				mymakeopts="${mymakeopts_SAVE}"
+			done
+		fi
 	fi
 
-	for i in ${SUBDIRS} ; do
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_install || die "Install ${i} failed"
-	done
-
 	# Don't install the rest of the configuration files if crosscompiling
-	if [ "${CTARGET}" != "${CHOST}" ] ; then
+	if is_crosscompile ; then
 		# This is to get it stripped with the correct tools, otherwise it gets
 		# stripped with the host strip.
 		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
@@ -409,7 +506,8 @@
 
 	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
 	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \
+		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+		DESTDIR="${DESTDIR}" \
 		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
 		BINGRP="${BINGRP}" || die "install_includes() failed"
 	einfo "includes installed ok."






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-24 11:02 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-24 11:02 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/24 11:02:31

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Fix a typo and set MAKEOBJDIRPREFIX when installing too.
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.139                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.139&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.139&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.138&r2=1.139

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- ChangeLog	23 May 2012 21:46:50 -0000	1.138
+++ ChangeLog	24 May 2012 11:02:31 -0000	1.139
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.138 2012/05/23 21:46:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.139 2012/05/24 11:02:31 aballier Exp $
+
+  24 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Fix a typo and set MAKEOBJDIRPREFIX when installing too.
+
+  23 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Add the grounds for multilib and a very very basic multilib support: we only
+  build the csu parts for now.
 
   23 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Add the grounds for multilib and a very very basic multilib support: we only



1.25                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.24&r2=1.25

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- freebsd-lib-9.0-r2.ebuild	23 May 2012 21:46:50 -0000	1.24
+++ freebsd-lib-9.0-r2.ebuild	24 May 2012 11:02:31 -0000	1.25
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.24 2012/05/23 21:46:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.25 2012/05/24 11:02:31 aballier Exp $
 
 EAPI=2
 
@@ -239,7 +239,7 @@
 
 # Do we need to bootstrap the csu and libssp_nonshared?
 need_bootstrap() {
-	is_crosscompile || use build || !is_native_abi
+	is_crosscompile || use build || ! is_native_abi
 }
 
 # Get the subdirs we are building.
@@ -402,6 +402,7 @@
 }
 
 do_install() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
 	for i in $(get_subdirs) ; do
 		einfo "Installing in ${i}..."
 		cd "${WORKDIR}/${i}/" || die "missing ${i}."






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-24 12:15 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-24 12:15 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/24 12:15:46

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  build and install more libraries with multilib
  
  (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

Revision  Changes    Path
1.140                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.139&r2=1.140

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- ChangeLog	24 May 2012 11:02:31 -0000	1.139
+++ ChangeLog	24 May 2012 12:15:46 -0000	1.140
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.139 2012/05/24 11:02:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.140 2012/05/24 12:15:46 aballier Exp $
+
+  24 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  build and install more libraries with multilib
 
   24 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   Fix a typo and set MAKEOBJDIRPREFIX when installing too.



1.26                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.25&r2=1.26

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- freebsd-lib-9.0-r2.ebuild	24 May 2012 11:02:31 -0000	1.25
+++ freebsd-lib-9.0-r2.ebuild	24 May 2012 12:15:46 -0000	1.26
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.25 2012/05/24 11:02:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.26 2012/05/24 12:15:46 aballier Exp $
 
 EAPI=2
 
@@ -257,14 +257,17 @@
 			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
 		fi
 	elif use build ; then
-		# For the non-native ABIs we only build the csu parts.
+		# For the non-native ABIs we only build the csu parts and very core
+		# libraries for now.
+		ret="lib/libcompiler_rt gnu/lib/libssp/libssp_nonshared"
 		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST}))"
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
 		fi
 	else
-		# Only build the csu parts for now.
+		# Only build the csu parts and core libraries for now.
+		ret="lib/libcompiler_rt gnu/lib/libssp/libssp_nonshared"
 		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST}))"
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
 		fi
 		# Finally, with a non-native ABI without USE=build, we build everything
 		# too.
@@ -348,7 +351,7 @@
 				einfo "Pre-installing includes in include_proper_${ABI}"
 				mkdir "${WORKDIR}/include_proper_${ABI}" || die
 				CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-				CC="${CC} -isystem ${WORKDIR}/include_proper_${ABI}"
+				CC="${CC} -I${WORKDIR}/include_proper_${ABI}"
 			else
 				use build && append-flags "-isystem '${WORKDIR}/include_proper'" ;
 			fi






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-25 12:24 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-25 12:24 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/25 12:24:04

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Add a patch to libthr fixing mutex issues encountered with glib.
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.142                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.141&r2=1.142

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- ChangeLog	25 May 2012 04:13:19 -0000	1.141
+++ ChangeLog	25 May 2012 12:24:04 -0000	1.142
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.141 2012/05/25 04:13:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.142 2012/05/25 12:24:04 aballier Exp $
+
+  25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild,
+  +files/freebsd-lib-9.0-trylock-adaptive.patch:
+  Add a patch to libthr fixing mutex issues encountered with glib.
 
   25 May 2012; Naohiro Aota <naota@gentoo.org> freebsd-lib-8.0.ebuild,
   freebsd-lib-8.2-r1.ebuild, freebsd-lib-9.0-r1.ebuild,



1.28                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.27&r2=1.28

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freebsd-lib-9.0-r2.ebuild	25 May 2012 04:13:19 -0000	1.27
+++ freebsd-lib-9.0-r2.ebuild	25 May 2012 12:24:04 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.27 2012/05/25 04:13:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.28 2012/05/25 12:24:04 aballier Exp $
 
 EAPI=2
 
@@ -90,7 +90,8 @@
 	"${FILESDIR}/${PN}-6.1-csu.patch"
 	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
 	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+	"${FILESDIR}/${PN}-bsdxml2expat.patch"
+	"${FILESDIR}/${PN}-9.0-trylock-adaptive.patch" )
 
 # Here we disable and remove source which we don't need or want
 # In order:






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-25 12:27 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-25 12:27 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/25 12:27:00

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  replace -isystem path by -Ipath as append-flags seems not to like the former anymore
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.143                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.143&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.143&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.142&r2=1.143

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ChangeLog	25 May 2012 12:24:04 -0000	1.142
+++ ChangeLog	25 May 2012 12:27:00 -0000	1.143
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.142 2012/05/25 12:24:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.143 2012/05/25 12:27:00 aballier Exp $
+
+  25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  replace -isystem path by -Ipath as append-flags seems not to like the former
+  anymore
 
   25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild,
   +files/freebsd-lib-9.0-trylock-adaptive.patch:



1.29                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.28&r2=1.29

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- freebsd-lib-9.0-r2.ebuild	25 May 2012 12:24:04 -0000	1.28
+++ freebsd-lib-9.0-r2.ebuild	25 May 2012 12:27:00 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.28 2012/05/25 12:24:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.29 2012/05/25 12:27:00 aballier Exp $
 
 EAPI=2
 
@@ -328,7 +328,7 @@
 		export YACC='yacc -by'
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NLS="
-		append-flags "-isystem /usr/${CTARGET}/usr/include"
+		append-flags "-I/usr/${CTARGET}/usr/include"
 		append-ldflags "-L${WORKDIR}/lib/libc"
 	fi
 
@@ -337,7 +337,7 @@
 	elif ! use multilib ; then
 		# Forces to use the local copy of headers with USE=build as they might
 		# be outdated in the system. Assume they are fine otherwise.
-		use build && append-flags "-isystem '${WORKDIR}/include_proper'"
+		use build && append-flags "-I${WORKDIR}/include_proper"
 		do_compile
 	else
 		for ABI in $(get_all_abis) ; do
@@ -357,7 +357,7 @@
 				CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
 				CC="${CC} -I${WORKDIR}/include_proper_${ABI}"
 			else
-				use build && append-flags "-isystem '${WORKDIR}/include_proper'" ;
+				use build && append-flags "-I${WORKDIR}/include_proper" ;
 			fi
 
 			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-25 12:37 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-25 12:37 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/25 12:37:04

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  fix paths I broke by the addition of MAKEOBJDIRPREFIX
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.144                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.143&r2=1.144

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog	25 May 2012 12:27:00 -0000	1.143
+++ ChangeLog	25 May 2012 12:37:04 -0000	1.144
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.143 2012/05/25 12:27:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.144 2012/05/25 12:37:04 aballier Exp $
+
+  25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  fix paths I broke by the addition of MAKEOBJDIRPREFIX
 
   25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   replace -isystem path by -Ipath as append-flags seems not to like the former



1.30                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.29&r2=1.30

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- freebsd-lib-9.0-r2.ebuild	25 May 2012 12:27:00 -0000	1.29
+++ freebsd-lib-9.0-r2.ebuild	25 May 2012 12:37:04 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.29 2012/05/25 12:27:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.30 2012/05/25 12:37:04 aballier Exp $
 
 EAPI=2
 
@@ -212,15 +212,15 @@
 	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
 	freebsd_src_compile
 
-	append-flags "-B ${WORKDIR}/${csudir}"
-	append-ldflags "-B ${WORKDIR}/${csudir}"
+	append-flags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
 }
 
 # Compile libssp_nonshared.a and add it's path to LDFLAGS.
 bootstrap_libssp_nonshared() {
 	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
 	freebsd_src_compile
-	append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
 	export LDADD="-lssp_nonshared"
 }
 
@@ -329,7 +329,7 @@
 		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
 		mymakeopts="${mymakeopts} NLS="
 		append-flags "-I/usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/lib/libc"
+		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
 	fi
 
 	if is_crosscompile ; then






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-25 13:56 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-25 13:56 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/25 13:56:25

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Fix some missing includes warnings.
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.145                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.144&r2=1.145

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog	25 May 2012 12:37:04 -0000	1.144
+++ ChangeLog	25 May 2012 13:56:25 -0000	1.145
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.144 2012/05/25 12:37:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.145 2012/05/25 13:56:25 aballier Exp $
+
+  25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild,
+  +files/freebsd-lib-9.0-opieincludes.patch:
+  Fix some missing includes warnings.
 
   25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   fix paths I broke by the addition of MAKEOBJDIRPREFIX



1.31                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.30&r2=1.31

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- freebsd-lib-9.0-r2.ebuild	25 May 2012 12:37:04 -0000	1.30
+++ freebsd-lib-9.0-r2.ebuild	25 May 2012 13:56:25 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.30 2012/05/25 12:37:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.31 2012/05/25 13:56:25 aballier Exp $
 
 EAPI=2
 
@@ -143,6 +143,7 @@
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}/${PN}-includes.patch"
 	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
+	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
 
 	# Don't install the hesiod man page or header
 	rm "${WORKDIR}"/include/hesiod.h || die






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-25 14:58 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-25 14:58 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/25 14:58:59

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  Do not build libssp, we really only need libssp_nonshared.
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.147                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.146&r2=1.147

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog	25 May 2012 14:11:31 -0000	1.146
+++ ChangeLog	25 May 2012 14:58:59 -0000	1.147
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.146 2012/05/25 14:11:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.147 2012/05/25 14:58:59 aballier Exp $
+
+  25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
+  Do not build libssp, we really only need libssp_nonshared.
 
   25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   drop noop sed



1.33                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.32&r2=1.33

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- freebsd-lib-9.0-r2.ebuild	25 May 2012 14:11:31 -0000	1.32
+++ freebsd-lib-9.0-r2.ebuild	25 May 2012 14:58:59 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.32 2012/05/25 14:11:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.33 2012/05/25 14:58:59 aballier Exp $
 
 EAPI=2
 
@@ -226,10 +226,10 @@
 
 # What to build for a non-native build: cross-compiler, non-native abi in
 # multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp lib/libthr lib/libutil"
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
 
 # Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp gnu/lib/libregex"
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
 
 # Is my $ABI native ?
 is_native_abi() {
@@ -501,11 +501,6 @@
 		BINGRP="${GROUPS}"
 	fi
 
-	# This is for ssp/ssp.h.
-	einfo "Building ssp.h"
-	cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp"
-	$(freebsd_get_bmake) ssp.h || die "problem building ssp.h"
-
 	# Must exist before we use it.
 	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
 	cd "${WORKDIR}/include"
@@ -519,7 +514,7 @@
 		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
 		BINGRP="${BINGRP}" || die "install_includes() failed"
 	einfo "includes installed ok."
-	EXTRA_INCLUDES="gnu/lib/libssp lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
+	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
 	for i in $EXTRA_INCLUDES; do
 		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
 		cd "${WORKDIR}/$i" || die






^ permalink raw reply	[flat|nested] 30+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild
@ 2012-05-25 15:51 Alexis Ballier (aballier)
  0 siblings, 0 replies; 30+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-25 15:51 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/25 15:51:04

  Modified:             ChangeLog freebsd-lib-9.0-r2.ebuild
  Log:
  add the sysctlt fix from freebsd-sources here too with USE=build
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.149                sys-freebsd/freebsd-lib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.149&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?rev=1.149&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog?r1=1.148&r2=1.149

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- ChangeLog	25 May 2012 15:14:11 -0000	1.148
+++ ChangeLog	25 May 2012 15:51:04 -0000	1.149
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.148 2012/05/25 15:14:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.149 2012/05/25 15:51:04 aballier Exp $
+
+  25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild,
+  +files/freebsd-sources-9.0-sysctluint.patch:
+  add the sysctlt fix from freebsd-sources here too with USE=build
 
   25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild:
   bootstrap libssp_nonshared when needed.



1.35                 sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild?r1=1.34&r2=1.35

Index: freebsd-lib-9.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- freebsd-lib-9.0-r2.ebuild	25 May 2012 15:14:11 -0000	1.34
+++ freebsd-lib-9.0-r2.ebuild	25 May 2012 15:51:04 -0000	1.35
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.34 2012/05/25 15:14:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.35 2012/05/25 15:51:04 aballier Exp $
 
 EAPI=2
 
@@ -165,6 +165,7 @@
 		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
 		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
 		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
+		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
 		# Preinstall includes so we don't use the system's ones.
 		mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
 		install_includes "/include_proper"






^ permalink raw reply	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2012-05-25 15:51 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-17 14:33 [gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-lib: ChangeLog freebsd-lib-9.0-r2.ebuild Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2012-05-25 15:51 Alexis Ballier (aballier)
2012-05-25 14:58 Alexis Ballier (aballier)
2012-05-25 13:56 Alexis Ballier (aballier)
2012-05-25 12:37 Alexis Ballier (aballier)
2012-05-25 12:27 Alexis Ballier (aballier)
2012-05-25 12:24 Alexis Ballier (aballier)
2012-05-24 12:15 Alexis Ballier (aballier)
2012-05-24 11:02 Alexis Ballier (aballier)
2012-05-23 21:46 Alexis Ballier (aballier)
2012-05-18 17:38 Alexis Ballier (aballier)
2012-05-18 16:37 Alexis Ballier (aballier)
2012-05-18 16:17 Alexis Ballier (aballier)
2012-05-18  2:03 Alexis Ballier (aballier)
2012-05-18  1:48 Alexis Ballier (aballier)
2012-05-18  1:35 Alexis Ballier (aballier)
2012-05-18  1:31 Alexis Ballier (aballier)
2012-05-17 20:03 Alexis Ballier (aballier)
2012-05-17 19:21 Alexis Ballier (aballier)
2012-05-17 19:04 Alexis Ballier (aballier)
2012-05-17 18:46 Alexis Ballier (aballier)
2012-05-17 18:31 Alexis Ballier (aballier)
2012-05-17 18:13 Alexis Ballier (aballier)
2012-05-17 17:59 Alexis Ballier (aballier)
2012-05-17 16:58 Alexis Ballier (aballier)
2012-05-17 16:25 Alexis Ballier (aballier)
2012-05-17 13:59 Alexis Ballier (aballier)
2012-05-17 12:48 Alexis Ballier (aballier)
2012-05-17 12:46 Alexis Ballier (aballier)
2012-05-16 16:12 Alexis Ballier (aballier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox