summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-11-21 00:55:55 +0000
committerPhil Blundell <philb@gnu.org>2004-11-21 00:55:55 +0000
commit2157c93cf9976d9bc1b834e2120c91be6809f9fb (patch)
tree4fdee415491bdc722986674549899f8cd881722d
parent62ecaa2f1cd2eee77ccdfd7b419fd7c9a1efb152 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/20 19:55:54-05:00 handhelds.org!kergoth Merge openembedded@openembedded.bkbits.net:packages-devel into handhelds.org:/home/kergoth/code/packages 2004/11/20 19:55:37-05:00 handhelds.org!kergoth In the binutils builds, package /usr/${TARGET_SYS}/bin/*, and ensure they point to the correct place. This is one of the last major outstanding bugs in the native development environment. BKrev: 419fe79bxSA9MZFcPyiTz8xSVAsoqA
Diffstat
-rw-r--r--binutils/binutils_2.14.90.0.6.oe13
-rw-r--r--binutils/binutils_2.14.90.0.7.oe13
-rw-r--r--binutils/binutils_2.15.90.0.3.oe13
-rw-r--r--binutils/binutils_2.15.91.0.1.oe13
-rw-r--r--binutils/binutils_2.15.91.0.2.oe13
-rw-r--r--binutils/binutils_cvs.oe13
6 files changed, 66 insertions, 12 deletions
diff --git a/binutils/binutils_2.14.90.0.6.oe b/binutils/binutils_2.14.90.0.6.oe
index e5f7cd02e6..6c15e89ac9 100644
--- a/binutils/binutils_2.14.90.0.6.oe
+++ b/binutils/binutils_2.14.90.0.6.oe
@@ -1,7 +1,7 @@
SECTION = "devel"
inherit autotools gettext
-PR = "r1"
+PR = "r2"
DESCRIPTION = "A GNU collection of binary utilities"
LICENSE = "GPL"
@@ -11,7 +11,8 @@ PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
FILES_${PN} = " \
${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so"
+ ${libdir}/lib*-*.so \
+ ${prefix}/${TARGET_SYS}/bin/*"
FILES_${PN}-dev = " \
${includedir} \
@@ -102,6 +103,14 @@ do_install () {
# We don't really need these, so we'll remove them...
rm -rf ${D}/${libdir}/ldscripts
+ # Fix the /usr/${TARGET_SYS}/bin/* links
+ for l in ${D}/${prefix}/${TARGET_SYS}/bin/*; do
+ rm -f $l
+ ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+ | tr -s / \
+ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+ done
+
# Install the libiberty header
install -d ${D}/${includedir}
install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
diff --git a/binutils/binutils_2.14.90.0.7.oe b/binutils/binutils_2.14.90.0.7.oe
index 139bc45b6c..dec7833d3b 100644
--- a/binutils/binutils_2.14.90.0.7.oe
+++ b/binutils/binutils_2.14.90.0.7.oe
@@ -4,13 +4,14 @@ inherit autotools gettext
DESCRIPTION = "A GNU collection of binary utilities"
LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r2"
+PR = "r3"
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
FILES_${PN} = " \
${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so"
+ ${libdir}/lib*-*.so \
+ ${prefix}/${TARGET_SYS}/bin/*"
FILES_${PN}-dev = " \
${includedir} \
@@ -102,6 +103,14 @@ do_install () {
# We don't really need these, so we'll remove them...
rm -rf ${D}/${libdir}/ldscripts
+ # Fix the /usr/${TARGET_SYS}/bin/* links
+ for l in ${D}/${prefix}/${TARGET_SYS}/bin/*; do
+ rm -f $l
+ ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+ | tr -s / \
+ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+ done
+
# Install the libiberty header
install -d ${D}/${includedir}
install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
diff --git a/binutils/binutils_2.15.90.0.3.oe b/binutils/binutils_2.15.90.0.3.oe
index 466def8c6f..7737275036 100644
--- a/binutils/binutils_2.15.90.0.3.oe
+++ b/binutils/binutils_2.15.90.0.3.oe
@@ -4,13 +4,14 @@ inherit autotools gettext
DESCRIPTION = "A GNU collection of binary utilities"
LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r2"
+PR = "r3"
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
FILES_${PN} = " \
${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so"
+ ${libdir}/lib*-*.so \
+ ${prefix}/${TARGET_SYS}/bin/*"
FILES_${PN}-dev = " \
${includedir} \
@@ -100,6 +101,14 @@ do_install () {
# We don't really need these, so we'll remove them...
rm -rf ${D}/${libdir}/ldscripts
+ # Fix the /usr/${TARGET_SYS}/bin/* links
+ for l in ${D}/${prefix}/${TARGET_SYS}/bin/*; do
+ rm -f $l
+ ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+ | tr -s / \
+ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+ done
+
# Install the libiberty header
install -d ${D}/${includedir}
install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
diff --git a/binutils/binutils_2.15.91.0.1.oe b/binutils/binutils_2.15.91.0.1.oe
index d92cc90312..e36f6568ce 100644
--- a/binutils/binutils_2.15.91.0.1.oe
+++ b/binutils/binutils_2.15.91.0.1.oe
@@ -4,13 +4,14 @@ inherit autotools gettext
DESCRIPTION = "A GNU collection of binary utilities"
LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r2"
+PR = "r3"
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
FILES_${PN} = " \
${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so"
+ ${libdir}/lib*-*.so \
+ ${prefix}/${TARGET_SYS}/bin/*"
FILES_${PN}-dev = " \
${includedir} \
@@ -99,6 +100,14 @@ do_install () {
# We don't really need these, so we'll remove them...
rm -rf ${D}/${libdir}/ldscripts
+ # Fix the /usr/${TARGET_SYS}/bin/* links
+ for l in ${D}/${prefix}/${TARGET_SYS}/bin/*; do
+ rm -f $l
+ ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+ | tr -s / \
+ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+ done
+
# Install the libiberty header
install -d ${D}/${includedir}
install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
diff --git a/binutils/binutils_2.15.91.0.2.oe b/binutils/binutils_2.15.91.0.2.oe
index a2f1addfd5..b1c10d3690 100644
--- a/binutils/binutils_2.15.91.0.2.oe
+++ b/binutils/binutils_2.15.91.0.2.oe
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
SECTION = "devel"
LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r4"
+PR = "r5"
inherit autotools gettext
@@ -11,7 +11,8 @@ PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
FILES_${PN} = " \
${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so"
+ ${libdir}/lib*-*.so \
+ ${prefix}/${TARGET_SYS}/bin/*"
FILES_${PN}-dev = " \
${includedir} \
@@ -102,6 +103,14 @@ do_install () {
# We don't really need these, so we'll remove them...
rm -rf ${D}/${libdir}/ldscripts
+ # Fix the /usr/${TARGET_SYS}/bin/* links
+ for l in ${D}/${prefix}/${TARGET_SYS}/bin/*; do
+ rm -f $l
+ ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+ | tr -s / \
+ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+ done
+
# Install the libiberty header
install -d ${D}/${includedir}
install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
diff --git a/binutils/binutils_cvs.oe b/binutils/binutils_cvs.oe
index d9ae5ce815..eb6de962c7 100644
--- a/binutils/binutils_cvs.oe
+++ b/binutils/binutils_cvs.oe
@@ -6,13 +6,14 @@ LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/binutils-cvs"
PV = "0.0cvs${CVSDATE}"
-PR = "r1"
+PR = "r2"
PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
FILES_${PN} = " \
${bindir}/${TARGET_PREFIX}* \
- ${libdir}/lib*-*.so"
+ ${libdir}/lib*-*.so \
+ ${prefix}/${TARGET_SYS}/bin/*"
FILES_${PN}-dev = " \
${includedir} \
@@ -99,6 +100,14 @@ do_install () {
# We don't really need these, so we'll remove them...
rm -rf ${D}/${libdir}/ldscripts
+ # Fix the /usr/${TARGET_SYS}/bin/* links
+ for l in ${D}/${prefix}/${TARGET_SYS}/bin/*; do
+ rm -f $l
+ ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+ | tr -s / \
+ | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+ done
+
# Install the libiberty header
install -m 644 ${S}/include/ansidecl.h ${D}/${includedir}
install -m 644 ${S}/include/libiberty.h ${D}/${includedir}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 04:15:40 +0000