summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/xorg-util/gccmakedep_1.0.2.bb6
-rw-r--r--meta/packages/xorg-util/imake_1.0.2.bb6
-rw-r--r--meta/packages/xorg-util/lndir_1.0.1.bb6
-rw-r--r--meta/packages/xorg-util/makedepend-native_1.0.0.bb9
-rw-r--r--meta/packages/xorg-util/makedepend_1.0.0.bb6
-rw-r--r--meta/packages/xorg-util/util-macros-native_1.1.5.bb13
-rw-r--r--meta/packages/xorg-util/util-macros_1.1.5.bb7
-rw-r--r--meta/packages/xorg-util/xorg-cf-files_1.0.2.bb4
-rw-r--r--meta/packages/xorg-util/xorg-util-common.inc8
9 files changed, 26 insertions, 39 deletions
diff --git a/meta/packages/xorg-util/gccmakedep_1.0.2.bb b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
index e943b70aa5..061758e01a 100644
--- a/meta/packages/xorg-util/gccmakedep_1.0.2.bb
+++ b/meta/packages/xorg-util/gccmakedep_1.0.2.bb
@@ -1,7 +1,7 @@
1require xorg-util-common.inc 1require xorg-util-common.inc
2 2
3#DESCRIPTION = "" 3DESCRIPTION = "create dependencies in makefiles using ’gcc -M’"
4 4RDEPENDS = "gcc"
5#DEPENDS += " "
6 5
6PR = "r1"
7PE = "1" 7PE = "1"
diff --git a/meta/packages/xorg-util/imake_1.0.2.bb b/meta/packages/xorg-util/imake_1.0.2.bb
index 62611cc899..deeb4477a1 100644
--- a/meta/packages/xorg-util/imake_1.0.2.bb
+++ b/meta/packages/xorg-util/imake_1.0.2.bb
@@ -1,7 +1,7 @@
1require xorg-util-common.inc 1require xorg-util-common.inc
2 2
3DESCRIPTION = "imake utility" 3DESCRIPTION = "C preprocessor interface to the make utility"
4 4RDEPENDS = "perl xproto"
5DEPENDS += " perl xproto"
6 5
6PR = "r1"
7PE = "1" 7PE = "1"
diff --git a/meta/packages/xorg-util/lndir_1.0.1.bb b/meta/packages/xorg-util/lndir_1.0.1.bb
index a071d28660..34309a6487 100644
--- a/meta/packages/xorg-util/lndir_1.0.1.bb
+++ b/meta/packages/xorg-util/lndir_1.0.1.bb
@@ -1,7 +1,5 @@
1require xorg-util-common.inc 1require xorg-util-common.inc
2 2
3#DESCRIPTION = "" 3DESCRIPTION = "create a shadow directory of symbolic links to another directory tree"
4 4PR = "r1"
5DEPENDS += " xproto"
6
7PE = "1" 5PE = "1"
diff --git a/meta/packages/xorg-util/makedepend-native_1.0.0.bb b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
index 833d2daa92..554270e6e4 100644
--- a/meta/packages/xorg-util/makedepend-native_1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend-native_1.0.0.bb
@@ -1,11 +1,8 @@
1require xorg-util-common.inc 1require xorg-util-common.inc
2inherit native 2inherit native
3 3
4#DESCRIPTION = "" 4DESCRIPTION = "create dependencies in makefiles"
5PR = "r1"
6PE = "1"
5 7
6XORG_PN = "makedepend" 8XORG_PN = "makedepend"
7S = "${WORKDIR}/makedepend-${PV}"
8
9DEPENDS += " util-macros-native xproto-native"
10
11PE = "1"
diff --git a/meta/packages/xorg-util/makedepend_1.0.0.bb b/meta/packages/xorg-util/makedepend_1.0.0.bb
index a071d28660..3605b51d49 100644
--- a/meta/packages/xorg-util/makedepend_1.0.0.bb
+++ b/meta/packages/xorg-util/makedepend_1.0.0.bb
@@ -1,7 +1,5 @@
1require xorg-util-common.inc 1require xorg-util-common.inc
2 2
3#DESCRIPTION = "" 3DESCRIPTION = "create dependencies in makefiles"
4 4PR = "r1"
5DEPENDS += " xproto"
6
7PE = "1" 5PE = "1"
diff --git a/meta/packages/xorg-util/util-macros-native_1.1.5.bb b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
index 2728e83e18..c327f3f54e 100644
--- a/meta/packages/xorg-util/util-macros-native_1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros-native_1.1.5.bb
@@ -1,12 +1,9 @@
1DESCRIPTION = "X autotools macros" 1require util-macros_${PV}.bb
2SECTION = "x11/libs"
3LICENSE= "Xorg"
4PE = "1"
5 2
6SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ 3inherit native
7 file://unbreak_cross_compile.patch;patch=1 "
8 4
9S = "${WORKDIR}/util-macros-1.1.5" 5PR = "r1"
10 6
11inherit native autotools pkgconfig 7XORG_PN = "util-macros"
12 8
9S = "${WORKDIR}/util-macros-1.1.5"
diff --git a/meta/packages/xorg-util/util-macros_1.1.5.bb b/meta/packages/xorg-util/util-macros_1.1.5.bb
index 7fa9a07c05..22634bffd2 100644
--- a/meta/packages/xorg-util/util-macros_1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros_1.1.5.bb
@@ -1,10 +1,7 @@
1require xorg-util-common.inc 1require xorg-util-common.inc
2 2
3DESCRIPTION = "X autotools macros" 3DESCRIPTION = "X autotools macros"
4 4PR = "r1"
5PE = "1" 5PE = "1"
6 6
7SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \ 7SRC_URI += "file://unbreak_cross_compile.patch;patch=1"
8 file://unbreak_cross_compile.patch;patch=1 "
9S = "${WORKDIR}/${XORG_PN}-1.1.5"
10
diff --git a/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
index c0a3974d26..7c3fb8d7e9 100644
--- a/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
+++ b/meta/packages/xorg-util/xorg-cf-files_1.0.2.bb
@@ -1,8 +1,8 @@
1require xorg-util-common.inc 1require xorg-util-common.inc
2 2
3#DESCRIPTION = "" 3DESCRIPTION = "X Window System CF files"
4 4
5#DEPENDS += " " 5PR = "r1"
6PE = "1" 6PE = "1"
7 7
8FILES_${PN} += " /usr/lib/X11/config" 8FILES_${PN} += " /usr/lib/X11/config"
diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc
index 4dc547f105..56aae30725 100644
--- a/meta/packages/xorg-util/xorg-util-common.inc
+++ b/meta/packages/xorg-util/xorg-util-common.inc
@@ -2,14 +2,14 @@ HOMEPAGE = "http://www.x.org"
2SECTION = "x11/utils" 2SECTION = "x11/utils"
3LICENSE = "MIT-X" 3LICENSE = "MIT-X"
4 4
5#DEPENDS = ""
6XORG_PN = "${PN}" 5XORG_PN = "${PN}"
7XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}" 6
8SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/util/${XORG_PN}-${PV}.tar.gz" 7SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz"
8
9S = "${WORKDIR}/${XORG_PN}-${PV}" 9S = "${WORKDIR}/${XORG_PN}-${PV}"
10 10
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13do_stage() { 13do_stage() {
14 autotools_stage_all 14 autotools_stage_all
15} 15}