wok-6.x rev 22668
mongodb: force 32 bits build
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Jan 17 10:47:57 2020 +0100 (2020-01-17) |
parents | 8fb63f185731 |
children | 8f0435312aca |
files | libplayer-dev/receipt libplayer/receipt libvalhalla-dev/receipt libvalhalla/receipt linld/stuff/src/A20.ASM linld/stuff/src/CRTL.ASM mongodb/receipt |
line diff
1.1 --- a/libplayer-dev/receipt Fri Jan 17 10:31:16 2020 +0100 1.2 +++ b/libplayer-dev/receipt Fri Jan 17 10:47:57 2020 +0100 1.3 @@ -7,7 +7,7 @@ 1.4 MAINTAINER="pankso@slitaz.org" 1.5 LICENSE="LGPL2.1" 1.6 WANTED="libplayer" 1.7 -WEB_SITE="http://libplayer.geexbox.org/" 1.8 +WEB_SITE="https://libplayer.geexbox.org/" 1.9 HOST_ARCH="i486 arm" 1.10 1.11 DEPENDS="libplayer pkg-config"
2.1 --- a/libplayer/receipt Fri Jan 17 10:31:16 2020 +0100 2.2 +++ b/libplayer/receipt Fri Jan 17 10:47:57 2020 +0100 2.3 @@ -7,8 +7,8 @@ 2.4 MAINTAINER="pankso@slitaz.org" 2.5 LICENSE="LGPL2.1" 2.6 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.7 -WEB_SITE="http://libplayer.geexbox.org/" 2.8 -WGET_URL="http://libplayer.geexbox.org/releases/$TARBALL" 2.9 +WEB_SITE="https://libplayer.geexbox.org/" 2.10 +WGET_URL="https://libplayer.geexbox.org/releases/$TARBALL" 2.11 HOST_ARCH="i486 arm" 2.12 2.13 DEPENDS="xine-lib"
3.1 --- a/libvalhalla-dev/receipt Fri Jan 17 10:31:16 2020 +0100 3.2 +++ b/libvalhalla-dev/receipt Fri Jan 17 10:47:57 2020 +0100 3.3 @@ -7,7 +7,7 @@ 3.4 MAINTAINER="pankso@slitaz.org" 3.5 LICENSE="LGPL2.1" 3.6 WANTED="libvalhalla" 3.7 -WEB_SITE="http://libvalhalla.geexbox.org/" 3.8 +WEB_SITE="https://libvalhalla.geexbox.org/" 3.9 HOST_ARCH="i486 arm" 3.10 3.11 DEPENDS="libvalhalla pkg-config sqlite-dev"
4.1 --- a/libvalhalla/receipt Fri Jan 17 10:31:16 2020 +0100 4.2 +++ b/libvalhalla/receipt Fri Jan 17 10:47:57 2020 +0100 4.3 @@ -7,8 +7,8 @@ 4.4 MAINTAINER="pankso@slitaz.org" 4.5 LICENSE="LGPL2.1" 4.6 TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.7 -WEB_SITE="http://libvalhalla.geexbox.org/" 4.8 -WGET_URL="http://libvalhalla.geexbox.org/releases/$TARBALL" 4.9 +WEB_SITE="https://libvalhalla.geexbox.org/" 4.10 +WGET_URL="https://libvalhalla.geexbox.org/releases/$TARBALL" 4.11 HOST_ARCH="i486 arm" 4.12 4.13 DEPENDS="ffmpeg ffmpeg-compat libexif libsqlite libxml2 libgcrypt libcurl \
5.1 --- a/linld/stuff/src/A20.ASM Fri Jan 17 10:31:16 2020 +0100 5.2 +++ b/linld/stuff/src/A20.ASM Fri Jan 17 10:47:57 2020 +0100 5.3 @@ -17,7 +17,7 @@ 5.4 enable_a20_methods: 5.5 dw _enable_a20_fast, _enable_a20_kbd, _enable_a20_xmm, die 5.6 msg_a20 db "Can't use A20",0 5.7 -overflow db "Out of memory",0 5.8 + extrn overflow:byte 5.9 ifdef NO386 5.10 bzimage86 db "8086 & bzImage",0 5.11 endif
6.1 --- a/linld/stuff/src/CRTL.ASM Fri Jan 17 10:31:16 2020 +0100 6.2 +++ b/linld/stuff/src/CRTL.ASM Fri Jan 17 10:47:57 2020 +0100 6.3 @@ -17,9 +17,11 @@ 6.4 6.5 segment _DATA byte public use16 'DATA' 6.6 6.7 -msg_hang db "High mem corrupted - not exiting to DOS",0 6.8 -vcpi_alloc_err db "VCPI " 6.9 -msg_malloc db "malloc error",0 6.10 +msg_hang db "High mem corrupted: halt",0 6.11 +vcpi_alloc_err db "VCPI" 6.12 + global overflow:byte 6.13 +overflow db "/" 6.14 +msg_malloc db "Out of memory",0 6.15 ifdef EXTRA 6.16 tazboot_cmd db "tazboot.cmd",0 6.17 endif 6.18 @@ -185,15 +187,14 @@ 6.19 open: ; open(bx) 6.20 ifdef LONG_FILENAME 6.21 mov ax,716Ch 6.22 - push bx si di 6.23 + push bx si 6.24 mov si,bx 6.25 xor bx,bx ; R/O 6.26 xor cx,cx ; attributes 6.27 - xor di,di ; alias hint 6.28 cwd ; action = open 6.29 stc 6.30 int 21h 6.31 - pop di si bx 6.32 + pop si bx 6.33 jnc doret 6.34 endif 6.35 mov ax,3d00h ; read-only+compatibility 6.36 @@ -468,8 +469,7 @@ 6.37 ;_fastcall char* malloc_or_die(ax:unsigned size); 6.38 ;*************************************************************** 6.39 xchg_heap_top: 6.40 - extrn _heap_top 6.41 - xchg ax,[_heap_top] 6.42 + xchg ax,[bx] 6.43 ret 6.44 6.45 global @malloc_or_die$qui:near 6.46 @@ -477,9 +477,11 @@ 6.47 6.48 global malloc_or_die:near ; ax = malloc_or_die(ax) 6.49 malloc_or_die: 6.50 + extrn _heap_top 6.51 + mov bx,offset _heap_top 6.52 + add ax,[bx] 6.53 + jnc xchg_heap_top 6.54 mov bx,offset msg_malloc 6.55 - add ax,[_heap_top] 6.56 - jnc xchg_heap_top 6.57 6.58 endp @malloc_or_die$qui 6.59
7.1 --- a/mongodb/receipt Fri Jan 17 10:31:16 2020 +0100 7.2 +++ b/mongodb/receipt Fri Jan 17 10:47:57 2020 +0100 7.3 @@ -28,10 +28,10 @@ 7.4 sed -i '/FILESYSTEM_VERSION/d' pch.h 7.5 grep -rl TIME_UTC util | xargs sed -i 's/TIME_UTC/TIME_UTC_/' 7.6 7.7 - export LDFLAGS="$LDFLAGS -lrt" 7.8 + sed -i 's|/usr/lib32"\] )|&\n\tenv.Append( LIBS=["rt"] )|' SConstruct 7.9 7.10 - scons all && 7.11 - scons --prefix=$DESTDIR/usr install 7.12 + scons --32 all && 7.13 + scons --32 --prefix=$DESTDIR/usr install 7.14 } 7.15 7.16 # Rules to gen a SliTaz package suitable for Tazpkg.