Changeset 24371


Ignore:
Timestamp:
2010-12-08T22:44:57+01:00 (7 years ago)
Author:
jow
Message:

[packages] dbus-glib:

  • remove private libtool copy
  • patch out invocations of host commands
  • provide missing macros
  • disables tests, examples and docs
Location:
packages/libs/dbus-glib
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/dbus-glib/Makefile

    r15247 r24371  
    1717 
    1818PKG_FIXUP:=libtool 
     19PKG_REMOVE_FILES:=aclocal.m4 ltmain.sh 
     20 
    1921PKG_INSTALL:=1 
    2022 
  • packages/libs/dbus-glib/patches/001-cross.patch

    r9108 r24371  
    1 Index: dbus-glib-0.74/dbus/Makefile.in 
    2 =================================================================== 
    3 --- dbus-glib-0.74.orig/dbus/Makefile.in        2007-10-03 09:03:44.000000000 +0200 
    4 +++ dbus-glib-0.74/dbus/Makefile.in     2007-10-03 09:03:45.000000000 +0200 
    5 @@ -292,7 +292,7 @@ 
    6  target_vendor = @target_vendor@ 
     1--- a/dbus/Makefile.in 
     2+++ b/dbus/Makefile.in 
     3@@ -315,7 +315,7 @@ target_vendor = @target_vendor@ 
     4 top_build_prefix = @top_build_prefix@ 
    75 top_builddir = @top_builddir@ 
    86 top_srcdir = @top_srcdir@ 
     
    1210        -I$(top_srcdir)                                         \ 
    1311        -I$(top_builddir)                                       \ 
    14 Index: dbus-glib-0.74/Makefile.in 
    15 =================================================================== 
    16 --- dbus-glib-0.74.orig/Makefile.in     2007-10-03 09:04:15.000000000 +0200 
    17 +++ dbus-glib-0.74/Makefile.in  2007-10-03 09:04:26.000000000 +0200 
    18 @@ -261,7 +261,7 @@ 
     12--- a/Makefile.in 
     13+++ b/Makefile.in 
     14@@ -267,8 +267,8 @@ top_build_prefix = @top_build_prefix@ 
    1915 top_builddir = @top_builddir@ 
    2016 top_srcdir = @top_srcdir@ 
    2117 GLIB_PC = dbus-glib-1.pc 
    2218-SUBDIRS = dbus tools test doc 
     19-DIST_SUBDIRS = dbus tools test doc m4 
    2320+SUBDIRS = dbus 
    24  DIST_SUBDIRS = dbus tools test doc m4 
     21+DIST_SUBDIRS = dbus tools m4 
    2522 pkgconfigdir = $(libdir)/pkgconfig 
    2623 pkgconfig_DATA = $(GLIB_PC) 
     24 DISTCLEANFILES = \ 
     25--- a/tools/Makefile.am 
     26+++ b/tools/Makefile.am 
     27@@ -1,24 +1,10 @@ 
     28 INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_COMPILATION 
     29  
     30-nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h 
     31 libdbus_glibdir = $(includedir)/dbus-1.0/dbus 
     32  
     33-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) 
     34-       $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml 
     35- 
     36-BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml 
     37- 
     38-if USE_INTROSPECT_XML 
     39-dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH) 
     40-       cp $(INTROSPECT_XML_PATH) dbus-bus-introspect.xml 
     41-else 
     42-dbus-bus-introspect.xml: 
     43-       DBUS_TOP_BUILDDIR=$(top_builddir) @DBUS_DAEMONDIR@dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml 
     44-endif 
     45+BUILT_SOURCES =  
     46  
     47 EXTRA_DIST = run-with-tmp-session-bus.sh session.conf 
     48  
     49 CLEANFILES =                           \ 
     50-       run-with-tmp-session-bus.conf   \ 
     51-        dbus-bus-introspect.xml         \ 
     52-        dbus-glib-bindings.h 
     53+       run-with-tmp-session-bus.conf 
     54--- a/configure.ac 
     55+++ b/configure.ac 
     56@@ -58,9 +58,6 @@ AC_ARG_ENABLE(bash-completion, AS_HELP_S 
     57 AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check])) 
     58  
     59  
     60-AC_ARG_WITH(introspect-xml, AS_HELP_STRING([--with-introspect-xml=[filename]],[Pass in a pregenerated dbus daemon introspection xml file (as generated by 'dbus-daemon --introspect') to use instead of querying the installed dbus daemon])) 
     61- 
     62- 
     63 AM_CONDITIONAL(DBUS_BASH_COMPLETION, test x$enable_bash_completion = xyes) 
     64 if test x$enable_bash_completion = xyes; then 
     65   AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion]) 
     66@@ -815,18 +812,6 @@ fi 
     67 AC_SUBST(TEST_SOCKET_DIR) 
     68 AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets]) 
     69  
     70-#### Test if we should generate daemon introspection xml 
     71-use_introspect_xml=false 
     72- 
     73-if ! test -z "$with_introspect_xml" ; then 
     74-  use_introspect_xml=true 
     75-  INTROSPECT_XML_PATH="$with_introspect_xml" 
     76-  AC_DEFINE(INTROSPECT_XML_PATH, "$INTROSPECT_XML_PATH", [Path to pregenerated xml for dbus daemon introspection]) 
     77-  AC_SUBST(INTROSPECT_XML_PATH) 
     78-fi 
     79- 
     80-AM_CONDITIONAL(USE_INTROSPECT_XML, $use_introspect_xml) 
     81- 
     82 AC_OUTPUT([ 
     83 Makefile 
     84 m4/Makefile 
     85--- a/Makefile.am 
     86+++ b/Makefile.am 
     87@@ -1,7 +1,7 @@ 
     88 GLIB_PC=dbus-glib-1.pc 
     89  
     90-SUBDIRS=dbus tools test doc 
     91-DIST_SUBDIRS=dbus tools test doc m4 
     92+SUBDIRS=dbus tools 
     93+DIST_SUBDIRS=dbus tools m4 
     94  
     95 pkgconfigdir = $(libdir)/pkgconfig 
     96 pkgconfig_DATA = $(GLIB_PC) 
Note: See TracChangeset for help on using the changeset viewer.