Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv13689
Modified Files:
guile18.info guile18.patch
Log Message:
sync. w/ unstable
Index: guile18.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/guile18.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- guile18.info 16 Feb 2011 18:43:48 -0000 1.4
+++ guile18.info 10 Oct 2011 23:48:22 -0000 1.5
@@ -1,35 +1,74 @@
Package: guile18
-Version: 1.8.3
-Revision: 3
-BuildDepends: readline5 (>= 5.0-1004), libncurses5 (>= 5.4-20041023-1006),
libtool14, gmp, libiconv-dev, fink (>= 0.24.12)
-Depends: %N-shlibs (= %v-%r), %N-libs (= %v-%r), libtool14-shlibs, gmp-shlibs,
libiconv
+Version: 1.8.8
+Revision: 4
+BuildDepends: <<
+ readline5 (>= 5.0-1004),
+ libncurses5 (>= 5.4-20041023-1006),
+ libtool2,
+ gmp,
+ libgettext8-dev,
+ gettext-tools,
+ libiconv-dev,
+ fink (>= 0.24.12)
+<<
+Depends: <<
+ %N-shlibs (= %v-%r),
+ %N-libs (= %v-%r),
+ libtool2-shlibs,
+ gmp-shlibs
+<<
GCC: 4.0
Source: mirror:gnu:guile/guile-%v.tar.gz
-Source-MD5: 7fd016924e1bc3e273f4009a080942de
+Source-MD5: 18661a8fdfef13e2fcb7651720aa53f3
PatchFile: %n.patch
-PatchFile-MD5: 87788692c78d5724b96fe85c0ac28c04
+PatchFile-MD5: 930fc6fd2c15ed92ec032d93f785216c
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' <%{PatchFile} | patch -p1
perl -i -pe 's|GUILE-guile|GUILE-guile-1.8|' scripts/*
perl -i -pe 's|(lt_dlinit\s*\(\s*\))|\1; lt_dladdsearchdir("\%p/lib")|'
libguile/dynl.c
<<
-ConfigureParams: --infodir=%p/share/info
--program-transform-name="s|guile|guile\-1\.8|g" --disable-dependency-tracking
-NoSetCPPFLAGS: true
-NoSetLDFLAGS: true
-SetCPPFLAGS: -Dmacosx
+ConfigureParams: <<
+ --infodir=%p/share/info \
+ --program-transform-name="s|guile|guile\-1\.8|g" \
+ --disable-dependency-tracking \
+ $clang_configure_params
+<<
+SetLDFLAGS: -I%p/include
+SetCPPFLAGS: -Dmacosx -I%p/include
CompileScript: <<
-#! /bin/sh -ex
- export LIBRARY_PATH=%p/lib
- export CPATH=%p/include
- ./configure %c
+ #!/bin/sh -evx
+ # clang needs explicit -fwrapv behavior and allowing of some warnings
+ darwin_vers=`uname -r | cut -d. -f1`
+ if test "$darwin_vers" -ge 11 ; then
+ export CFLAGS='-g -O3 -fwrapv'
+ clang_configure_params="--disable-error-on-warning"
+ fi
+ mkdir build
+ cd build
+ ../configure %c
echo "#undef LTDL_DLOPEN_DEPLIBS" >> config.h
echo "#define LTDL_SHLIB_EXT \".so\"" >> config.h
echo "#undef HAVE_STAT64" >> config.h
make
<<
+InfoTest: <<
+ TestDepends: fink-package-precedence
+ TestConfigureParams: --enable-dependency-tracking
+ TestScript: <<
+ #!/bin/sh -ev
+ cd build
+ # make -k check || exit 2
+ make -k check || { echo "WARNING: Some tests failed in the testsuite." ;}
+ fink-package-precedence --headers .
+ fink-package-precedence --libs .
+ <<
+ TestSuiteSize: small
+<<
InstallScript: <<
+ #!/bin/sh -ev
+ cd build
make -j1 install DESTDIR=%d
- install -m 755 guile18-build %i/bin/guile18-build
+ install -m 755 ../guile18-build %i/bin/guile18-build
mkdir -p %i/share/guile/1.8/scripts/binoverride
ln -s %p/bin/guile-1.8 %i/share/guile/1.8/scripts/binoverride/guile
ln -s %p/bin/guile-1.8-config
%i/share/guile/1.8/scripts/binoverride/guile-config
@@ -38,13 +77,13 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: libncurses5-shlibs (>= 5.4-20041023-1006), libiconv
+ Depends: libncurses5-shlibs (>= 5.4-20041023-1006), libgettext8-shlibs
Files: <<
lib/libguile.*.dylib
<<
- DocFiles: COPYING
+ DocFiles: COPYING.LESSER
Shlibs: <<
- %p/lib/libguile.17.dylib 19.0.0 %n (>= 1.8.1-1)
+ %p/lib/libguile.17.dylib 22.0.0 %n (>= 1.8.8-1)
<<
Description: Shared libraries for guile18
<<
@@ -56,9 +95,11 @@
lib/libguile-srfi-srfi-1-v-3.*
lib/libguile-srfi-srfi-60-v-2.*
lib/libguilereadline-v-17.*
- share/guile/1.8
+ share/guile/1.8/[A-Za-rt-z]*
+ share/guile/1.8/scripts/[A-Zac-z]*
+ share/guile/1.8/srfi
<<
- DocFiles: COPYING
+ DocFiles: COPYING.LESSER
Depends: readline5-shlibs (>= 5.0-1004), %N-shlibs (= %v-%r)
Description: Scheme libraries and modules for guile18
<<
@@ -75,19 +116,19 @@
lib/libguile.la
lib/libguile.dylib
<<
- DocFiles: COPYING
+ DocFiles: COPYING.LESSER
Description: Development package for guile18
<<
SplitOff4: <<
Package: %N-doc
Conflicts: guile20-doc, guile16-doc, guile16 (<= 1.6.7-1011)
Replaces: guile20-doc, guile16-doc, guile16 (<= 1.6.7-1011)
- DocFiles: COPYING
+ DocFiles: COPYING.LESSER
Files: share/info
InfoDocs: guile.info guile-tut.info goops.info r5rs.info
Description: Texinfo files for guile18
<<
-DocFiles: README COPYING AUTHORS HACKING NEWS THANKS
+DocFiles: README COPYING.LESSER AUTHORS HACKING NEWS THANKS
#
Description: Embedable Scheme interpreter
DescPort: <<
@@ -100,7 +141,9 @@
Made the main packages not conflict with guile-1.4
Make sure to declare the darwinish _environ symbol before using it.
+
+Former maintainer: Matthias Neeracher <[email protected]>
<<
License: GPL
Homepage: http://www.gnu.org/software/guile/guile.html
-Maintainer: Matthias Neeracher <[email protected]>
+Maintainer: David Fang <[email protected]>
Index: guile18.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/guile18.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- guile18.patch 12 Sep 2007 17:37:31 -0000 1.1
+++ guile18.patch 10 Oct 2011 23:48:23 -0000 1.2
@@ -1,15 +1,27 @@
-diff -ruN guile-1.8.1-orig/guile-config/guile-config.in
guile-1.8.1/guile-config/guile-config.in
---- guile-1.8.1-orig/guile-config/guile-config.in 2007-01-18
21:52:24.000000000 -0800
-+++ guile-1.8.1/guile-config/guile-config.in 2007-01-18 21:53:35.000000000
-0800
+diff -ruN guile-1.8.7-orig/configure guile-1.8.7/configure
+--- guile-1.8.7-orig/configure 2010-07-15 21:53:16.000000000 +0200
++++ guile-1.8.7/configure 2010-07-15 22:24:32.000000000 +0200
+@@ -33685,6 +33685,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
++
++int find_stack_direction () __attribute__((noinline));
+ int
+ find_stack_direction ()
+ {
+diff -ruN guile-1.8.7-orig/guile-config/guile-config.in
guile-1.8.7/guile-config/guile-config.in
+--- guile-1.8.7-orig/guile-config/guile-config.in 2010-07-15
21:53:16.000000000 +0200
++++ guile-1.8.7/guile-config/guile-config.in 2010-07-15 21:53:49.000000000
+0200
@@ -1,4 +1,4 @@
-#!@-bindir-@/guile \
+#!@-bindir-@/guile-1.8 \
-e main -s
!#
;;;; guile-config --- utility for linking programs with Guile
-diff -ruN guile-1.8.1-orig/guile-config/guile.m4
guile-1.8.1/guile-config/guile.m4
---- guile-1.8.1-orig/guile-config/guile.m4 2007-01-18 21:52:24.000000000
-0800
-+++ guile-1.8.1/guile-config/guile.m4 2007-01-18 21:54:36.000000000 -0800
+diff -ruN guile-1.8.7-orig/guile-config/guile.m4
guile-1.8.7/guile-config/guile.m4
+--- guile-1.8.7-orig/guile-config/guile.m4 2010-07-15 21:53:16.000000000
+0200
++++ guile-1.8.7/guile-config/guile.m4 2010-07-15 21:53:49.000000000 +0200
@@ -47,17 +47,17 @@
# The variables are marked for substitution, as by @code{AC_SUBST}.
#
@@ -31,10 +43,10 @@
AC_SUBST(GUILE_TOOLS)
])
-diff -ruN guile-1.8.1-orig/guile-readline/Makefile.in
guile-1.8.1/guile-readline/Makefile.in
---- guile-1.8.1-orig/guile-readline/Makefile.in 2007-01-18
21:52:24.000000000 -0800
-+++ guile-1.8.1/guile-readline/Makefile.in 2007-01-19 01:55:33.000000000
-0800
-@@ -220,7 +220,7 @@
+diff -ruN guile-1.8.7-orig/guile-readline/Makefile.in
guile-1.8.7/guile-readline/Makefile.in
+--- guile-1.8.7-orig/guile-readline/Makefile.in 2010-07-15
21:53:16.000000000 +0200
++++ guile-1.8.7/guile-readline/Makefile.in 2010-07-15 21:53:49.000000000
+0200
+@@ -277,7 +277,7 @@
lib_LTLIBRARIES = libguilereadline-v-@[email protected]
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD =
../libguile/libguile.la
@@ -43,9 +55,9 @@
BUILT_SOURCES = readline.x
pkginclude_HEADERS = readline.h
snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-diff -ruN guile-1.8.1-orig/guile18-build guile-1.8.1/guile18-build
---- guile-1.8.1-orig/guile18-build 1969-12-31 16:00:00.000000000 -0800
-+++ guile-1.8.1/guile18-build 2007-01-18 21:56:19.000000000 -0800
+diff -ruN guile-1.8.7-orig/guile18-build guile-1.8.7/guile18-build
+--- guile-1.8.7-orig/guile18-build 1970-01-01 01:00:00.000000000 +0100
++++ guile-1.8.7/guile18-build 2010-07-15 21:53:49.000000000 +0200
@@ -0,0 +1,10 @@
+#! /bin/sh
+GUILE=guile-1.8
@@ -57,10 +69,10 @@
+export GUILE_TOOLS
+export PATH
+eval "$@"
-diff -ruN guile-1.8.1-orig/srfi/Makefile.in guile-1.8.1/srfi/Makefile.in
---- guile-1.8.1-orig/srfi/Makefile.in 2007-01-18 21:52:24.000000000 -0800
-+++ guile-1.8.1/srfi/Makefile.in 2007-01-19 01:57:14.000000000 -0800
-@@ -320,16 +320,16 @@
+diff -ruN guile-1.8.7-orig/srfi/Makefile.in guile-1.8.7/srfi/Makefile.in
+--- guile-1.8.7-orig/srfi/Makefile.in 2010-07-15 21:53:16.000000000 +0200
++++ guile-1.8.7/srfi/Makefile.in 2010-07-15 21:53:49.000000000 +0200
+@@ -360,16 +360,16 @@
BUILT_SOURCES = srfi-1.x srfi-4.x srfi-13.x srfi-14.x srfi-60.x
libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_SOURCES = srfi-1.x
srfi-1.c
libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD =
../libguile/libguile.la
@@ -81,3 +93,25 @@
srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
srfi_DATA = srfi-1.scm \
srfi-2.scm \
+diff -ruN guile-1.8.8-orig/test-suite/standalone/Makefile.in
guile-1.8.8/test-suite/standalone/Makefile.in
+--- guile-1.8.8-orig/test-suite/standalone/Makefile.in 2010-12-13
14:29:40.000000000 -0500
++++ guile-1.8.8/test-suite/standalone/Makefile.in 2011-06-14
10:44:53.000000000 -0400
+@@ -398,15 +398,14 @@
+ builddir="$(builddir)" \
+ "${top_builddir}/pre-inst-guile-env"
+
+-test_cflags = \
++INCLUDES = \
+ -I$(top_srcdir)/test-suite/standalone \
+ -I$(top_srcdir) -I$(top_builddir) \
+ $(EXTRA_DEFS) $(GUILE_CFLAGS)
+
+-AM_LDFLAGS = $(GUILE_CFLAGS)
+ snarfcppopts = \
+- $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS) \
+- -I$(top_srcdir) -I$(top_builddir)
++ $(DEFS) $(DEFAULT_INCLUDES) -I$(top_srcdir) -I$(top_builddir) \
++ $(CPPFLAGS) $(CFLAGS)
+
+ SUFFIXES = .x
+ CLEANFILES = *.x
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
