Revert previous, there are patches which should make that the python

stuff is not built/installed. Patch Makefile.am the same way as
Makefile.in were patched, because the "kqueue" option regenerates
the latter.
This commit is contained in:
drochner 2012-01-31 18:36:01 +00:00
parent 8f324ef4ac
commit fcdf4c7e06
4 changed files with 52 additions and 12 deletions

View file

@ -1,10 +1,8 @@
# $NetBSD: Makefile,v 1.192 2012/01/31 14:43:06 abs Exp $
# $NetBSD: Makefile,v 1.193 2012/01/31 18:36:01 drochner Exp $
.include "Makefile.common"
.include "options.mk"
PKGREVISION= 1
CATEGORIES= devel
COMMENT= Some useful routines for C programming (glib2)
@ -47,11 +45,6 @@ BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1
LIBS.SunOS+= -lnsl -lsocket
# Until the implicit but not declared dependency on python is resolved
post-install:
${RM} ${DESTDIR}${PREFIX}/bin/gdbus-codegen
${RM} -r ${DESTDIR}${PREFIX}/lib/gdbus-2.0
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.159 2012/01/29 17:43:43 drochner Exp $
$NetBSD: distinfo,v 1.160 2012/01/31 18:36:01 drochner Exp $
SHA1 (glib-2.30.2.tar.bz2) = 70208757905037fa1f8b89797db0097c5e82a140
RMD160 (glib-2.30.2.tar.bz2) = efe0d8ae945dd3b20ca4835dcb45696fd0914c06
@ -23,6 +23,7 @@ SHA1 (patch-an) = 9384dca0b98bde4e2d64dbca6584a3aefa0c352c
SHA1 (patch-ap) = 38a805f95e8f7ca35c73984be9142336c6a3ec4c
SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
SHA1 (patch-ar) = 27679e663399ffa1ca1ad95876084f05930bece3
SHA1 (patch-as) = 0d9b461d5bf6d267b50eac892d8ad8a82f90be18
SHA1 (patch-ba) = 8d50fcbe3e9238bbf7bafee4c0ce627e34c3d9d2
SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
@ -34,6 +35,6 @@ SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0
SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
SHA1 (patch-cj) = baaa3d2ef2b58d17b81fd8341a28f99b850648a8
SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
SHA1 (patch-cl) = 2b815325c77c7746fc2bce14a35438ef8edd7c5f
SHA1 (patch-cl) = 5d4fd59b55bfc2f08fa4d4f67a3cc9323872c746
SHA1 (patch-cm) = 8ddac97b3476c992abea3e5d9383cd3a5c9008f3
SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4

View file

@ -0,0 +1,37 @@
$NetBSD: patch-as,v 1.1 2012/01/31 18:36:01 drochner Exp $
avoid python dependency
--- gio/tests/Makefile.am.orig 2011-11-11 17:56:52.000000000 +0000
+++ gio/tests/Makefile.am
@@ -4,7 +4,7 @@ BUILT_SOURCES =
include $(top_srcdir)/Makefile.decl
-SUBDIRS = gdbus-object-manager-example
+#SUBDIRS = gdbus-object-manager-example
INCLUDES = \
-g \
@@ -115,12 +115,9 @@ TEST_PROGS += \
unix-fd \
unix-streams \
gapplication \
- gdbus-test-codegen \
$(NULL)
SAMPLE_PROGS += \
gdbus-example-unix-fd-client \
- gdbus-example-objectmanager-server \
- gdbus-example-objectmanager-client \
$(NULL)
endif
@@ -286,7 +283,7 @@ gdbus-test-codegen-generated.h gdbus-tes
$(srcdir)/test-codegen.xml \
$(NULL)
-BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+#BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
gdbus_test_codegen_SOURCES = gdbus-test-codegen.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c
gdbus_test_codegen_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h

View file

@ -1,7 +1,16 @@
$NetBSD: patch-cl,v 1.2 2012/01/29 10:46:54 drochner Exp $
$NetBSD: patch-cl,v 1.3 2012/01/31 18:36:01 drochner Exp $
--- gio/Makefile.am.orig 2011-10-14 03:47:57.000000000 +0000
--- gio/Makefile.am.orig 2011-11-11 17:56:51.000000000 +0000
+++ gio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
NULL =
-SUBDIRS = gdbus-2.0/codegen
+SUBDIRS =
if OS_UNIX
SUBDIRS += libasyncns xdgmime
@@ -633,12 +633,6 @@ gdbus_LDADD = libgio-2.0.la \
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la