* [gentoo-commits] proj/lisp:master commit in: dev-scheme/bigloo/files/, dev-scheme/bigloo/
@ 2011-02-20 15:25 Cyprien Nicolas
0 siblings, 0 replies; 2+ messages in thread
From: Cyprien Nicolas @ 2011-02-20 15:25 UTC (permalink / raw
To: gentoo-commits
commit: 651037d748511763c102dbe7878ed89334ef9ab0
Author: Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Feb 20 15:25:17 2011 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Sun Feb 20 15:25:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=651037d7
dev-scheme/bigloo-3.6a: Add Jerry James's patch for fixing printf's format strings
---
dev-scheme/bigloo/bigloo-3.6a.ebuild | 3 +
.../bigloo-3.6a-fix_printf_format_warnings.patch | 237 ++++++++++++++++++++
2 files changed, 240 insertions(+), 0 deletions(-)
diff --git a/dev-scheme/bigloo/bigloo-3.6a.ebuild b/dev-scheme/bigloo/bigloo-3.6a.ebuild
index c1603db..5d34d96 100644
--- a/dev-scheme/bigloo/bigloo-3.6a.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.6a.ebuild
@@ -55,6 +55,9 @@ src_prepare() {
# Removing bundled boehm-gc
rm -rf gc || die
+ # Fix some printf format warnings
+ epatch "${FILESDIR}/${PN}-${BGL_RELEASE}-fix_printf_format_warnings.patch"
+
# bug 354751: Fix '[a-z]' sed range for non ascii LC_COLLATE order
sed 's/a-z/[:alpha:]/' -i configure autoconf/* || die 'sed s/a-z/[:alpha:]/ failed'
diff --git a/dev-scheme/bigloo/files/bigloo-3.6a-fix_printf_format_warnings.patch b/dev-scheme/bigloo/files/bigloo-3.6a-fix_printf_format_warnings.patch
new file mode 100644
index 0000000..d21541a
--- /dev/null
+++ b/dev-scheme/bigloo/files/bigloo-3.6a-fix_printf_format_warnings.patch
@@ -0,0 +1,237 @@
+Author: Jerry James <loganjerry <at> gmail.com>
+Title: Patch for removing printf "warning: format" in bigloo source code
+URL: http://article.gmane.org/gmane.lisp.scheme.bigloo/5112
+--- api/gstreamer/src/Clib/bglgst.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ api/gstreamer/src/Clib/bglgst.c 2011-02-14 15:24:29.464185149 -0700
+@@ -93,12 +93,12 @@ bglgst_use_threadsp() {
+ /* bgl_gobject_boehm_alloc_init ... */
+ /*---------------------------------------------------------------------*/
+ static gpointer bgl_gst_alloc( gsize n ) {
+- fprintf( stderr, "GC_MALLOC n=%d\n", n );
++ fprintf( stderr, "GC_MALLOC n=%" G_GSIZE_FORMAT "\n", n );
+ return GC_MALLOC( n );
+ }
+
+ static gpointer bgl_gst_realloc( gpointer ptr, gsize n ) {
+- fprintf( stderr, "GC_REALLOC ptr=%p n=%d\n", ptr, n );
++ fprintf( stderr, "GC_REALLOC ptr=%p n=%" G_GSIZE_FORMAT "\n", ptr, n );
+ return GC_REALLOC( ptr, n );
+ }
+
+@@ -297,7 +297,7 @@ bgl_g_value_to_obj( const GValue *gval,
+ case G_TYPE_ENUM: {
+ long obj = g_value_get_enum( gval );
+
+- fprintf( stderr, "G_TYPE_ENUM not implemented yet %d (%s:%d)\n",
++ fprintf( stderr, "G_TYPE_ENUM not implemented yet %ld (%s:%d)\n",
+ obj, __FILE__, __LINE__ );
+
+ return BUNSPEC;
+--- runtime/Clib/capply.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ runtime/Clib/capply.c 2011-02-14 15:04:59.255817644 -0700
+@@ -627,7 +627,7 @@ obj_t apply( obj_t function, obj_t args_
+ default: {
+ char msg[ 128 ];
+ sprintf( msg,
+- "too many arguments provided (%d) in apply (max 50)",
++ "too many arguments provided (%ld) in apply (max 50)",
+ -arity );
+
+ C_SYSTEM_FAILURE( BGL_ERROR, "apply", msg, function );
+@@ -1229,7 +1229,7 @@ obj_t apply( obj_t function, obj_t args_
+ default: {
+ char msg[ 128 ];
+ sprintf( msg,
+- "too many arguments provided (%d) in apply (max 50)",
++ "too many arguments provided (%ld) in apply (max 50)",
+ arity );
+
+ C_SYSTEM_FAILURE( BGL_ERROR, "apply", msg, function );
+--- runtime/Clib/cstring.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ runtime/Clib/cstring.c 2011-02-14 15:04:18.391856999 -0700
+@@ -293,23 +293,23 @@ integer_to_string_padding( long x, long
+
+ case 8 :
+ if( x < 0 ) {
+- sprintf( fmt, "-%%0%dlo", padding - 1 );
++ sprintf( fmt, "-%%0%ldlo", padding - 1 );
+ } else {
+- sprintf( fmt, "%%0%dlo", padding );
++ sprintf( fmt, "%%0%ldlo", padding );
+ }
+ break;
+ case 16 :
+ if( x < 0 ) {
+- sprintf( fmt, "-%%0%dlx", padding - 1);
++ sprintf( fmt, "-%%0%ldlx", padding - 1);
+ } else {
+- sprintf( fmt, "%%0%dlx", padding );
++ sprintf( fmt, "%%0%ldlx", padding );
+ }
+ break;
+ default :
+ if( x < 0 ) {
+- sprintf( fmt, "-%%0%dld", padding - 1 );
++ sprintf( fmt, "-%%0%ldld", padding - 1 );
+ } else {
+- sprintf( fmt, "%%0%dld", padding );
++ sprintf( fmt, "%%0%ldld", padding );
+ }
+ break;
+ }
+--- runtime/Clib/cerror.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ runtime/Clib/cerror.c 2011-02-14 15:03:19.097168636 -0700
+@@ -69,7 +69,7 @@ bgl_debug_typeof( obj_t obj ) {
+ obj_t
+ bgl_debug_header( obj_t obj ) {
+ fprintf( stderr, "obj=%p\n", obj );
+- fprintf( stderr, " TAG_MASK=%d ", (((long)obj) & TAG_MASK) );
++ fprintf( stderr, " TAG_MASK=%ld ", (((long)obj) & TAG_MASK) );
+ switch( (((long)obj) & TAG_MASK) ) {
+ case TAG_STRUCT: fprintf( stderr, "(TAG_STRUCT)\n" ); break;
+ case TAG_INT: fprintf( stderr, "(TAG_INT)\n" ); break;
+@@ -96,7 +96,7 @@ bgl_debug_header( obj_t obj ) {
+ }
+
+ if( POINTERP( obj ) ) {
+- fprintf( stderr, " TYPE=%d ", TYPE( obj ) );
++ fprintf( stderr, " TYPE=%ld ", TYPE( obj ) );
+ switch( TYPE( obj ) ) {
+ case 0: fprintf( stderr, "(PAIR_TYPE) " ); break;
+ case 1: fprintf( stderr, "(STRING_TYPE) " ); break;
+@@ -132,7 +132,7 @@ bgl_debug_header( obj_t obj ) {
+ else
+ fprintf( stderr, "(unknown type) " );
+ }
+- fprintf( stderr, "HEADER_SIZE=%d\n", HEADER_SIZE( CREF( obj )->header ) );
++ fprintf( stderr, "HEADER_SIZE=%ld\n", HEADER_SIZE( CREF( obj )->header ) );
+ }
+
+ return obj;
+--- runtime/Clib/ccontrol.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ runtime/Clib/ccontrol.c 2011-02-14 15:07:40.999882828 -0700
+@@ -200,9 +200,9 @@ bgl_procedure_entry_to_string( obj_t pro
+ obj_t res = make_string_sans_fill( 17 );
+
+ if( VA_PROCEDUREP( proc ) ) {
+- sprintf( BSTRING_TO_STRING( res ), "%016x", PROCEDURE_VA_ENTRY( proc ) );
++ sprintf( BSTRING_TO_STRING( res ), "%016lx", (long)PROCEDURE_VA_ENTRY( proc ) );
+ } else {
+- sprintf( BSTRING_TO_STRING( res ), "%016x", PROCEDURE_ENTRY( proc ) );
++ sprintf( BSTRING_TO_STRING( res ), "%016lx", (long)PROCEDURE_ENTRY( proc ) );
+ }
+
+ return res;
+--- bde/bmem/lib/thread.c.orig 2011-01-24 06:30:51.000000000 -0700
++++ bde/bmem/lib/thread.c 2011-02-14 15:18:41.127937649 -0700
+@@ -50,9 +50,9 @@ bglthread_switch( void *this, void *next
+ void
+ thread_dump_statistics( FILE *f ) {
+ if( context_switches || scheduler_awake ) {
+- fprintf( f, " (thread (context-switches %d) (scheduler-awake %d))\n",
++ fprintf( f, " (thread (context-switches %ld) (scheduler-awake %ld))\n",
+ context_switches, scheduler_awake );
+- fprintf( stderr, "thread...(context switches=%d, scheduler awake=%d)\n",
++ fprintf( stderr, "thread...(context switches=%ld, scheduler awake=%ld)\n",
+ context_switches,
+ scheduler_awake );
+ }
+--- bde/bmem/lib/alloc.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ bde/bmem/lib/alloc.c 2011-02-14 15:10:55.176083686 -0700
+@@ -109,7 +109,7 @@ alloc_dump_type( pa_pair_t *i, FILE *f )
+ /*---------------------------------------------------------------------*/
+ void
+ alloc_dump( fun_alloc_info_t *i, FILE *f ) {
+- fprintf( f, " (%d %d %d\n", i->gc_num,
++ fprintf( f, " (%lu %lu %lu\n", i->gc_num,
+ BMEMSIZE( i->dsize ), BMEMSIZE( i->isize ) );
+ fprintf( f, " (dtype" );
+ for_each( (void (*)(void *, void *))alloc_dump_type, i->dtypes, f );
+@@ -486,7 +486,7 @@ GC_malloc( size_t lb ) {
+
+ #if BMEMDEBUG
+ if( bmem_debug ) {
+- fprintf( stderr, "GC_malloc(%d): %s %d\n",
++ fprintf( stderr, "GC_malloc(%zu): %s %d\n",
+ lb, bgl_debug_trace_top_name(), get_alloc_type() );
+ }
+ #endif
+@@ -513,7 +513,7 @@ GC_realloc( obj_t old, size_t lb ) {
+
+ #if BMEMDEBUG
+ if( bmem_debug ) {
+- fprintf( stderr, "GC_realloc(%d): top=%s type=%d\n",
++ fprintf( stderr, "GC_realloc(%zu): top=%s type=%d\n",
+ lb, bgl_debug_trace_top_name(), get_alloc_type() );
+ }
+ #endif
+@@ -541,7 +541,7 @@ GC_malloc_atomic( size_t lb ) {
+
+ #if BMEMDEBUG
+ if( bmem_debug ) {
+- fprintf( stderr, "GC_malloc_atomic(%d): top=%s type=%d\n",
++ fprintf( stderr, "GC_malloc_atomic(%zu): top=%s type=%d\n",
+ lb, bgl_debug_trace_top_name(), get_alloc_type() );
+ }
+ #endif
+@@ -623,7 +623,7 @@ BGl_registerzd2classz12zc0zz__objectz00(
+ hash, def,
+ constructor, virt );
+
+- fprintf( stderr, "ok\n", cname );
++ fprintf( stderr, "ok\n" );
+
+ return class;
+ }
+--- bde/bmem/lib/symbol.c.orig 2011-01-24 06:30:51.000000000 -0700
++++ bde/bmem/lib/symbol.c 2011-02-14 15:13:47.727927175 -0700
+@@ -33,7 +33,7 @@ make_symbol( obj_t name ) {
+
+ #if BMEMDEBUG
+ if( bmem_debug > 1 ) {
+- fprintf( stderr, "make_symbol: %s %p\n", name, symbol );
++ fprintf( stderr, "make_symbol: %s %p\n", BSTRING_TO_STRING( name ), symbol );
+ }
+ #endif
+ symbol->symbol_t.header = MAKE_HEADER( SYMBOL_TYPE, SYMBOL_SIZE );
+--- bde/bmem/lib/trace.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ bde/bmem/lib/trace.c 2011-02-14 15:17:49.472275324 -0700
+@@ -79,9 +79,9 @@ bgl_debug_trace_top() {
+ fprintf( stderr, " top->name=KEYWORD %p\n", top->name );
+ } else {
+ if( !POINTERP( top->name ) ) {
+- fprintf( stderr, " top->name=pas pointer %d\n", top->name );
++ fprintf( stderr, " top->name=pas pointer %p\n", top->name );
+ } else {
+- fprintf( stderr, " top->name=pointer %p\n", TYPE( top->name ) );
++ fprintf( stderr, " top->name=pointer %ld\n", TYPE( top->name ) );
+ }
+ }
+ }
+--- bde/bmem/lib/gchook.c.orig 2011-01-24 06:30:52.000000000 -0700
++++ bde/bmem/lib/gchook.c 2011-02-14 15:12:29.119566199 -0700
+@@ -45,13 +45,13 @@ GC_collect_hook( int heapsz, long livesz
+ gc_number++;
+
+ if( heapsz > (1024 * 1024) ) {
+- fprintf( stderr, "gc %3d: alloc size=%.2fMB, heap size=%.2fMB, live size=%.2fMB\n",
++ fprintf( stderr, "gc %3lu: alloc size=%.2fMB, heap size=%.2fMB, live size=%.2fMB\n",
+ gc_number,
+ ((double)gc_alloc_size / (1024. * 1024.)),
+ ((double)heapsz / (1024. * 1024.)),
+ ((double)livesz / (1024. * 1024.)) );
+ } else {
+- fprintf( stderr, "gc %3d: alloc size=%dKB, heap size=%dKB, live size=%ldKB\n",
++ fprintf( stderr, "gc %3lu: alloc size=%luKB, heap size=%dKB, live size=%ldKB\n",
+ gc_number,
+ gc_alloc_size / 1024,
+ heapsz / 1024,
+@@ -81,7 +81,7 @@ gc_alloc_size_add( int size ) {
+ /*---------------------------------------------------------------------*/
+ static void
+ GC_dump_gc( gc_info_t *i, FILE *f ) {
+- fprintf( f, " (%d %d %d %d)\n",
++ fprintf( f, " (%lu %lu %lu %lu)\n",
+ i->number,
+ BMEMSIZE( i->alloc_size ),
+ BMEMSIZE( i->heap_size ),
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-scheme/bigloo/files/, dev-scheme/bigloo/
@ 2011-07-14 9:27 Cyprien Nicolas
0 siblings, 0 replies; 2+ messages in thread
From: Cyprien Nicolas @ 2011-07-14 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 705241ee85e00f9252edd5bfce921061790ba4ff
Author: Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Jul 14 09:26:09 2011 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Thu Jul 14 09:26:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=705241ee
dev-scheme/bigloo: Remove 3.5a; Add 3.6a-r1 (as it is different from the tree); Add last alpha before next release
(Portage version: 2.2.0_alpha43/git/Linux i686, signed Manifest commit with key 0xBE63A96F)
---
.../{bigloo-3.6a.ebuild => bigloo-3.6a-r1.ebuild} | 1 -
....5a.ebuild => bigloo-3.6b_alpha20110713.ebuild} | 88 ++++++------
dev-scheme/bigloo/files/bigloo-3.5a-bglpkg.patch | 154 --------------------
dev-scheme/bigloo/metadata.xml | 3 +-
4 files changed, 46 insertions(+), 200 deletions(-)
diff --git a/dev-scheme/bigloo/bigloo-3.6a.ebuild b/dev-scheme/bigloo/bigloo-3.6a-r1.ebuild
similarity index 99%
rename from dev-scheme/bigloo/bigloo-3.6a.ebuild
rename to dev-scheme/bigloo/bigloo-3.6a-r1.ebuild
index 5d34d96..8187b30 100644
--- a/dev-scheme/bigloo/bigloo-3.6a.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.6a-r1.ebuild
@@ -174,7 +174,6 @@ src_install() {
fi
dodoc ChangeLog README || die "dodoc failed"
- newdoc LICENSE COPYING || die "newdoc failed"
pushd "${S}/manuals" &>/dev/null
if use doc; then
diff --git a/dev-scheme/bigloo/bigloo-3.5a.ebuild b/dev-scheme/bigloo/bigloo-3.6b_alpha20110713.ebuild
similarity index 75%
rename from dev-scheme/bigloo/bigloo-3.5a.ebuild
rename to dev-scheme/bigloo/bigloo-3.6b_alpha20110713.ebuild
index dd96d62..39fd5fe 100644
--- a/dev-scheme/bigloo/bigloo-3.5a.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.6b_alpha20110713.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI="4"
+
+Months=( "Dec" "Jan" "Feb" "Mar" "Apr" "May" "Jun" "Jul" "Aug" "Sep" "Oct" "Nov" "Dec" )
inherit elisp-common multilib eutils flag-o-matic java-pkg-opt-2
@@ -10,72 +12,66 @@ MY_P=${PN}${PV/_p/-}
MY_P=${MY_P/_alpha*/-alpha}
MY_P=${MY_P/_beta*/-beta}
+# Handling of alpha and beta releases
+if [[ $PV = *_alpha* ]] || [[ $PV = *_beta* ]]; then
+ date=${PV/*_alpha/}
+ date=${date/*_beta/}
+ year=${date:2:2}
+ month=${Months[${date:4:2}]}
+ day=${date:6:2}
+ MY_P="${MY_P}${day}${month}${year}"
+fi
+
BGL_RELEASE=${PV/_*/}
DESCRIPTION="Bigloo is a Scheme implementation."
HOMEPAGE="http://www-sop.inria.fr/indes/fp/Bigloo/bigloo.html"
-SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
+#SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp-sop.inria.fr/members/Cyprien.Nicolas/mirror/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="bglpkg calendar crypto debug doc emacs gmp gstreamer java mail multimedia openpgp packrat sqlite srfi1 srfi27 ssl text threads web"
+#KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
+IUSE="alsa bglpkg calendar crypto debug doc emacs flac gmp gstreamer java mail mp3 multimedia openpgp packrat sqlite srfi1 srfi27 ssl text threads web"
+REQUIRED_USE="
+ alsa? ( multimedia )
+ bglpkg? ( web )
+ gstreamer? ( multimedia threads )
+ openpgp? ( crypto )
+ packrat? ( srfi1 )
+ srfi27? ( x86? ( gmp ) )
+"
# bug 254916 for >=dev-libs/boehm-gc-7.1
DEPEND=">=dev-libs/boehm-gc-7.1[threads?]
+ alsa? ( media-libs/alsa-lib )
emacs? ( virtual/emacs )
+ flac? ( media-libs/flac )
gmp? ( dev-libs/gmp )
gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
java? ( >=virtual/jdk-1.5 app-arch/zip )
+ mp3? ( media-sound/mpg123 )
sqlite? ( dev-db/sqlite:3 )
ssl? ( dev-libs/openssl )
"
RDEPEND="${DEPEND}"
+RESTRICT="mirror"
+
S=${WORKDIR}/${MY_P/-[ab]*/}
SITEFILE="50bigloo-gentoo.el"
-pkg_setup() {
- if use gstreamer; then
- if ! use threads; then
- die "USE Dependency: 'gstreamer' needs 'threads'. You may enable 'threads', or disable 'gstreamer'."
- fi
-
- if ! use multimedia; then
- die "USE Dependency: 'gstreamer' needs 'multimedia'."
- fi
- fi
-
- if use packrat && ! use srfi1; then
- die "USE Dependency: 'packrat' needs 'srfi1'."
+pkg_pretend() {
+ if use srfi27 && use amd64; then
+ #TODO: 'dev-scheme/bigloo srfi27' in arch/amd64/package.use.mask?
+ ewarn "srfi27 is known to only work on 32-bit architectures." \
+ "This IUSE is ignored on amd64."
fi
-
- if use srfi27; then
- # 'dev-scheme/bigloo srfi27' should be added in arch/amd64/package.use.mask
- if use amd64; then
- ewarn "srfi27 is known to only work on 32-bit architectures." \
- "The USE is ignored on amd64."
- elif ! use gmp; then
- die "USE Dependency: 'srfi27' needs 'gmp'."
- fi
- fi
-
- if use bglpkg && ! use web; then
- die "USE Dependency: 'bglpkg' needs 'web'."
- fi
-
- if use openpgp && ! use crypto; then
- die "USE Dependency: 'openpgp' needs 'crypto'."
- fi
-
- java-pkg-opt-2_pkg_setup
}
src_prepare() {
- # Allow the disabling of bglpkg
- epatch "${FILESDIR}/${PN}-${BGL_RELEASE}-bglpkg.patch"
-
# Removing bundled boehm-gc
rm -rf gc || die
@@ -97,7 +93,8 @@ src_configure() {
myconf="--emacs=false"
fi
- # api/{crypto,openpgp} jvm tests show failures.
+ # Add JCFLAGS to the configure script
+ # (api/{crypto,openpgp} jvm tests show failures)
if use java; then
sed -e "s/^\(jcflags=\)\(.*\)/\\1\"\\2 $(java-pkg_javac-args)\"/" \
-e 's/jcflags=$jcflags/jcflags="$jcflags"/'\
@@ -137,11 +134,14 @@ src_configure() {
--strip=no
$(use debug && echo --debug)
${myconf}
+ $(use_enable alsa)
$(use_enable calendar)
$(use_enable crypto)
+ $(use_enable flac)
$(use_enable gmp)
$(use_enable gstreamer)
$(use_enable mail)
+ $(use_enable mp3 mpg123)
$(use_enable multimedia)
$(use_enable openpgp)
$(use_enable packrat)
@@ -183,6 +183,8 @@ src_install() {
if use emacs; then
einfo "Installing bee..."
emake DESTDIR="${D}" install-bee || die "install-bee failed"
+ einfo "Installing API-specific emacs files"
+ cp -v "${S}"/api/*/emacs/*.el "${D}/${SITELISP}/${PN}"
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
else
# Fix EMACS*=false in Makefile.config
diff --git a/dev-scheme/bigloo/files/bigloo-3.5a-bglpkg.patch b/dev-scheme/bigloo/files/bigloo-3.5a-bglpkg.patch
deleted file mode 100644
index 6e49fe7..0000000
--- a/dev-scheme/bigloo/files/bigloo-3.5a-bglpkg.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -200,8 +200,16 @@ boot: checkgmake
- export DYLD_LIBRARY_PATH; \
- export PATH; \
- $(MAKE) -C bde boot BFLAGS="$(BFLAGS) -lib-dir $(BOOTLIBDIR) $(SHRD_BDE_OPT)" && \
-- $(MAKE) -C api boot BFLAGS="$(BFLAGS) -lib-dir $(BOOTLIBDIR)" && \
-- $(MAKE) -C bglpkg BFLAGS="$(BFLAGS) -lib-dir $(BOOTLIBDIR)")
-+ $(MAKE) -C api boot BFLAGS="$(BFLAGS) -lib-dir $(BOOTLIBDIR)")
-+ if [ "$(ENABLE_BGLPKG)" = "yes" ]; then \
-+ PATH=$(BGLBUILDBINDIR):$(BGLBUILDLIBDIR):$$PATH; \
-+ LD_LIBRARY_PATH=$(BGLBUILDLIBDIR):$$LD_LIBRARY_PATH; \
-+ export LD_LIBRARY_PATH; \
-+ DYLD_LIBRARY_PATH=$(BGLBUILDLIBDIR):$$DYLD_LIBRARY_PATH; \
-+ export DYLD_LIBRARY_PATH; \
-+ export PATH; \
-+ $(MAKE) -C bglpkg BFLAGS="$(BFLAGS) -lib-dir $(BOOTLIBDIR)"; \
-+ fi
- @ echo "Boot done..."
- @ echo "-------------------------------"
-
-@@ -685,7 +696,9 @@ install-devel: install-dirs
- export LD_LIBRARY_PATH; \
- export DYLD_LIBRARY_PATH; \
- $(MAKE) -C bde install)
-- $(MAKE) -C bglpkg install
-+ if [ "$(ENABLE_BGLPKG)" = "yes" ]; then \
-+ $(MAKE) -C bglpkg install; \
-+ fi
- $(MAKE) -C autoconf install
-
- install-libs: install-dirs
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -278,6 +278,10 @@ gcfinalizer=0
- hostsh=
- buildsh=
-
-+#*--- bglpkg compilation ----------------------------------------------*/
-+# valid values are "no", "yes" or "force"
-+enable_bgpkg="yes"
-+
- #*---------------------------------------------------------------------*/
- #* !!! DONT EDIT AFTER THIS LINE !!! */
- #*---------------------------------------------------------------------*/
-@@ -847,6 +851,12 @@ while : ; do
- --gmpconfigureopt=*)
- gmpconfigureopt="`echo $1 | sed 's/^[^=]*=//'`";;
-
-+ --enable-bglpkg)
-+ enable_bglpkg="force";;
-+
-+ --disable-bglpkg)
-+ enable_bglpkg="no";;
-+
- --enable-srfi27)
- srfi27force="yes";;
-
-@@ -1109,6 +1119,7 @@ if [ "$action" != "bigloo_config_el" ];
- # check apis cross dependencies
- srfi1_is_enabled=no
- packrat_is_enabled=no
-+ pkgcomp_is_enabled=no
- pkglib_is_enabled=no
- sqlite_is_enabled=no
- dbus_is_enabled=no
-@@ -1124,6 +1135,7 @@ if [ "$action" != "bigloo_config_el" ];
- srfi27) srfi27_is_enabled="yes";;
- packrat) packrat_is_enabled="yes";;
- sqlite) sqlite_is_enabled="yes";;
-+ pkgcomp) pkgcomp_is_enabled="yes";;
- pkglib) pkglib_is_enabled="yes";;
- dbus) dbus_is_enabled="yes";;
- pthread) pthread_is_enabled="yes";;
-@@ -1166,6 +1178,68 @@ if [ "$action" != "bigloo_config_el" ];
- fi
- fi
-
-+# Check depends for bglpkg
-+if [ $enable_bglpkg = "yes" ]; then
-+ if [ $pkgcomp_is_enabled = "no" ]; then
-+ echo "*** WARNING: bglpkg binary requires pkgcomp library"
-+ echo "Disabling bglpkg."
-+ enable_bglpkg="no"
-+ fi
-+ if [ $pkglib_is_enabled = "no" ]; then
-+ echo "*** ERROR: bglpkg binary requires pkglib library"
-+ echo "Disabling bglpkg."
-+ enable_bglpkg="no"
-+ fi
-+ if [ $sqlite_is_enabled = "no" ]; then
-+ echo "*** ERROR: bglpkg binary requires sqlite library"
-+ echo "Disabling bglpkg."
-+ enable_bglpkg="no"
-+ fi
-+ if [ $web_is_enabled = "no" ]; then
-+ echo "*** ERROR: bglpkg binary requires web library"
-+ echo "Disabling bglpkg."
-+ enable_bglpkg="no"
-+ fi
-+fi
-+
-+if [ $enable_bglpkg = "force" ]; then
-+ if [ $pkgcomp_is_enabled = "no" ]; then
-+ echo "*** ERROR: bglpkg binary requires pkgcomp library"
-+ echo "Either disable bglpkg, or enable pkgcomp."
-+ echo
-+ echo "Enabled apis: $apis"
-+ exit 1
-+ fi
-+ if [ $pkglib_is_enabled = "no" ]; then
-+ echo "*** ERROR: bglpkg binary requires pkglib library"
-+ echo "Either disable bglpkg, or enable pkglib."
-+ echo
-+ echo "Enabled apis: $apis"
-+ exit 1
-+ fi
-+ if [ $sqlite_is_enabled = "no" ]; then
-+ echo "*** ERROR: bglpkg binary requires sqlite library"
-+ echo "Either disable bglpkg, or enable sqlite."
-+ echo
-+ echo "Enabled apis: $apis"
-+ exit 1
-+ fi
-+ if [ $web_is_enabled = "no" ]; then
-+ echo "*** ERROR: bglpkg binary requires web library"
-+ echo "Either disable bglpkg, or enable web."
-+ echo
-+ echo "Enabled apis: $apis"
-+ exit 1
-+ fi
-+fi
-+
-+# Here, bglpkg has all its dependencies, setting it just to "yes"
-+# in order to have not to double test its value
-+if [ $enable_bglpkg = "force" ]; then
-+ enable_bglpkg="yes"
-+fi
-+
-+
- #*---------------------------------------------------------------------*/
- #* Configure bootstrap */
- #*---------------------------------------------------------------------*/
-@@ -3089,6 +3163,8 @@ if [ $action = "all" -o $action = "Makef
- -e "s|@BGLPKGNAME@|$bglpkg|g" \
- >> $configure
- chmod a-w $configure
-+ echo "ENABLE_BGLPKG=$enable_bglpkg" >> $makefile_cfg
-+ echo "" >> $makefile_cfg
-
- # Does the system support strip
- echo "STRIP=$strip" >> $makefile_cfg
diff --git a/dev-scheme/bigloo/metadata.xml b/dev-scheme/bigloo/metadata.xml
index 3ac7b73..ee836ce 100644
--- a/dev-scheme/bigloo/metadata.xml
+++ b/dev-scheme/bigloo/metadata.xml
@@ -16,13 +16,12 @@
<flag name="bglpkg">Build bglpkg binary, which can be use to access scmpkg servers (requires web)</flag>
<flag name="calendar">Build the embedded library for calendar programming</flag>
<flag name="crypto">Build the embedded cryptographic library</flag>
- <flag name="debug">Enable extra debug codepaths</flag>
<flag name="doc">Install Bigloo Manual (HTML docs of Bigloo and r5rs)</flag>
<flag name="emacs">Build and install the Bigloo Developement Environment for Emacs (aka bee-mode)</flag>
- <flag name="gmp">Adds support for <pkg>dev-libs/gmp</pkg> (GNU MP library)</flag>
<flag name="gstreamer">Adds support for <pkg>media-libs/gstreamer</pkg> (requires threads and multimedia)</flag>
<flag name="java">Enable the JVM backend for the Bigloo compiler</flag>
<flag name="mail">Mail library for email management (e.g. maildir and imap support)</flag>
+ <flag name="mp3">Enable mp3 support through <pkg>media-sound/mpg123</pkg></flag>
<flag name="multimedia">Build multimedia library (e.g. for managing images). Needed for <pkg>dev-scheme/hop</pkg></flag>
<flag name="openpgp">Build OpenPGP support (requires crypto)</flag>
<flag name="packrat">Bigloo port of Tony Garnock-Jones' packrat parser (requires srfi1)</flag>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-14 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-14 9:27 [gentoo-commits] proj/lisp:master commit in: dev-scheme/bigloo/files/, dev-scheme/bigloo/ Cyprien Nicolas
-- strict thread matches above, loose matches on Subject: below --
2011-02-20 15:25 Cyprien Nicolas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox