* [Buildroot] [PATCH] shared-mime-info: update to version 0.90
@ 2011-07-13 16:48 Sven Neumann
2011-07-13 17:09 ` Thomas Petazzoni
0 siblings, 1 reply; 5+ messages in thread
From: Sven Neumann @ 2011-07-13 16:48 UTC (permalink / raw)
To: buildroot
Need to pass -j1 to make as parallel builds appear to be broken.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
.../shared-mime-info-0.60-fix-xmllint.patch | 17 -----------------
package/shared-mime-info/shared-mime-info.mk | 7 ++++---
2 files changed, 4 insertions(+), 20 deletions(-)
delete mode 100644 package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
diff --git a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch b/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
deleted file mode 100644
index 921333e..0000000
--- a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: shared-mime-info-0.60/Makefile.am
-===================================================================
---- shared-mime-info-0.60.orig/Makefile.am
-+++ shared-mime-info-0.60/Makefile.am
-@@ -72,7 +72,7 @@
-
- check: freedesktop.org.xml
- if test -n $(XMLLINT) ; then \
-- xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml; \
-+ $(XMLLINT) --noout --valid $(top_srcdir)/freedesktop.org.xml; \
- fi
- if test -d CVS/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \
- mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 6abfa75..44733ce 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -3,7 +3,7 @@
# shared-mime-info
#
#############################################################
-SHARED_MIME_INFO_VERSION = 0.60
+SHARED_MIME_INFO_VERSION = 0.90
SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2
SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess
@@ -15,11 +15,12 @@ SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+SHARED_MIME_INFO_MAKE_OPT = -j1
HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
-HOST_SHARED_MIME_INFO_CONF_OPT = \
- --disable-update-mimedb
+HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+HOST_SHARED_MIME_INFO_MAKE_OPT = -j1
define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
$(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] shared-mime-info: update to version 0.90
2011-07-13 16:48 [Buildroot] [PATCH] shared-mime-info: update to version 0.90 Sven Neumann
@ 2011-07-13 17:09 ` Thomas Petazzoni
2011-07-13 19:03 ` Sven Neumann
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2011-07-13 17:09 UTC (permalink / raw)
To: buildroot
Le Wed, 13 Jul 2011 18:48:12 +0200,
Sven Neumann <s.neumann@raumfeld.com> a ?crit :
> .../shared-mime-info-0.60-fix-xmllint.patch | 17 -----------------
Patch mainlined ?
> SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
> +SHARED_MIME_INFO_MAKE_OPT = -j1
>
> HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
>
> -HOST_SHARED_MIME_INFO_CONF_OPT = \
> - --disable-update-mimedb
> +HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
> +HOST_SHARED_MIME_INFO_MAKE_OPT = -j1
Usually, we do :
<pkg>_MAKE = $(MAKE1)
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] shared-mime-info: update to version 0.90
2011-07-13 17:09 ` Thomas Petazzoni
@ 2011-07-13 19:03 ` Sven Neumann
0 siblings, 0 replies; 5+ messages in thread
From: Sven Neumann @ 2011-07-13 19:03 UTC (permalink / raw)
To: buildroot
On Wed, 2011-07-13 at 19:09 +0200, Thomas Petazzoni wrote:
> Le Wed, 13 Jul 2011 18:48:12 +0200,
> Sven Neumann <s.neumann@raumfeld.com> a ?crit :
>
> > .../shared-mime-info-0.60-fix-xmllint.patch | 17 -----------------
>
> Patch mainlined ?
Yes, this has been fixed in mainline.
> > SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
> > +SHARED_MIME_INFO_MAKE_OPT = -j1
> >
> > HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
> >
> > -HOST_SHARED_MIME_INFO_CONF_OPT = \
> > - --disable-update-mimedb
> > +HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
> > +HOST_SHARED_MIME_INFO_MAKE_OPT = -j1
>
>
> Usually, we do :
>
> <pkg>_MAKE = $(MAKE1)
Ah, I see. I'll submit an updated patch then unless someone beats me to
it...
Sven
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] shared-mime-info: update to version 0.90
@ 2011-07-14 7:16 Sven Neumann
2011-07-18 21:01 ` Peter Korsgaard
0 siblings, 1 reply; 5+ messages in thread
From: Sven Neumann @ 2011-07-14 7:16 UTC (permalink / raw)
To: buildroot
Need to use $(MAKE1) as parallel builds appear to be broken.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
.../shared-mime-info-0.60-fix-xmllint.patch | 17 -----------------
package/shared-mime-info/shared-mime-info.mk | 7 ++++---
2 files changed, 4 insertions(+), 20 deletions(-)
delete mode 100644 package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
diff --git a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch b/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
deleted file mode 100644
index 921333e..0000000
--- a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: shared-mime-info-0.60/Makefile.am
-===================================================================
---- shared-mime-info-0.60.orig/Makefile.am
-+++ shared-mime-info-0.60/Makefile.am
-@@ -72,7 +72,7 @@
-
- check: freedesktop.org.xml
- if test -n $(XMLLINT) ; then \
-- xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml; \
-+ $(XMLLINT) --noout --valid $(top_srcdir)/freedesktop.org.xml; \
- fi
- if test -d CVS/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \
- mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 6abfa75..50b0f25 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -3,7 +3,7 @@
# shared-mime-info
#
#############################################################
-SHARED_MIME_INFO_VERSION = 0.60
+SHARED_MIME_INFO_VERSION = 0.90
SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2
SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess
@@ -15,11 +15,12 @@ SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+SHARED_MIME_INFO_MAKE = $(MAKE1)
HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
-HOST_SHARED_MIME_INFO_CONF_OPT = \
- --disable-update-mimedb
+HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+HOST_SHARED_MIME_INFO_MAKE = $(MAKE1)
define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
$(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] shared-mime-info: update to version 0.90
2011-07-14 7:16 Sven Neumann
@ 2011-07-18 21:01 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2011-07-18 21:01 UTC (permalink / raw)
To: buildroot
>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:
Sven> Need to use $(MAKE1) as parallel builds appear to be broken.
Sven> Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-07-18 21:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-13 16:48 [Buildroot] [PATCH] shared-mime-info: update to version 0.90 Sven Neumann
2011-07-13 17:09 ` Thomas Petazzoni
2011-07-13 19:03 ` Sven Neumann
-- strict thread matches above, loose matches on Subject: below --
2011-07-14 7:16 Sven Neumann
2011-07-18 21:01 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox