From c28da98a0deade5070e2284d5a6754b7695e7d2a Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 24 Sep 2008 01:05:48 +0000
Subject: classpath: simplfiy patch handling for native and minimal *
 maninpulate FILESDIR as suggested in the oe manual,   so we don't need a
 patch thrice * drop the extrad dirs and patches * do not need bump PR no
 runtime changes

---
 packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty  |  0
 packages/classpath/classpath-minimal-0.97.2/autotools.patch | 13 -------------
 packages/classpath/classpath-minimal_0.97.2.bb              |  2 ++
 packages/classpath/classpath-native-0.97.2/.mtn2git_empty   |  0
 packages/classpath/classpath-native-0.97.2/autotools.patch  | 13 -------------
 packages/classpath/classpath-native.inc                     | 10 +++++-----
 6 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty
 delete mode 100644 packages/classpath/classpath-minimal-0.97.2/autotools.patch
 delete mode 100644 packages/classpath/classpath-native-0.97.2/.mtn2git_empty
 delete mode 100644 packages/classpath/classpath-native-0.97.2/autotools.patch

(limited to 'packages')

diff --git a/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty b/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch
deleted file mode 100644
index e36e143b5f..0000000000
--- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: classpath-0.97.2/configure.ac
-===================================================================
---- classpath-0.97.2.orig/configure.ac	2008-06-06 02:58:57.000000000 +0200
-+++ classpath-0.97.2/configure.ac	2008-08-02 00:58:16.537364104 +0200
-@@ -41,6 +41,8 @@
- AC_CONFIG_HEADERS([include/config.h])
- AC_PREFIX_DEFAULT(/usr/local/classpath)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- dnl -----------------------------------------------------------
- dnl Enable collections.jar (disabled by default)
- dnl -----------------------------------------------------------
diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb
index 44cffcec32..e03dc85760 100644
--- a/packages/classpath/classpath-minimal_0.97.2.bb
+++ b/packages/classpath/classpath-minimal_0.97.2.bb
@@ -1,5 +1,7 @@
 require classpath.inc
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/${PBN}-${PV}"
+
 SRC_URI += "\
   file://netif_16.patch;patch=1;pnum=0 \
   file://SimpleName.diff;patch=1;pnum=0 \
diff --git a/packages/classpath/classpath-native-0.97.2/.mtn2git_empty b/packages/classpath/classpath-native-0.97.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch
deleted file mode 100644
index e36e143b5f..0000000000
--- a/packages/classpath/classpath-native-0.97.2/autotools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: classpath-0.97.2/configure.ac
-===================================================================
---- classpath-0.97.2.orig/configure.ac	2008-06-06 02:58:57.000000000 +0200
-+++ classpath-0.97.2/configure.ac	2008-08-02 00:58:16.537364104 +0200
-@@ -41,6 +41,8 @@
- AC_CONFIG_HEADERS([include/config.h])
- AC_PREFIX_DEFAULT(/usr/local/classpath)
- 
-+AC_CONFIG_MACRO_DIR([m4])
-+
- dnl -----------------------------------------------------------
- dnl Enable collections.jar (disabled by default)
- dnl -----------------------------------------------------------
diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc
index 060dd3f540..d178ce6779 100644
--- a/packages/classpath/classpath-native.inc
+++ b/packages/classpath/classpath-native.inc
@@ -2,15 +2,15 @@ DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 
-S = "${WORKDIR}/classpath-${PV}"
-
-SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
-	  
+inherit autotools native
 
 DEPENDS = "ecj-initial fastjar-native zip-native gettext-native"
 
-inherit autotools native
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+S = "${WORKDIR}/classpath-${PV}"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/classpath-${PV}"
 
 do_configure_prepend () {
 
-- 
cgit v1.2.3