public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-08-09 19:29 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-09 19:29 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/09 19:29:51

  Modified:             freebsd.eclass
  Log:
  move install -l emulation exports to src_unpack. it should be called by every ebuild.

Revision  Changes    Path
1.33                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- freebsd.eclass	9 Aug 2013 16:28:26 -0000	1.32
+++ freebsd.eclass	9 Aug 2013 19:29:51 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.32 2013/08/09 16:28:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.33 2013/08/09 19:29:51 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -97,6 +97,13 @@
 
 	freebsd_do_patches
 	freebsd_rename_libraries
+
+	# Starting from FreeBSD 9.2, its install command supports the -l option and
+	# they now use it. Emulate it if we are on a system that does not have it.
+	if [[ ${RV} > 9.1 ]] && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then
+		export INSTALL_LINK="ln -f"
+		export INSTALL_SYMLINK="ln -fs"
+	fi
 }
 
 freebsd_src_compile() {
@@ -108,13 +115,6 @@
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 
-	# Starting from FreeBSD 9.2, its install command supports the -l option and
-	# they now use it. Emulate it if we are on a system that does not have it.
-	if [[ ${RV} > 9.1 ]] && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then
-		export INSTALL_LINK="ln -f"
-		export INSTALL_SYMLINK="ln -fs"
-	fi
-
 	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
 	# tree builds easily.
 	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-08-28 15:56 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-28 15:56 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/28 15:56:11

  Modified:             freebsd.eclass
  Log:
  Add live build support. Bug #458570 by Yuta SATOH

Revision  Changes    Path
1.35                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- freebsd.eclass	9 Aug 2013 20:10:20 -0000	1.34
+++ freebsd.eclass	28 Aug 2013 15:56:11 -0000	1.35
@@ -1,11 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.34 2013/08/09 20:10:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.35 2013/08/28 15:56:11 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
 inherit versionator eutils flag-o-matic bsdmk
 
+# Drop patch level from ${PV}
+MY_PV=${PV/_p*}
+PLEVEL=${PV##*_p}
+
 LICENSE="BSD"
 HOMEPAGE="http://www.freebsd.org/"
 
@@ -28,7 +32,39 @@
 SECURE="freebsd-secure-${PV}"
 
 # Release version (5.3, 5.4, 6.0, etc)
-RV="$(get_version_component_range 1-2)"
+RV="$(get_version_component_range 1-2 ${MY_PV})"
+
+# SVN ebuild support.
+#   9.1.0.9999 -->	release/9.1.0
+#	9.1.9999   -->	releng/9.1
+#   9.9999     -->	stable/9
+#	9999 -->	head
+# 
+# svn revision can be specified by patch level:
+#	freebsd-lib-9.9999_p247000 --> set svn -r 247000
+
+if [[ ${MY_PV} == *9999* ]]; then
+	inherit subversion
+
+	# Set SVN revision using patch level.
+	[[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
+
+	case ${MY_PV%.9999} in
+		*.*.*)	BRANCH="release";;
+		*.*)	BRANCH="releng"	;;
+		9999)	BRANCH="head"	;;
+		*)	    BRANCH="stable"	;;
+	esac
+
+	if [[ ${BRANCH} == head ]]  ; then
+		SVN_SUB_URI="${BRANCH}"
+	else
+		SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
+	fi
+
+	ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
+	ESVN_PROJECT="freebsd-${BRANCH}"
+fi
 
 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
 	IUSE="profile"
@@ -91,7 +127,11 @@
 }
 
 freebsd_src_unpack() {
-	unpack ${A}
+	if [[ ${MY_PV} == *9999* ]]; then
+		S="${WORKDIR}" subversion_src_unpack
+	else
+		unpack ${A}
+	fi
 	cd "${S}"
 
 	dummy_mk ${REMOVE_SUBDIRS}





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-08-09 20:10 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-09 20:10 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/09 20:10:20

  Modified:             freebsd.eclass
  Log:
  define SECURE to handle the tarball.

Revision  Changes    Path
1.34                 eclass/freebsd.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.33&r2=1.34

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- freebsd.eclass	9 Aug 2013 19:29:51 -0000	1.33
+++ freebsd.eclass	9 Aug 2013 20:10:20 -0000	1.34
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.33 2013/08/09 19:29:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.34 2013/08/09 20:10:20 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -25,6 +25,7 @@
 INCLUDE="freebsd-include-${PV}"
 RESCUE="freebsd-rescue-${PV}"
 CDDL="freebsd-cddl-${PV}"
+SECURE="freebsd-secure-${PV}"
 
 # Release version (5.3, 5.4, 6.0, etc)
 RV="$(get_version_component_range 1-2)"





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-08-09 16:28 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-09 16:28 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/09 16:28:26

  Modified:             freebsd.eclass
  Log:
  freebsd_src_compile: forward arguments to bsdmk_src_compile

Revision  Changes    Path
1.32                 eclass/freebsd.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.31&r2=1.32

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- freebsd.eclass	9 Aug 2013 15:48:54 -0000	1.31
+++ freebsd.eclass	9 Aug 2013 16:28:26 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.31 2013/08/09 15:48:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.32 2013/08/09 16:28:26 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -121,7 +121,7 @@
 		mkmake obj || die
 	fi
 
-	bsdmk_src_compile
+	bsdmk_src_compile "$@"
 }
 
 # Helper function to make a multilib build with FreeBSD Makefiles.





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-08-09 15:48 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-09 15:48 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/09 15:48:54

  Modified:             freebsd.eclass
  Log:
  Emulate install -l, by Yuta SATOH

Revision  Changes    Path
1.31                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- freebsd.eclass	9 Aug 2013 13:58:47 -0000	1.30
+++ freebsd.eclass	9 Aug 2013 15:48:54 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.30 2013/08/09 13:58:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.31 2013/08/09 15:48:54 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -108,6 +108,13 @@
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 
+	# Starting from FreeBSD 9.2, its install command supports the -l option and
+	# they now use it. Emulate it if we are on a system that does not have it.
+	if [[ ${RV} > 9.1 ]] && ! has_version '>=sys-freebsd/freebsd-ubin-9.2_beta1' ; then
+		export INSTALL_LINK="ln -f"
+		export INSTALL_SYMLINK="ln -fs"
+	fi
+
 	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
 	# tree builds easily.
 	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-08-09 13:58 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-09 13:58 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/09 13:58:47

  Modified:             freebsd.eclass
  Log:
  freebsd_multilib_multibuild_wrapper: drop the requirement on having a multilib useflag. Fix some typos.

Revision  Changes    Path
1.30                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- freebsd.eclass	8 Jul 2013 02:08:44 -0000	1.29
+++ freebsd.eclass	9 Aug 2013 13:58:47 -0000	1.30
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.29 2013/07/08 02:08:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.30 2013/08/09 13:58:47 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -124,12 +124,11 @@
 #
 # Important note: To use this function you _have_ to:
 # - inherit multilib.eclass and multibuild.eclass
