Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94cdc92460e534eb3ef2eba7fe7e873f8453efc0
commit 94cdc92460e534eb3ef2eba7fe7e873f8453efc0 Author: crazy <[EMAIL PROTECTED]> Date: Wed May 14 13:20:57 2008 +0200 guile-1.8.5-1-x86_64 * Version bump * removed all old patches * added sed hack to make it compile with newer libtool diff --git a/source/devel/guile/FrugalBuild b/source/devel/guile/FrugalBuild index 6fc7af3..aa5d942 100644 --- a/source/devel/guile/FrugalBuild +++ b/source/devel/guile/FrugalBuild @@ -3,27 +3,27 @@ # Contributor: Laszlo Dvornik <[EMAIL PROTECTED]> pkgname=guile -pkgver=1.8.4 -pkgrel=2 +pkgver=1.8.5 +pkgrel=1 pkgdesc="Guile is a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/"; depends=('gmp' 'readline' 'libtool>=2.2.2') groups=('devel') archs=('i686' 'x86_64') Fup2gnugz -source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz guile-1.8.0-deplibs-x86-64.patch) -Fconfopts="$Fconfopts --disable-networking --with-threads" -sha1sums=('1e80fe242acfde2bfa39fd1e8409a8f010e24e2b' \ - 'e201dfab1f6d6f8a5574572e7da5f91a530215a0') +source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('3ef611cf5c4998a5bdfc7935765bb68730038614') build() { Fcd - ## yeah f***ing fix your code before adding something - ## like this by default + ## damn libtool crap + sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in Fsed '-Werror' '' configure.in Fautoreconf - Fbuild + Fbuild \ + --disable-networking \ + --with-threads \ + --disable-error-on-warning } - # optimization OK diff --git a/source/devel/guile/guile-1.8.0-deplibs-x86-64.patch b/source/devel/guile/guile-1.8.0-deplibs-x86-64.patch deleted file mode 100644 index 971df32..0000000 --- a/source/devel/guile/guile-1.8.0-deplibs-x86-64.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur guile-1.8.1/configure guile-1.8.1-p/configure ---- guile-1.8.1/configure 2006-10-07 05:54:24.000000000 +0200 -+++ guile-1.8.1-p/configure 2006-10-07 18:25:05.000000000 +0200 -@@ -11020,7 +11020,7 @@ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -diff -Naur guile-1.8.1/guile-config/guile-config.in guile-1.8.1-p/guile-config/guile-config.in ---- guile-1.8.1/guile-config/guile-config.in 2006-09-20 02:19:02.000000000 +0200 -+++ guile-1.8.1-p/guile-config/guile-config.in 2006-10-07 18:28:30.000000000 +0200 -@@ -151,9 +151,9 @@ - (display (string-join - (list - (get-build-info 'CFLAGS) -- "-lguile -lltdl" -+ "-lguile" - (if (or (string=? libdir "/usr/lib") -- (string=? libdir "/usr/lib/")) -+ (string=? libdir "/usr/lib64")) - "" - (string-append "-L" (get-build-info 'libdir))) - (string-join other-flags) -diff -Naur guile-1.8.1/guile-readline/configure guile-1.8.1-p/guile-readline/configure ---- guile-1.8.1/guile-readline/configure 2006-10-07 05:54:41.000000000 +0200 -+++ guile-1.8.1-p/guile-readline/configure 2006-10-07 18:25:05.000000000 +0200 -@@ -10413,7 +10413,7 @@ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -diff -Naur guile-1.8.1/libguile/Makefile.in guile-1.8.1-p/libguile/Makefile.in ---- guile-1.8.1/libguile/Makefile.in 2006-10-07 05:54:33.000000000 +0200 -+++ guile-1.8.1-p/libguile/Makefile.in 2006-10-07 18:25:05.000000000 +0200 -@@ -1908,8 +1908,8 @@ - @echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp - @echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp - @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp -- @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp -- @echo ' { "top_srcdir", "@top_srcdir_absolute@" }, \' >> libpath.tmp -+ @echo ' { "srcdir", "" }, \' >> libpath.tmp -+ @echo ' { "top_srcdir", "" }, \' >> libpath.tmp - @echo ' { "prefix", "@prefix@" }, \' >> libpath.tmp - @echo ' { "exec_prefix", "@exec_prefix@" }, \' >> libpath.tmp - @echo ' { "bindir", "@bindir@" }, \' >> libpath.tmp -@@ -1930,7 +1930,7 @@ - @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp - @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \ - >> libpath.tmp -- @echo ' { "LIBS", "@GUILE_LIBS@" }, \' >> libpath.tmp -+ @echo ' { "LIBS", "" }, \' >> libpath.tmp - @echo ' { "CFLAGS", "@GUILE_CFLAGS@" }, \' >> libpath.tmp - @echo ' { "buildstamp", "'"`date`"'" }, \' >> libpath.tmp - @echo '}' >> libpath.tmp diff --git a/source/devel/guile/guile-1.8.0-slib.patch b/source/devel/guile/guile-1.8.0-slib.patch deleted file mode 100644 index 11ece4f..0000000 --- a/source/devel/guile/guile-1.8.0-slib.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- guile-1.8.0/ice-9/slib.scm.slib 2006-02-12 14:29:10.000000000 +0100 -+++ guile-1.8.0/ice-9/slib.scm 2006-03-16 10:29:15.000000000 +0100 -@@ -22,6 +22,7 @@ - scheme-implementation-type scheme-implementation-version - output-port-width output-port-height array-indexes - make-random-state -+ user-vicinity program-vicinity with-load-pathname - -1+ <? <=? =? >? >=? - require slib:error slib:exit slib:warn slib:eval - defmacro:eval logical:logand logical:logior logical:logxor -@@ -254,6 +255,32 @@ - (define (scheme-implementation-home-page) - "http://www.gnu.org/software/guile/guile.html";) - -+(define (user-vicinity) "") -+(define (pathname->vicinity pathname) -+ (let loop ((i (- (string-length pathname) 1))) -+ (cond ((negative? i) "") -+ ((eqv? (string-ref pathname i) #\/) -+ (substring pathname 0 (+ i 1))) -+ (else (loop (- i 1)))))) -+(define (program-vicinity) -+ (define clp (current-load-port)) -+ (if clp -+ (pathname->vicinity (port-filename clp)) -+ (slib:error 'program-vicinity " called; use slib:load to load"))) -+(define with-load-pathname -+ (let ((exchange -+ (lambda (new) -+ (let ((old program-vicinity)) -+ (set! program-vicinity new) -+ old)))) -+ (lambda (path thunk) -+ (define old #f) -+ (define vic (pathname->vicinity path)) -+ (dynamic-wind -+ (lambda () (set! old (exchange (lambda () vic)))) -+ thunk -+ (lambda () (exchange old)))))) -+ - ;; legacy from r3rs, but slib says all implementations provide these - ;; ("Legacy" section of the "Miscellany" node in the manual) - (define-public t #t) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
