summaryrefslogtreecommitdiff
path: root/libtool
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
committerChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
commit2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch)
treecab0f25aca03f6162bd268a401945fbfbb63bff9 /libtool
parent5df179157f90b18f437c6978efb451f515e3d1c9 (diff)
Merges.
2004/05/22 12:46:48-04:00 local!kergoth Bugfixes per the recent FILESDIR cleanup. 2004/05/22 01:03:38-04:00 local!kergoth Run a perl script against the repo to kill off direct FILESDIR usage in favor of relative file:// paths in SRC_URI, and WORKDIR references in functions. 2004/05/21 23:07:58-04:00 local!kergoth Switch file:// FILESDIR uris in SRC_URI to the new relative path format. BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'libtool')
-rw-r--r--libtool/libtool-cross_1.5.6.oe8
-rw-r--r--libtool/libtool-native_1.5.6.oe8
-rw-r--r--libtool/libtool_1.4.3.oe8
-rw-r--r--libtool/libtool_1.5.6.oe2
-rw-r--r--libtool/libtool_1.5.oe2
5 files changed, 14 insertions, 14 deletions
diff --git a/libtool/libtool-cross_1.5.6.oe b/libtool/libtool-cross_1.5.6.oe
index f046c77b5f..7c861e9261 100644
--- a/libtool/libtool-cross_1.5.6.oe
+++ b/libtool/libtool-cross_1.5.6.oe
@@ -2,10 +2,10 @@ include libtool_${PV}.oe
PACKAGES = ""
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
- file://${FILESDIR}/prefix.patch;patch=1 \
- file://${FILESDIR}/tag.patch;patch=1 \
- file://${FILESDIR}/install-path-check.patch;patch=1"
+SRC_URI_append = " file://libdir-la.patch;patch=1 \
+ file://prefix.patch;patch=1 \
+ file://tag.patch;patch=1 \
+ file://install-path-check.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
prefix = "${STAGING_DIR}"
diff --git a/libtool/libtool-native_1.5.6.oe b/libtool/libtool-native_1.5.6.oe
index bc930caf10..7349dde545 100644
--- a/libtool/libtool-native_1.5.6.oe
+++ b/libtool/libtool-native_1.5.6.oe
@@ -2,10 +2,10 @@ include libtool_${PV}.oe
PR = "r1"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
- file://${FILESDIR}/prefix.patch;patch=1 \
- file://${FILESDIR}/tag.patch;patch=1 \
- file://${FILESDIR}/install-path-check.patch;patch=1"
+SRC_URI_append = " file://libdir-la.patch;patch=1 \
+ file://prefix.patch;patch=1 \
+ file://tag.patch;patch=1 \
+ file://install-path-check.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
STAGING_DATADIR_safe := "${STAGING_DATADIR}"
diff --git a/libtool/libtool_1.4.3.oe b/libtool/libtool_1.4.3.oe
index 01419c6c05..2d7f278a64 100644
--- a/libtool/libtool_1.4.3.oe
+++ b/libtool/libtool_1.4.3.oe
@@ -6,10 +6,10 @@ the complexity of generating special library types (such as shared \
libraries) behind a consistent interface."
SRC_URI = "${DEBIAN_MIRROR}/main/libt/libtool/libtool_${PV}.orig.tar.gz \
- file://${FILESDIR}/debian.patch;patch=1 \
- file://${FILESDIR}/libdir.patch;patch=1 \
- file://${FILESDIR}/sedvar.patch;patch=1 \
- file://${FILESDIR}/libtoolize-staging.patch;patch=1"
+ file://debian.patch;patch=1 \
+ file://libdir.patch;patch=1 \
+ file://sedvar.patch;patch=1 \
+ file://libtoolize-staging.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
inherit autotools
diff --git a/libtool/libtool_1.5.6.oe b/libtool/libtool_1.5.6.oe
index 58c897fc7d..3650c2bebe 100644
--- a/libtool/libtool_1.5.6.oe
+++ b/libtool/libtool_1.5.6.oe
@@ -4,7 +4,7 @@ the complexity of generating special library types (such as shared \
libraries) behind a consistent interface."
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
- file://${FILESDIR}/autotools.patch;patch=1"
+ file://autotools.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
inherit autotools
diff --git a/libtool/libtool_1.5.oe b/libtool/libtool_1.5.oe
index 58c897fc7d..3650c2bebe 100644
--- a/libtool/libtool_1.5.oe
+++ b/libtool/libtool_1.5.oe
@@ -4,7 +4,7 @@ the complexity of generating special library types (such as shared \
libraries) behind a consistent interface."
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
- file://${FILESDIR}/autotools.patch;patch=1"
+ file://autotools.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
inherit autotools