wok-current rev 20477
Rebuild perl in 32 bits
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Oct 17 20:44:06 2018 +0200 (2018-10-17) |
| parents | 485540f15da6 |
| children | 7096ff088f38 |
| files | linld/stuff/src/JUMP.ASM linld/stuff/src/LINK.CMD linld/stuff/src/LINKX.CMD linld/stuff/src/MEMCPY32.ASM minidlna/receipt perl/receipt pjsip-dev/receipt |
line diff
1.1 --- a/linld/stuff/src/JUMP.ASM Wed Oct 17 14:36:19 2018 +0300 1.2 +++ b/linld/stuff/src/JUMP.ASM Wed Oct 17 20:44:06 2018 +0200 1.3 @@ -166,7 +166,6 @@ 1.4 extrn @last_ditch$qv:near 1.5 push cs 1.6 call @last_ditch$qv 1.7 - mov ax,[word _imgs+2+2] ; get pm->fallback high word 1.8 ; self move 1.9 ;cld 1.10 pop es ; min 2048 bytes for stack 1.11 @@ -175,34 +174,36 @@ 1.12 mov cx,offset movedend 1.13 rep 1.14 movsb 1.15 - push ax 1.16 + mov ax,[word _imgs+2+2] ; get pm->fallback high word 1.17 + 1.18 + ; prepare memcpy32 size & srcofs param to move zImage pm 1.19 + mov dx,8 1.20 + cmp ax,dx ; buf > 80000h ? 1.21 + ja @@bufhigh 1.22 + sub dx,ax 1.23 + inc dx ; up to 90000h-1 1.24 +@@bufhigh: 1.25 + push dx ; size hi 1.26 + push cx ; size lo=up to 512k 1.27 + push ax ; src ofs ho = pm.fallback 1.28 + 1.29 push es 1.30 dos_shutdown ; clear bx 1.31 call near @@isbzimage ; pop cs ; ds=es=ss 1.32 ;in al,70h 1.33 ;or al,80h ; disable NMI 1.34 ;out 70h,al 1.35 - pop dx 1.36 - ; move zImage pm 1.37 - mov ax,8 1.38 - cmp dx,ax ; buf > 80000h ? 1.39 - ja @@bufhigh 1.40 - sub ax,dx 1.41 - inc ax ; up to 90000h-1 1.42 -@@bufhigh: 1.43 - push ax 1.44 - push bx ; size=up to 512k 1.45 - push dx ; src ofs= pm.fallback 1.46 - push bx 1.47 - push bx ; srcseg=0 1.48 + 1.49 + push bx ; src ofs lo 1.50 + push bx ; src seg=0 1.51 ifdef NO386 1.52 inc bx 1.53 - push bx ; dst 1.54 + push bx ; dst ofs hi 1.55 dec bx 1.56 else 1.57 - push 1 ; dst 1.58 + push 1 ; dst ofs hi 1.59 endif 1.60 - push bx ; ofs=64k 1.61 + push bx ; dst ofs lo : 64k 1.62 extrn _memcpy32:near 1.63 call _memcpy32 1.64 add sp,14 1.65 @@ -255,8 +256,10 @@ 1.66 retf 1.67 1.68 step19code 1.69 + 1.70 + endp _boot_kernel 1.71 + 1.72 movedend: 1.73 - endp _boot_kernel 1.74 1.75 ends _TEXT 1.76
2.1 --- a/linld/stuff/src/LINK.CMD Wed Oct 17 14:36:19 2018 +0300 2.2 +++ b/linld/stuff/src/LINK.CMD Wed Oct 17 20:44:06 2018 +0200 2.3 @@ -1,1 +1,1 @@ 2.4 -_beg.obj memcpy32.obj jump.obj vcpi.obj himem.obj crtl.obj memtop.obj xmm.obj a20.obj load.obj linld.obj _end.obj, linld 2.5 +_beg.obj memcpy32.obj jump.obj vcpi.obj xmm.obj a20.obj memtop.obj crtl.obj himem.obj load.obj linld.obj _end.obj, linld
3.1 --- a/linld/stuff/src/LINKX.CMD Wed Oct 17 14:36:19 2018 +0300 3.2 +++ b/linld/stuff/src/LINKX.CMD Wed Oct 17 20:44:06 2018 +0200 3.3 @@ -1,1 +1,1 @@ 3.4 -_beg.obj memcpy32.obj memtop.obj jump.obj vcpi.obj himem.obj crtl.obj xmm.obj a20.obj load.obj iso9660.obj tazboot.obj _end.obj, tazboot 3.5 +_beg.obj memcpy32.obj jump.obj vcpi.obj xmm.obj a20.obj memtop.obj crtl.obj himem.obj load.obj iso9660.obj tazboot.obj _end.obj, tazboot
4.1 --- a/linld/stuff/src/MEMCPY32.ASM Wed Oct 17 14:36:19 2018 +0300 4.2 +++ b/linld/stuff/src/MEMCPY32.ASM Wed Oct 17 20:44:06 2018 +0200 4.3 @@ -11,12 +11,9 @@ 4.4 p386 4.5 endif 4.6 4.7 - group DGROUP _TEXT,_DATA 4.8 + group DGROUP _TEXT 4.9 assume cs:DGROUP,ds:DGROUP 4.10 4.11 - segment _DATA byte public use16 'DATA' 4.12 - ends _DATA 4.13 - 4.14 segment _TEXT byte public use16 'CODE' 4.15 4.16 ;***************************************************************
5.1 --- a/minidlna/receipt Wed Oct 17 14:36:19 2018 +0300 5.2 +++ b/minidlna/receipt Wed Oct 17 20:44:06 2018 +0200 5.3 @@ -13,7 +13,7 @@ 5.4 5.5 DEPENDS="ffmpeg jpeg libsqlite libexif libid3tag libogg libvorbis flac" 5.6 BUILD_DEPENDS="ffmpeg-dev jpeg-dev sqlite-dev libexif-dev libid3tag-dev \ 5.7 -libogg-dev libvorbis-dev flac-dev gettext" 5.8 +libav-dev libogg-dev libvorbis-dev flac-dev gettext" 5.9 5.10 # Rules to configure and make the package. 5.11 compile_rules()
6.1 --- a/perl/receipt Wed Oct 17 14:36:19 2018 +0300 6.2 +++ b/perl/receipt Wed Oct 17 20:44:06 2018 +0200 6.3 @@ -17,6 +17,7 @@ 6.4 cook_tmp_toolchain() 6.5 { 6.6 cd $src 6.7 + grep -rl 'uname -m' | xargs sed -i 's|uname -m|echo i686|' 6.8 { sh Configure -des -Dprefix=/tools \ 6.9 -Dstatic_ext='Data/Dumper Fcntl IO' && 6.10 6.11 @@ -24,8 +25,8 @@ 6.12 make perl utilities ext/Errno/pm_to_blib 6.13 } || return 1 6.14 cp perl pod/pod2man /tools/bin 6.15 - mkdir -p /tools/lib/perl5/5.12.3 6.16 - cp -R lib/* /tools/lib/perl5/5.12.3 6.17 + mkdir -p /tools/lib/perl5/$VERSION 6.18 + cp -R lib/* /tools/lib/perl5/$VERSION 6.19 } 6.20 6.21 6.22 @@ -33,7 +34,7 @@ 6.23 # 6.24 compile_rules() 6.25 { 6.26 - cd $src 6.27 + grep -rl 'uname -m' | xargs sed -i 's|uname -m|echo i686|' 6.28 ./configure.gnu --prefix=/usr && 6.29 make && 6.30 make install 6.31 @@ -44,7 +45,7 @@ 6.32 # Install in /usr (default is /usr/local). 6.33 sed -i s/'usr\/local'/'usr'/ uconfig.sh 6.34 # Sed to search mods in /usr/lib/perl5. 6.35 - sed -i s/'perl5\/5.12'/'perl5'/ uconfig.sh 6.36 + sed -i s/'perl5\/${VERSION%.*}'/'perl5'/ uconfig.sh 6.37 # Optimisation. 6.38 sed -i s/'unknown'/'$HOST_SYSTEM'/ uconfig.sh 6.39 # Make it!
7.1 --- a/pjsip-dev/receipt Wed Oct 17 14:36:19 2018 +0300 7.2 +++ b/pjsip-dev/receipt Wed Oct 17 20:44:06 2018 +0200 7.3 @@ -9,7 +9,7 @@ 7.4 WEB_SITE="http://www.pjsip.org/" 7.5 WANTED="pjsip" 7.6 7.7 -SEPENDS="pjsip pkg-config" 7.8 +DEPENDS="pjsip pkg-config" 7.9 7.10 # Rules to gen a SliTaz package suitable for Tazpkg. 7.11 genpkg_rules()