wok rev 24578

freetype-dev: add pkgconfig folder
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Feb 27 10:47:38 2022 +0000 (2022-02-27)
parents 3911e4610e39
children be9fc3c4c575
files freetype-dev/receipt linld/stuff/src/LINLD.CPP linld/stuff/src/pipehole.awk sokojs/stuff/shrink.sh
line diff
     1.1 --- a/freetype-dev/receipt	Sun Feb 27 11:03:39 2022 +0100
     1.2 +++ b/freetype-dev/receipt	Sun Feb 27 10:47:38 2022 +0000
     1.3 @@ -17,5 +17,6 @@
     1.4  genpkg_rules()
     1.5  {
     1.6  	cook_copy_folders	include
     1.7 +	cook_copy_folders	pkgconfig
     1.8  	cook_copy_files		*.*a
     1.9  }
     2.1 --- a/linld/stuff/src/LINLD.CPP	Sun Feb 27 11:03:39 2022 +0100
     2.2 +++ b/linld/stuff/src/LINLD.CPP	Sun Feb 27 10:47:38 2022 +0000
     2.3 @@ -11,23 +11,26 @@
     2.4  
     2.5  inline void syntax() {
     2.6      die("Syntax:" NL
     2.7 -        "LINLD [image=file] [initrd=files] [vga=mode] [root=num] [mem=max] [cl=cmdline] "
     2.8 +        "LINLD [image=file] [initrd=files] [vga=mode] [root=num] [mem=topLoad] [cl=cmdline] "
     2.9  #ifdef ISO9660
    2.10  	"[iso=file] "
    2.11  #endif
    2.12  	"..." NL
    2.13 -        "vga mode: ask,extended,normal or dec/oct/hex number" NL
    2.14 +        "\tvga mode: ask,extended,normal or dec/oct/hex number" NL
    2.15 +	"\t-b baseLoad" NL
    2.16 +#ifdef MINRAM
    2.17 +	"\t-r minRAM" NL
    2.18 +#endif
    2.19  #ifdef CPUTYPE
    2.20 -        "-m mincpu	family*256+model" NL
    2.21 +        "\t-m minCPU	family*256+model" NL
    2.22  #endif
    2.23  #ifdef CPU64
    2.24 -        "-64 for cpu64 only" NL
    2.25 +        "\t-64 cpu64 only" NL
    2.26  #endif
    2.27 -        "Defaults:" NL
    2.28 -        "\timage=bzImage" NL
    2.29 -        "\tinitrd,vga,root=(void)" NL
    2.30 -        "\tmem=256m" NL
    2.31 -        "\tcl=auto" NL
    2.32 +        "Defaults:"
    2.33 +        "\timage=bzImage"
    2.34 +        "\tmem=256m"
    2.35 +        "\tcl=auto" 
    2.36          "\t-b 1088k" NL
    2.37          "Use quotes: \"cl=...\" if you need spaces in cmdline" NL
    2.38          "Use cl=@filename to get it from a file"
    2.39 @@ -44,6 +47,7 @@
    2.40          "initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "
    2.41  	"\"cl=root=/dev/null video=-32\""
    2.42  	NL "\tLINLD memtest"
    2.43 +	NL "\tLINLD @args"
    2.44  #endif
    2.45      );
    2.46  }
    2.47 @@ -75,7 +79,7 @@
    2.48  	strcatb((const char *) heap_top,*argv);
    2.49      } while (*++argv);
    2.50  #ifdef MINRAM
    2.51 -    if ((minram>>16) > (memtop()>>16) && (minram>>16) != 0) exit();	
    2.52 +    if ((minram>>16) > (memtop()>>16)) exit();	
    2.53  #endif
    2.54  #ifdef CPUTYPE
    2.55      if (mincpu > cputype) exit();
     3.1 --- a/linld/stuff/src/pipehole.awk	Sun Feb 27 11:03:39 2022 +0100
     3.2 +++ b/linld/stuff/src/pipehole.awk	Sun Feb 27 10:47:38 2022 +0000
     3.3 @@ -67,12 +67,10 @@
     3.4  	if (islinld==7) {
     3.5  		if (/endif/) islinld=0
     3.6  		if (/mov/) sub(/ax/,"cx");
     3.7 -		if (/;/ || /_memtop/ || /mov/) { print; next }
     3.8 -		if (/ax,0/) {
     3.9 -			print "	jcxz	minram_done"
    3.10 -			print "	cmp	cx,dx"
    3.11 +		if (/;/ || /_memtop/) print
    3.12 +		if (/cmdnum/) {
    3.13 +			print
    3.14  			print "	ja	call_exit"
    3.15 -			print "minram_done:"
    3.16  		}
    3.17  		next
    3.18  	}
     4.1 --- a/sokojs/stuff/shrink.sh	Sun Feb 27 11:03:39 2022 +0100
     4.2 +++ b/sokojs/stuff/shrink.sh	Sun Feb 27 10:47:38 2022 +0000
     4.3 @@ -6,7 +6,7 @@
     4.4  	sed -i 's|.*//!||' $@ ;;
     4.5  *)	for file in $@ ; do
     4.6  		[ -s "$file" ] || continue
     4.7 -		grep -q '//!||' && continue 
     4.8 +		grep -q '//!' && continue 
     4.9  		awk 'BEGIN { begin=9999; end=9999; tab=" " }
    4.10  function scan(s) {
    4.11    i=2