Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27747
Modified Files:
automake1.11.info automake1.11.patch
Log Message:
fix selftest in when vala is installed
Index: automake1.11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/automake1.11.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- automake1.11.info 25 Aug 2013 14:20:09 -0000 1.14
+++ automake1.11.info 27 Aug 2013 09:32:48 -0000 1.15
@@ -11,7 +11,7 @@
Provides: automaken
PatchFile: %n.patch
-PatchFile-MD5: 22386c11a27201c9b4d05f13890a8898
+PatchFile-MD5: 1ef80d80490de9f80f83f74e94356fb2
PatchScript: <<
#!/bin/sh -ev
%{default_script}
@@ -26,6 +26,9 @@
# fink's libtool2 has %p/bin/glibtool not %p/bin/libtool and Apple's
# /usr/bin/libtool is different beast
ln -s %p/bin/glibtool tests/libtool
+
+ # make sure pkg-config macros are available to the test harness
+ ln -s %p/share/aclocal/pkg.m4 m4
<<
# HACK: Set ac_cv_prog_TEX to disable any TeX or texinfo related tests,
@@ -63,7 +66,7 @@
# TODO: Perhaps rename automake.info* to automake-X.Y.info* ?
InfoTest: <<
TestScript: make check || exit 2
- TestDepends: dejagnu, libtool2
+ TestDepends: dejagnu, libtool2, pkgconfig
<<
DocFiles: COPYING README AUTHORS NEWS THANKS
InfoDocs: automake.info
@@ -85,7 +88,8 @@
Previous versions by Christoph Pfisterer, Max Horn.
Desc adapted from debian :-)
- Import patches from automake1.12 changes to vala-vapi.test
+ Import patches from automake1.12 changes to vala-vapi.test (misc
+ fix), and other vala-*.test (propagate gobject compiler flags)
<<
License: GPL
Maintainer: Chris Zubrzycki <bere...@users.sourceforge.net>
Index: automake1.11.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/automake1.11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- automake1.11.patch 19 Sep 2012 07:07:45 -0000 1.1
+++ automake1.11.patch 27 Aug 2013 09:32:48 -0000 1.2
@@ -1,7 +1,93 @@
+diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-mix.test
automake-1.11.6/tests/vala-mix.test
+--- automake-1.11.6.orig/tests/vala-mix.test 2012-07-09 11:39:58.000000000
-0400
++++ automake-1.11.6/tests/vala-mix.test 2013-08-27 04:35:17.000000000
-0400
+@@ -16,7 +16,7 @@
+
+ # Vala sources and C sources in the same program. Functional test.
+
+-required='valac cc GNUmake'
++required='valac cc pkg-config GNUmake'
+ . ./defs || Exit 1
+
+ set -e
+@@ -25,16 +25,18 @@
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = zardoz mu baz
+-AM_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++LDADD = $(GOBJECT_LIBS)
+ zardoz_SOURCES = foo.vala bar.c
+ mu_SOURCES = 1.vala 2.c
+ mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run
+-mu_CFLAGS = -DHAVE_MU
++mu_CFLAGS = -DHAVE_MU $(GOBJECT_CFLAGS)
+ baz_SOURCES = baz.c
+ END
+
+diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-mix2.test
automake-1.11.6/tests/vala-mix2.test
+--- automake-1.11.6.orig/tests/vala-mix2.test 2012-07-09 11:39:58.000000000
-0400
++++ automake-1.11.6/tests/vala-mix2.test 2013-08-26 23:31:08.000000000
-0400
+@@ -17,7 +17,7 @@
+ # Vala sources, C and C++ sources and C and C++ headers in the same
+ # program. Functional test. See automake bug#10894.
+
+-required='valac cc c++ GNUmake'
++required='valac cc c++ pkg-config GNUmake'
+ . ./defs || Exit 1
+
+ set -e
+@@ -26,12 +26,14 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = zardoz
+-AM_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++zardoz_LDADD = $(GOBJECT_LIBS)
+ zardoz_SOURCES = zardoz.vala foo.h bar.c baz.c zen.hh master.cxx
+ END
+
diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-vapi.test
automake-1.11.6/tests/vala-vapi.test
--- automake-1.11.6.orig/tests/vala-vapi.test 2012-07-09 11:39:58.000000000
-0400
-+++ automake-1.11.6/tests/vala-vapi.test 2012-09-19 02:15:05.000000000
-0400
-@@ -42,7 +42,9 @@
++++ automake-1.11.6/tests/vala-vapi.test 2013-08-26 23:32:24.000000000
-0400
+@@ -16,7 +16,7 @@
+
+ # Test and that vapi files are correctly handled by Vala support.
+
+-required='valac cc GNUmake'
++required='pkg-config valac cc GNUmake'
+ . ./defs || Exit 1
+
+ set -e
+@@ -25,12 +25,14 @@
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = zardoz
+-AM_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++LDADD = $(GOBJECT_LIBS)
+ zardoz_SOURCES = zardoz.vala foo.vapi foo.h
+ END
+
+@@ -42,7 +44,9 @@
}
END
@@ -12,7 +98,7 @@
cat > foo.vapi <<'END'
[CCode (cprefix="", lower_case_cprefix="", cheader_filename="foo.h")]
-@@ -76,7 +78,9 @@
+@@ -76,7 +80,9 @@
# Simple check on remake rules.
$sleep
@@ -23,3 +109,31 @@
sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99
$MAKE && Exit 1
sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99
+diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-vpath.test
automake-1.11.6/tests/vala-vpath.test
+--- automake-1.11.6.orig/tests/vala-vpath.test 2012-07-09 11:39:58.000000000
-0400
++++ automake-1.11.6/tests/vala-vpath.test 2013-08-26 23:30:41.000000000
-0400
+@@ -17,7 +17,7 @@
+ # Test to make sure vala support handles from-scratch VPATH builds.
+ # See automake bug#8753.
+
+-required="valac GNUmake"
++required="valac pkg-config GNUmake"
+ . ./defs || Exit 1
+
+ set -e
+@@ -26,12 +26,14 @@
+ AC_CONFIG_SRCDIR([hello.vala])
+ AC_PROG_CC
+ AM_PROG_VALAC([0.7.3])
++PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
+ AC_OUTPUT
+ END
+
+ cat > Makefile.am <<'END'
+ bin_PROGRAMS = foo
+-foo_VALAFLAGS = --profile=posix
++AM_CFLAGS = $(GOBJECT_CFLAGS)
++LDADD = $(GOBJECT_LIBS)
+ foo_SOURCES = hello.vala
+ END
+
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