-# - set MULTILIB_VARIANTS
-# - have a multilib useflag in IUSE
+# - set MULTIBUILD_VARIANTS
 
 freebsd_multilib_multibuild_wrapper() {
 	# Get the ABI from multibuild.eclass
-	# This assumes MULTILIB_VARIANTS contains only valid ABIs.
+	# This assumes MULTIBUILD_VARIANTS contains only valid ABIs.
 	local ABI=${MULTIBUILD_VARIANT}
 
 	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
@@ -142,7 +141,7 @@
 
 	local target="$(tc-arch-kernel ${CHOST})"
 	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
-	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
 		mymakeopts="${mymakeopts} COMPAT_32BIT="
 	fi
 





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-07-08  2:08 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-07-08  2:08 UTC (permalink / raw
  To: gentoo-commits

aballier    13/07/08 02:08:44

  Modified:             freebsd.eclass
  Log:
  stop adding cflags for multilib, it is now done in the profiles

Revision  Changes    Path
1.29                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- freebsd.eclass	18 Jun 2013 17:30:56 -0000	1.28
+++ freebsd.eclass	8 Jul 2013 02:08:44 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.28 2013/06/18 17:30:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.29 2013/07/08 02:08:44 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -144,8 +144,6 @@
 	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
 	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
 		mymakeopts="${mymakeopts} COMPAT_32BIT="
-		# Teach gcc where to find crt* files.
-		export LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir) -B/usr/$(get_libdir)"
 	fi
 
 	einfo "Building for ABI=${ABI} and TARGET=${target}"





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-06-18 17:30 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-18 17:30 UTC (permalink / raw
  To: gentoo-commits

aballier    13/06/18 17:30:56

  Modified:             freebsd.eclass
  Log:
  Stop stripping flags and let people figure it out as it causes problems for multilib builds.

Revision  Changes    Path
1.28                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freebsd.eclass	18 Jun 2013 16:57:41 -0000	1.27
+++ freebsd.eclass	18 Jun 2013 17:30:56 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.27 2013/06/18 16:57:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.28 2013/06/18 17:30:56 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -105,9 +105,6 @@
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
 
-	# Many things breaks when using ricer flags here
-	[[ -z "${NOFLAGSTRIP}" ]] && strip-flags
-
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-06-18 16:57 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-18 16:57 UTC (permalink / raw
  To: gentoo-commits

aballier    13/06/18 16:57:41

  Modified:             freebsd.eclass
  Log:
  Teach gcc where to find crt* files when doing a multilib build.

Revision  Changes    Path
1.27                 eclass/freebsd.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.26&r2=1.27

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- freebsd.eclass	17 Jun 2013 20:00:37 -0000	1.26
+++ freebsd.eclass	18 Jun 2013 16:57:41 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.26 2013/06/17 20:00:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.27 2013/06/18 16:57:41 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -147,6 +147,8 @@
 	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
 	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
 		mymakeopts="${mymakeopts} COMPAT_32BIT="
+		# Teach gcc where to find crt* files.
+		export LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir) -B/usr/$(get_libdir)"
 	fi
 
 	einfo "Building for ABI=${ABI} and TARGET=${target}"





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-06-17 20:00 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-17 20:00 UTC (permalink / raw
  To: gentoo-commits

aballier    13/06/17 20:00:37

  Modified:             freebsd.eclass
  Log:
  freebsd_multilib_multibuild_wrapper: save and restore LDADD too.

Revision  Changes    Path
1.26                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- freebsd.eclass	17 Jun 2013 17:31:30 -0000	1.25
+++ freebsd.eclass	17 Jun 2013 20:00:37 -0000	1.26
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.25 2013/06/17 17:31:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.26 2013/06/17 20:00:37 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -135,8 +135,8 @@
 	# This assumes MULTILIB_VARIANTS contains only valid ABIs.
 	local ABI=${MULTIBUILD_VARIANT}
 
-	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
-	for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS, LDADD and mymakeopts.
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
 		export ${i}_SAVE="${!i}"
 	done
 
@@ -159,7 +159,7 @@
 	CTARGET="${CHOST}" "$@"
 	
 	# Restore the variables now.
-	for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+	for i in CFLAGS CXXFLAGS LDFLAGS LDADD mymakeopts ; do
 		ii="${i}_SAVE"
 		export ${i}="${!ii}"
 	done





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2013-06-17 17:31 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-17 17:31 UTC (permalink / raw
  To: gentoo-commits

aballier    13/06/17 17:31:30

  Modified:             freebsd.eclass
  Log:
  Add a freebsd_multilib_multibuild_wrapper function to use it together with multibuild and multilib eclasses in order to simplify multilib handling.

Revision  Changes    Path
1.25                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- freebsd.eclass	24 Nov 2012 11:22:44 -0000	1.24
+++ freebsd.eclass	17 Jun 2013 17:31:30 -0000	1.25
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.24 2012/11/24 11:22:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.25 2013/06/17 17:31:30 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -120,6 +120,51 @@
 	bsdmk_src_compile
 }
 
+# Helper function to make a multilib build with FreeBSD Makefiles.
+# Usage: 
+# MULTIBUILD_VARIANTS=( $(get_all_abis) )
+# multibuild_foreach_variant freebsd_multilib_multibuild_wrapper my_function
+#
+# Important note: To use this function you _have_ to:
+# - inherit multilib.eclass and multibuild.eclass
+# - set MULTILIB_VARIANTS
+# - have a multilib useflag in IUSE
+
+freebsd_multilib_multibuild_wrapper() {
+	# Get the ABI from multibuild.eclass
+	# This assumes MULTILIB_VARIANTS contains only valid ABIs.
+	local ABI=${MULTIBUILD_VARIANT}
+
+	# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
+	for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+		export ${i}_SAVE="${!i}"
+	done
+
+	# Setup the variables specific to this ABI.
+	multilib_toolchain_setup "${ABI}"
+
+	local target="$(tc-arch-kernel ${CHOST})"
+	mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		mymakeopts="${mymakeopts} COMPAT_32BIT="
+	fi
+
+	einfo "Building for ABI=${ABI} and TARGET=${target}"
+
+	export MAKEOBJDIRPREFIX="${BUILD_DIR}"
+	if [ ! -d "${MAKEOBJDIRPREFIX}" ] ; then
+		mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	fi
+	
+	CTARGET="${CHOST}" "$@"
+	
+	# Restore the variables now.
+	for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+		ii="${i}_SAVE"
+		export ${i}="${!ii}"
+	done
+}
+
 freebsd_src_install() {
 	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2012-11-24 11:22 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2012-11-24 11:22 UTC (permalink / raw
  To: gentoo-commits

aballier    12/11/24 11:22:44

  Modified:             freebsd.eclass
  Log:
  Add epatch_user support in freebsd_do_patches, bug #444506 by Yuta SATOH

Revision  Changes    Path
1.24                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- freebsd.eclass	24 May 2012 11:19:53 -0000	1.23
+++ freebsd.eclass	24 Nov 2012 11:22:44 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.23 2012/05/24 11:19:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.24 2012/11/24 11:22:44 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -68,6 +68,7 @@
 			epatch "${x}"
 		done
 	fi
+	epatch_user
 }
 
 freebsd_rename_libraries() {





^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2012-05-24 11:19 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-24 11:19 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/24 11:19:53

  Modified:             freebsd.eclass
  Log:
  Typo in comment

Revision  Changes    Path
1.23                 eclass/freebsd.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.22&r2=1.23

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- freebsd.eclass	24 May 2012 11:18:46 -0000	1.22
+++ freebsd.eclass	24 May 2012 11:19:53 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.22 2012/05/24 11:18:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.23 2012/05/24 11:19:53 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -111,7 +111,7 @@
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 
 	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
-	# tree buils easily.
+	# tree builds easily.
 	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
 		mkmake obj || die
 	fi






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2012-05-24 11:18 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-24 11:18 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/24 11:18:46

  Modified:             freebsd.eclass
  Log:
  Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of tree buils easily.

Revision  Changes    Path
1.22                 eclass/freebsd.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.21&r2=1.22

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- freebsd.eclass	17 May 2012 13:58:08 -0000	1.21
+++ freebsd.eclass	24 May 2012 11:18:46 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.21 2012/05/17 13:58:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.22 2012/05/24 11:18:46 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -110,6 +110,12 @@
 	# Make sure to use FreeBSD definitions while crosscompiling
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 
+	# Create objdir if MAKEOBJDIRPREFIX is defined, so that we can make out of
+	# tree buils easily.
+	if [[ -n "${MAKEOBJDIRPREFIX}" ]] ; then
+		mkmake obj || die
+	fi
+
 	bsdmk_src_compile
 }
 






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2012-05-17 13:58 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-17 13:58 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/17 13:58:08

  Modified:             freebsd.eclass
  Log:
  make rename_libraries rename bsdxml to expat too.

Revision  Changes    Path
1.21                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- freebsd.eclass	16 May 2012 15:44:43 -0000	1.20
+++ freebsd.eclass	17 May 2012 13:58:08 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.20 2012/05/16 15:44:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.21 2012/05/17 13:58:08 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -81,6 +81,9 @@
 	# ncurses provides libncursesw not libcursesw
 	find "${S}" -name Makefile -print0 | xargs -0 \
 		sed -i -e 's:-lcursesw:-lncursesw:g'
+	# we use expat instead of bsdxml
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lbsdxml:-lexpat:g'
 
 	eend $?
 }






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2012-05-16 15:44 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-16 15:44 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/16 15:44:43

  Modified:             freebsd.eclass
  Log:
  Do not install programs or libraries with the system immutable flag; it is more annoying than useful.

Revision  Changes    Path
1.20                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- freebsd.eclass	4 May 2012 13:31:31 -0000	1.19
+++ freebsd.eclass	16 May 2012 15:44:43 -0000	1.20
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.19 2012/05/04 13:31:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.20 2012/05/16 15:44:43 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -99,7 +99,7 @@
 	use profile && filter-flags "-fomit-frame-pointer"
 	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS="
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
 
 	# Many things breaks when using ricer flags here
 	[[ -z "${NOFLAGSTRIP}" ]] && strip-flags
@@ -113,7 +113,7 @@
 freebsd_src_install() {
 	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS="
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NO_FSCHG="
 
 	[[ -z "${BMAKE}" ]] && BMAKE="$(freebsd_get_bmake)"
 






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2012-05-04 13:31 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2012-05-04 13:31 UTC (permalink / raw
  To: gentoo-commits

aballier    12/05/04 13:31:31

  Modified:             freebsd.eclass
  Log:
  drop support for freebsd5 and honour profile useflag for fbsd 8 and later

Revision  Changes    Path
1.19                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- freebsd.eclass	27 Dec 2011 17:55:12 -0000	1.18
+++ freebsd.eclass	4 May 2012 13:31:31 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.18 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.19 2012/05/04 13:31:31 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -97,11 +97,7 @@
 
 freebsd_src_compile() {
 	use profile && filter-flags "-fomit-frame-pointer"
-	use profile || \
-		case "${RV}" in
-			5.*) mymakeopts="${mymakeopts} NOPROFILE= " ;;
-			6.*|7.*) mymakeopts="${mymakeopts} NO_PROFILE= " ;;
-		esac
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS="
 
@@ -115,11 +111,7 @@
 }
 
 freebsd_src_install() {
-	use profile || \
-		case "${RV}" in
-			5.*) mymakeopts="${mymakeopts} NOPROFILE= " ;;
-			6.*|7.*) mymakeopts="${mymakeopts} NO_PROFILE= " ;;
-		esac
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
 
 	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS="
 






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2011-07-06  5:41 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2011-07-06  5:41 UTC (permalink / raw
  To: gentoo-commits

aballier    11/07/06 05:41:01

  Modified:             freebsd.eclass
  Log:
  be a bit more restrictive on how to math libl so that it doesnt match liblzma

Revision  Changes    Path
1.17                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- freebsd.eclass	5 Jul 2011 18:46:50 -0000	1.16
+++ freebsd.eclass	6 Jul 2011 05:41:01 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.16 2011/07/05 18:46:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.17 2011/07/06 05:41:01 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -77,7 +77,7 @@
 		sed -i -e 's:-ltermcap:-lncurses:g; s:{LIBTERMCAP}:{LIBNCURSES}:g'
 	# flex provides libfl, not libl
 	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i -e 's:-ll:-lfl:g; s:{LIBL}:{LIBFL}:g'
+		sed -i -e 's:-ll$:-lfl:g; s:-ll :-lfl :g; s:{LIBL}:{LIBFL}:g'
 	# ncurses provides libncursesw not libcursesw
 	find "${S}" -name Makefile -print0 | xargs -0 \
 		sed -i -e 's:-lcursesw:-lncursesw:g'






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2011-07-05 18:46 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2011-07-05 18:46 UTC (permalink / raw
  To: gentoo-commits

aballier    11/07/05 18:46:50

  Modified:             freebsd.eclass
  Log:
  rename libcursesw to libncursesw too

Revision  Changes    Path
1.16                 eclass/freebsd.eclass

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

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- freebsd.eclass	11 Mar 2010 17:55:55 -0000	1.15
+++ freebsd.eclass	5 Jul 2011 18:46:50 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.15 2010/03/11 17:55:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.16 2011/07/05 18:46:50 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -78,6 +78,9 @@
 	# flex provides libfl, not libl
 	find "${S}" -name Makefile -print0 | xargs -0 \
 		sed -i -e 's:-ll:-lfl:g; s:{LIBL}:{LIBFL}:g'
+	# ncurses provides libncursesw not libcursesw
+	find "${S}" -name Makefile -print0 | xargs -0 \
+		sed -i -e 's:-lcursesw:-lncursesw:g'
 
 	eend $?
 }






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2010-03-11 17:55 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2010-03-11 17:55 UTC (permalink / raw
  To: gentoo-commits

aballier    10/03/11 17:55:56

  Modified:             freebsd.eclass
  Log:
  Add CDDL tarball def.

Revision  Changes    Path
1.15                 eclass/freebsd.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/freebsd.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/freebsd.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/freebsd.eclass?r1=1.14&r2=1.15

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freebsd.eclass	22 May 2009 15:23:35 -0000	1.14
+++ freebsd.eclass	11 Mar 2010 17:55:55 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.14 2009/05/22 15:23:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.15 2010/03/11 17:55:55 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -24,6 +24,7 @@
 SYS="freebsd-sys-${PV}"
 INCLUDE="freebsd-include-${PV}"
 RESCUE="freebsd-rescue-${PV}"
+CDDL="freebsd-cddl-${PV}"
 
 # Release version (5.3, 5.4, 6.0, etc)
 RV="$(get_version_component_range 1-2)"






^ permalink raw reply	[flat|nested] 21+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
@ 2009-05-22 15:23 Alexis Ballier (aballier)
  0 siblings, 0 replies; 21+ messages in thread
From: Alexis Ballier (aballier) @ 2009-05-22 15:23 UTC (permalink / raw
  To: gentoo-commits

aballier    09/05/22 15:23:35

  Modified:             freebsd.eclass
  Log:
  add support for bash arrays in PATCHES, grabbed from base.eclass, maybe this should be factorized, we'll see about that later

Revision  Changes    Path
1.14                 eclass/freebsd.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/freebsd.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/freebsd.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/freebsd.eclass?r1=1.13&r2=1.14

Index: freebsd.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freebsd.eclass	21 Apr 2007 12:28:43 -0000	1.13
+++ freebsd.eclass	22 May 2009 15:23:35 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.13 2007/04/21 12:28:43 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.14 2009/05/22 15:23:35 aballier Exp $
 #
 # Diego Pettenò <flameeyes@gentoo.org>
 
@@ -58,9 +58,15 @@
 }
 
 freebsd_do_patches() {
-	for patch in ${PATCHES}; do
-		epatch "${patch}"
-	done
+	if [[ ${#PATCHES[@]} -gt 1 ]] ; then
+		for x in "${PATCHES[@]}"; do
+			epatch "${x}"
+		done
+	else
+		for x in ${PATCHES} ; do
+			epatch "${x}"
+		done
+	fi
 }
 
 freebsd_rename_libraries() {






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

end of thread, other threads:[~2013-08-28 15:56 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-09 19:29 [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2013-08-28 15:56 Alexis Ballier (aballier)
2013-08-09 20:10 Alexis Ballier (aballier)
2013-08-09 16:28 Alexis Ballier (aballier)
2013-08-09 15:48 Alexis Ballier (aballier)
2013-08-09 13:58 Alexis Ballier (aballier)
2013-07-08  2:08 Alexis Ballier (aballier)
2013-06-18 17:30 Alexis Ballier (aballier)
2013-06-18 16:57 Alexis Ballier (aballier)
2013-06-17 20:00 Alexis Ballier (aballier)
2013-06-17 17:31 Alexis Ballier (aballier)
2012-11-24 11:22 Alexis Ballier (aballier)
2012-05-24 11:19 Alexis Ballier (aballier)
2012-05-24 11:18 Alexis Ballier (aballier)
2012-05-17 13:58 Alexis Ballier (aballier)
2012-05-16 15:44 Alexis Ballier (aballier)
2012-05-04 13:31 Alexis Ballier (aballier)
2011-07-06  5:41 Alexis Ballier (aballier)
2011-07-05 18:46 Alexis Ballier (aballier)
2010-03-11 17:55 Alexis Ballier (aballier)
2009-05-22 15:23 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