* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2007-11-14 3:42 Mike Doty (kingtaco)
0 siblings, 0 replies; 10+ messages in thread
From: Mike Doty (kingtaco) @ 2007-11-14 3:42 UTC (permalink / raw
To: gentoo-commits
kingtaco 07/11/14 03:42:12
Added: emul-linux-x86.eclass
Log:
new app-emulation eclass for amd64
Revision Changes Path
1.1 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.1&content-type=text/plain
Index: emul-linux-x86.eclass
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.1 2007/11/14 03:42:12 kingtaco Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
# Adapted from emul-libs.eclass
# Purpose: Providing a template for the app-emulation/emul-linux-* packages
#
EXPORT_FUNCTIONS src_unpack src_install
SRC_URI="mirror://gentoo/${PN}-${PVR}.tar.bz2"
DESCRIPTION="Provides precompiled 32bit libraries"
HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
RESTRICT="strip"
S=${WORKDIR}
SLOT="0"
IUSE=""
DEPEND=">=sys-apps/findutils-4.2.26"
RDEPEND=""
emul-linux-x86_src_unpack() {
unpack ${A}
cd "${S}"
ALLOWED=${ALLOWED:-^${S}/etc/env.d}
find "${S}" ! -type d ! -name '*.so*' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
}
emul-linux-x86_src_install() {
for dir in etc/env.d etc/revdep-rebuild ; do
if [[ -d "${S}"/${dir} ]] ; then
for f in "${S}"/${dir}/* ; do
mv -f "$f"{,-emul}
done
fi
done
# remove void directories
find "${S}" -depth -type d -print0 | xargs -0 rmdir 2&>/dev/null
cp -pPR "${S}"/* "${D}"/ || die "copying files failed!"
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2007-11-15 5:52 Mike Doty (kingtaco)
0 siblings, 0 replies; 10+ messages in thread
From: Mike Doty (kingtaco) @ 2007-11-15 5:52 UTC (permalink / raw
To: gentoo-commits
kingtaco 07/11/15 05:52:26
Modified: emul-linux-x86.eclass
Log:
revbumps apply to ebuilds, not distfiles. SRC_URI changed from PVR to PV
Revision Changes Path
1.4 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.3&r2=1.4
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emul-linux-x86.eclass 14 Nov 2007 17:31:04 -0000 1.3
+++ emul-linux-x86.eclass 15 Nov 2007 05:52:26 -0000 1.4
@@ -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/emul-linux-x86.eclass,v 1.3 2007/11/14 17:31:04 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.4 2007/11/15 05:52:26 kingtaco Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -10,7 +10,7 @@
EXPORT_FUNCTIONS src_unpack src_install
-SRC_URI="mirror://gentoo/${PN}-${PVR}.tar.bz2"
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2"
DESCRIPTION="Provides precompiled 32bit libraries"
HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2010-02-22 20:52 Pacho Ramos (pacho)
0 siblings, 0 replies; 10+ messages in thread
From: Pacho Ramos (pacho) @ 2010-02-22 20:52 UTC (permalink / raw
To: gentoo-commits
pacho 10/02/22 20:52:53
Modified: emul-linux-x86.eclass
Log:
Update emul contents homepage
Revision Changes Path
1.5 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.4&r2=1.5
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emul-linux-x86.eclass 15 Nov 2007 05:52:26 -0000 1.4
+++ emul-linux-x86.eclass 22 Feb 2010 20:52:52 -0000 1.5
@@ -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/emul-linux-x86.eclass,v 1.4 2007/11/15 05:52:26 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.5 2010/02/22 20:52:52 pacho Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -13,7 +13,8 @@
SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2"
DESCRIPTION="Provides precompiled 32bit libraries"
-HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
+#HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
+HOMEPAGE="http://dev.gentoo.org/~pacho/emul.html"
RESTRICT="strip"
S=${WORKDIR}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2011-01-29 21:46 Pacho Ramos (pacho)
0 siblings, 0 replies; 10+ messages in thread
From: Pacho Ramos (pacho) @ 2011-01-29 21:46 UTC (permalink / raw
To: gentoo-commits
pacho 11/01/29 21:46:33
Modified: emul-linux-x86.eclass
Log:
Provide a 'development' USE for installing .pc files as requested in bug #262414. Thanks a lot to Markos Chandras for his help.
Revision Changes Path
1.6 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.5&r2=1.6
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emul-linux-x86.eclass 22 Feb 2010 20:52:52 -0000 1.5
+++ emul-linux-x86.eclass 29 Jan 2011 21:46:33 -0000 1.6
@@ -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/emul-linux-x86.eclass,v 1.5 2010/02/22 20:52:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.6 2011/01/29 21:46:33 pacho Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -8,9 +8,17 @@
# Purpose: Providing a template for the app-emulation/emul-linux-* packages
#
+inherit versionator
+
+if version_is_at_least 20110129; then
+ IUSE="development"
+else
+ IUSE=""
+fi
+
EXPORT_FUNCTIONS src_unpack src_install
-SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.bz2"
DESCRIPTION="Provides precompiled 32bit libraries"
#HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
@@ -20,7 +28,6 @@
S=${WORKDIR}
SLOT="0"
-IUSE=""
DEPEND=">=sys-apps/findutils-4.2.26"
RDEPEND=""
@@ -29,6 +36,7 @@
unpack ${A}
cd "${S}"
+ has development "${IUSE//+}" && use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
ALLOWED=${ALLOWED:-^${S}/etc/env.d}
find "${S}" ! -type d ! -name '*.so*' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2011-01-30 0:23 Pacho Ramos (pacho)
0 siblings, 0 replies; 10+ messages in thread
From: Pacho Ramos (pacho) @ 2011-01-30 0:23 UTC (permalink / raw
To: gentoo-commits
pacho 11/01/30 00:23:33
Modified: emul-linux-x86.eclass
Log:
Fix 'development' handling.
Revision Changes Path
1.7 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.6&r2=1.7
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emul-linux-x86.eclass 29 Jan 2011 21:46:33 -0000 1.6
+++ emul-linux-x86.eclass 30 Jan 2011 00:23:33 -0000 1.7
@@ -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/emul-linux-x86.eclass,v 1.6 2011/01/29 21:46:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.7 2011/01/30 00:23:33 pacho Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -36,8 +36,8 @@
unpack ${A}
cd "${S}"
- has development "${IUSE//+}" && use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
ALLOWED=${ALLOWED:-^${S}/etc/env.d}
+ has development "${IUSE//+}" && use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
find "${S}" ! -type d ! -name '*.so*' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2011-02-07 11:46 Pacho Ramos (pacho)
0 siblings, 0 replies; 10+ messages in thread
From: Pacho Ramos (pacho) @ 2011-02-07 11:46 UTC (permalink / raw
To: gentoo-commits
pacho 11/02/07 11:46:24
Modified: emul-linux-x86.eclass
Log:
Fix SRC_URI for older versions (bug #353904 by Sven Vermeulen).
Revision Changes Path
1.8 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.7&r2=1.8
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emul-linux-x86.eclass 30 Jan 2011 00:23:33 -0000 1.7
+++ emul-linux-x86.eclass 7 Feb 2011 11:46:24 -0000 1.8
@@ -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/emul-linux-x86.eclass,v 1.7 2011/01/30 00:23:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.8 2011/02/07 11:46:24 pacho Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -18,7 +18,11 @@
EXPORT_FUNCTIONS src_unpack src_install
-SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.bz2"
+if version_is_at_least 20110129; then
+ SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.bz2"
+else
+ SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2"
+fi
DESCRIPTION="Provides precompiled 32bit libraries"
#HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2011-07-22 18:10 Pacho Ramos (pacho)
0 siblings, 0 replies; 10+ messages in thread
From: Pacho Ramos (pacho) @ 2011-07-22 18:10 UTC (permalink / raw
To: gentoo-commits
pacho 11/07/22 18:10:54
Modified: emul-linux-x86.eclass
Log:
Support all current EAPIs and use xz as compressor for upcoming releases.
Revision Changes Path
1.9 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.8&r2=1.9
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- emul-linux-x86.eclass 7 Feb 2011 11:46:24 -0000 1.8
+++ emul-linux-x86.eclass 22 Jul 2011 18:10:54 -0000 1.9
@@ -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/emul-linux-x86.eclass,v 1.8 2011/02/07 11:46:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.9 2011/07/22 18:10:54 pacho Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -16,12 +16,24 @@
IUSE=""
fi
-EXPORT_FUNCTIONS src_unpack src_install
+case "${EAPI:-0}" in
+ 0|1)
+ EXPORT_FUNCTIONS src_unpack src_install
+ ;;
+ 2|3|4)
+ EXPORT_FUNCTIONS src_unpack src_prepare src_install
+ ;;
+ *) die "EAPI=${EAPI} is not supported" ;;
+esac
-if version_is_at_least 20110129; then
- SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.bz2"
+if version_is_at_least 20110722; then
+ SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.xz"
else
- SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2"
+ if version_is_at_least 20110129; then
+ SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.bz2"
+ else
+ SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2"
+ fi
fi
DESCRIPTION="Provides precompiled 32bit libraries"
@@ -39,13 +51,17 @@
emul-linux-x86_src_unpack() {
unpack ${A}
cd "${S}"
+ has ${EAPI:-0} 0 1 && emul-linux-x86_src_prepare
+}
+emul-linux-x86_src_prepare() {
ALLOWED=${ALLOWED:-^${S}/etc/env.d}
has development "${IUSE//+}" && use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig"
find "${S}" ! -type d ! -name '*.so*' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*'
}
emul-linux-x86_src_install() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
for dir in etc/env.d etc/revdep-rebuild ; do
if [[ -d "${S}"/${dir} ]] ; then
for f in "${S}"/${dir}/* ; do
@@ -57,5 +73,5 @@
# remove void directories
find "${S}" -depth -type d -print0 | xargs -0 rmdir 2&>/dev/null
- cp -pPR "${S}"/* "${D}"/ || die "copying files failed!"
+ cp -pPR "${S}"/* "${ED}"/ || die "copying files failed!"
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2012-11-02 16:38 Mike Frysinger (vapier)
0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger (vapier) @ 2012-11-02 16:38 UTC (permalink / raw
To: gentoo-commits
vapier 12/11/02 16:38:47
Modified: emul-linux-x86.eclass
Log:
do not try to move /lib32 if it does not exist #429726
Revision Changes Path
1.14 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.13&r2=1.14
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- emul-linux-x86.eclass 28 Oct 2012 09:43:49 -0000 1.13
+++ emul-linux-x86.eclass 2 Nov 2012 16:38:46 -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/eclass/emul-linux-x86.eclass,v 1.13 2012/10/28 09:43:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.14 2012/11/02 16:38:46 vapier Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -82,6 +82,8 @@
if [[ ${x86_libdir} != "lib32" ]] ; then
ewarn "Moving lib32/ to ${x86_libdir}/; some libs might not work"
mv "${D}"/usr/lib32 "${D}"/usr/${x86_libdir} || die
- mv "${D}"/lib32 "${D}"/${x86_libdir} || die
+ if [[ -d ${D}/lib32 ]] ; then
+ mv "${D}"/lib32 "${D}"/${x86_libdir} || die
+ fi
fi
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2013-01-12 16:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger (vapier) @ 2013-01-12 16:53 UTC (permalink / raw
To: gentoo-commits
vapier 13/01/12 16:53:56
Modified: emul-linux-x86.eclass
Log:
rewrite linker scripts and symlinks too when moving lib32
Revision Changes Path
1.16 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.15&r2=1.16
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- emul-linux-x86.eclass 25 Nov 2012 07:19:51 -0000 1.15
+++ emul-linux-x86.eclass 12 Jan 2013 16:53:56 -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/eclass/emul-linux-x86.eclass,v 1.15 2012/11/25 07:19:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.16 2013/01/12 16:53:56 vapier Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -85,5 +85,21 @@
if [[ -d ${D}/lib32 ]] ; then
mv "${D}"/lib32 "${D}"/${x86_libdir} || die
fi
+
+ pushd "${D}"/usr/${x86_libdir} >/dev/null
+
+ # Fix linker script paths.
+ sed -i \
+ -e "s:/lib32/:/${x86_libdir}/:" \
+ $(grep -ls '^GROUP.*/lib32/' *.so) || die
+
+ # Rewrite symlinks (if need be).
+ local sym tgt
+ while read sym ; do
+ tgt=$(readlink "${sym}")
+ ln -sf "${tgt/lib32/${x86_libdir}}" "${sym}" || die
+ done < <(find -xtype l)
+
+ popd >/dev/null
fi
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass
@ 2013-06-28 2:37 Mike Frysinger (vapier)
0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger (vapier) @ 2013-06-28 2:37 UTC (permalink / raw
To: gentoo-commits
vapier 13/06/28 02:37:49
Modified: emul-linux-x86.eclass
Log:
do not fail the linker script hack when the package contains no linker scripts at all
Revision Changes Path
1.19 eclass/emul-linux-x86.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.18&r2=1.19
Index: emul-linux-x86.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emul-linux-x86.eclass 24 Feb 2013 23:30:02 -0000 1.18
+++ emul-linux-x86.eclass 28 Jun 2013 02:37:48 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.18 2013/02/24 23:30:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.19 2013/06/28 02:37:48 vapier Exp $
#
# Original Author: Mike Doty <kingtaco@gentoo.org>
@@ -66,9 +66,12 @@
pushd "${D}"/usr/${x86_libdir} >/dev/null
# Fix linker script paths.
- sed -i \
- -e "s:/lib32/:/${x86_libdir}/:" \
- $(grep -ls '^GROUP.*/lib32/' *.so) || die
+ local ldscripts
+ if ldscripts=( $(grep -ls '^GROUP.*/lib32/' *.so) ) ; then
+ sed -i \
+ -e "s:/lib32/:/${x86_libdir}/:" \
+ "${ldscripts[@]}" || die
+ fi
# Rewrite symlinks (if need be).
local sym tgt
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-06-28 2:37 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-29 21:46 [gentoo-commits] gentoo-x86 commit in eclass: emul-linux-x86.eclass Pacho Ramos (pacho)
-- strict thread matches above, loose matches on Subject: below --
2013-06-28 2:37 Mike Frysinger (vapier)
2013-01-12 16:53 Mike Frysinger (vapier)
2012-11-02 16:38 Mike Frysinger (vapier)
2011-07-22 18:10 Pacho Ramos (pacho)
2011-02-07 11:46 Pacho Ramos (pacho)
2011-01-30 0:23 Pacho Ramos (pacho)
2010-02-22 20:52 Pacho Ramos (pacho)
2007-11-15 5:52 Mike Doty (kingtaco)
2007-11-14 3:42 Mike Doty (kingtaco)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox