xutil_util-macros: move outside x11r7 scope

Move to baseline package/
It doesn't really require x11r7 infrastructure and is in fact needed by
libepoxy which can be made x11r7-less.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Config.in b/package/Config.in
index f5f323cf2a666bf2cab86badd166907d776d1d00..45de28f2ba31e5132bdba38df73bec831d71c1cb 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -1245,6 +1245,7 @@ menu "Miscellaneous"
        source "package/shared-mime-info/Config.in"
        source "package/snowball-init/Config.in"
        source "package/wine/Config.in"
+       source "package/xutil_util-macros/Config.in"
 endmenu
 
 menu "Networking applications"

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 2f87cbd978bc80e939545ff89145fa6afc253297..381157f91fcf098ebc50732eed3afe7be2f4e0dc 100644 (file)
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -265,7 +265,6 @@ if BR2_PACKAGE_XORG7
        endmenu
        menu "X11R7 Utilities"
                source package/x11r7/xutil_makedepend/Config.in
-               source package/x11r7/xutil_util-macros/Config.in
                source package/x11r7/mcookie/Config.in
        endmenu
        menu "X11R7 Other data"

diff --git a/package/x11r7/xutil_util-macros/Config.in b/package/x11r7/xutil_util-macros/Config.in
deleted file mode 100644 (file)
index 10b1a59..0000000
--- a/package/x11r7/xutil_util-macros/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XUTIL_UTIL_MACROS
-       bool "util-macros"
-       help
-         No description available

diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.hash b/package/x11r7/xutil_util-macros/xutil_util-macros.hash
deleted file mode 100644 (file)
index bcb6c58..0000000
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2141
-sha256 2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba        util-macros-1.19.0.tar.bz2

diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
deleted file mode 100644 (file)
index 1451a06..0000000
--- a/package/x11r7/xutil_util-macros/xutil_util-macros.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# xutil_util-macros
-#
-################################################################################
-
-XUTIL_UTIL_MACROS_VERSION = 1.19.0
-XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
-XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
-XUTIL_UTIL_MACROS_LICENSE = MIT
-XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING
-
-XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
-XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))

diff --git a/package/xutil_util-macros/Config.in b/package/xutil_util-macros/Config.in
new file mode 100644 (file)
index 0000000..10b1a59
--- /dev/null
+++ b/package/xutil_util-macros/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_XUTIL_UTIL_MACROS
+       bool "util-macros"
+       help
+         No description available

diff --git a/package/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash
new file mode 100644 (file)
index 0000000..bcb6c58
--- /dev/null
+++ b/package/xutil_util-macros/xutil_util-macros.hash
@@ -0,0 +1,2 @@
+# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2141
+sha256 2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba        util-macros-1.19.0.tar.bz2

diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk
new file mode 100644 (file)
index 0000000..1451a06
--- /dev/null
+++ b/package/xutil_util-macros/xutil_util-macros.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# xutil_util-macros
+#
+################################################################################
+
+XUTIL_UTIL_MACROS_VERSION = 1.19.0
+XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
+XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
+XUTIL_UTIL_MACROS_LICENSE = MIT
+XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING
+
+XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
+XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))