# HG changeset patch # User Pascal Bellard # Date 1579254477 -3600 # Node ID 08c52f1e528edc33682bfd7b2454f9681fe03b62 # Parent 8fb63f1857312c2f7fbccf066b335561e36981f8 mongodb: force 32 bits build diff -r 8fb63f185731 -r 08c52f1e528e libplayer-dev/receipt --- a/libplayer-dev/receipt Fri Jan 17 10:31:16 2020 +0100 +++ b/libplayer-dev/receipt Fri Jan 17 10:47:57 2020 +0100 @@ -7,7 +7,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2.1" WANTED="libplayer" -WEB_SITE="http://libplayer.geexbox.org/" +WEB_SITE="https://libplayer.geexbox.org/" HOST_ARCH="i486 arm" DEPENDS="libplayer pkg-config" diff -r 8fb63f185731 -r 08c52f1e528e libplayer/receipt --- a/libplayer/receipt Fri Jan 17 10:31:16 2020 +0100 +++ b/libplayer/receipt Fri Jan 17 10:47:57 2020 +0100 @@ -7,8 +7,8 @@ MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2.1" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://libplayer.geexbox.org/" -WGET_URL="http://libplayer.geexbox.org/releases/$TARBALL" +WEB_SITE="https://libplayer.geexbox.org/" +WGET_URL="https://libplayer.geexbox.org/releases/$TARBALL" HOST_ARCH="i486 arm" DEPENDS="xine-lib" diff -r 8fb63f185731 -r 08c52f1e528e libvalhalla-dev/receipt --- a/libvalhalla-dev/receipt Fri Jan 17 10:31:16 2020 +0100 +++ b/libvalhalla-dev/receipt Fri Jan 17 10:47:57 2020 +0100 @@ -7,7 +7,7 @@ MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2.1" WANTED="libvalhalla" -WEB_SITE="http://libvalhalla.geexbox.org/" +WEB_SITE="https://libvalhalla.geexbox.org/" HOST_ARCH="i486 arm" DEPENDS="libvalhalla pkg-config sqlite-dev" diff -r 8fb63f185731 -r 08c52f1e528e libvalhalla/receipt --- a/libvalhalla/receipt Fri Jan 17 10:31:16 2020 +0100 +++ b/libvalhalla/receipt Fri Jan 17 10:47:57 2020 +0100 @@ -7,8 +7,8 @@ MAINTAINER="pankso@slitaz.org" LICENSE="LGPL2.1" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://libvalhalla.geexbox.org/" -WGET_URL="http://libvalhalla.geexbox.org/releases/$TARBALL" +WEB_SITE="https://libvalhalla.geexbox.org/" +WGET_URL="https://libvalhalla.geexbox.org/releases/$TARBALL" HOST_ARCH="i486 arm" DEPENDS="ffmpeg ffmpeg-compat libexif libsqlite libxml2 libgcrypt libcurl \ diff -r 8fb63f185731 -r 08c52f1e528e linld/stuff/src/A20.ASM --- a/linld/stuff/src/A20.ASM Fri Jan 17 10:31:16 2020 +0100 +++ b/linld/stuff/src/A20.ASM Fri Jan 17 10:47:57 2020 +0100 @@ -17,7 +17,7 @@ enable_a20_methods: dw _enable_a20_fast, _enable_a20_kbd, _enable_a20_xmm, die msg_a20 db "Can't use A20",0 -overflow db "Out of memory",0 + extrn overflow:byte ifdef NO386 bzimage86 db "8086 & bzImage",0 endif diff -r 8fb63f185731 -r 08c52f1e528e linld/stuff/src/CRTL.ASM --- a/linld/stuff/src/CRTL.ASM Fri Jan 17 10:31:16 2020 +0100 +++ b/linld/stuff/src/CRTL.ASM Fri Jan 17 10:47:57 2020 +0100 @@ -17,9 +17,11 @@ segment _DATA byte public use16 'DATA' -msg_hang db "High mem corrupted - not exiting to DOS",0 -vcpi_alloc_err db "VCPI " -msg_malloc db "malloc error",0 +msg_hang db "High mem corrupted: halt",0 +vcpi_alloc_err db "VCPI" + global overflow:byte +overflow db "/" +msg_malloc db "Out of memory",0 ifdef EXTRA tazboot_cmd db "tazboot.cmd",0 endif @@ -185,15 +187,14 @@ open: ; open(bx) ifdef LONG_FILENAME mov ax,716Ch - push bx si di + push bx si mov si,bx xor bx,bx ; R/O xor cx,cx ; attributes - xor di,di ; alias hint cwd ; action = open stc int 21h - pop di si bx + pop si bx jnc doret endif mov ax,3d00h ; read-only+compatibility @@ -468,8 +469,7 @@ ;_fastcall char* malloc_or_die(ax:unsigned size); ;*************************************************************** xchg_heap_top: - extrn _heap_top - xchg ax,[_heap_top] + xchg ax,[bx] ret global @malloc_or_die$qui:near @@ -477,9 +477,11 @@ global malloc_or_die:near ; ax = malloc_or_die(ax) malloc_or_die: + extrn _heap_top + mov bx,offset _heap_top + add ax,[bx] + jnc xchg_heap_top mov bx,offset msg_malloc - add ax,[_heap_top] - jnc xchg_heap_top endp @malloc_or_die$qui diff -r 8fb63f185731 -r 08c52f1e528e mongodb/receipt --- a/mongodb/receipt Fri Jan 17 10:31:16 2020 +0100 +++ b/mongodb/receipt Fri Jan 17 10:47:57 2020 +0100 @@ -28,10 +28,10 @@ sed -i '/FILESYSTEM_VERSION/d' pch.h grep -rl TIME_UTC util | xargs sed -i 's/TIME_UTC/TIME_UTC_/' - export LDFLAGS="$LDFLAGS -lrt" + sed -i 's|/usr/lib32"\] )|&\n\tenv.Append( LIBS=["rt"] )|' SConstruct - scons all && - scons --prefix=$DESTDIR/usr install + scons --32 all && + scons --32 --prefix=$DESTDIR/usr install } # Rules to gen a SliTaz package suitable for Tazpkg.