wok rev 4015

mingw32*: fix FSH
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Sep 03 21:46:00 2009 +0200 (2009-09-03)
parents 3ecbb6f5aa64
children 3d28df5bcf95
files mingw32-binutils/receipt mingw32-gcc-c/receipt mingw32-gcc/receipt mingw32-runtime-headers/receipt mingw32-runtime/receipt mingw32-w32api-headers/receipt mingw32-w32api/receipt
line diff
     1.1 --- a/mingw32-binutils/receipt	Thu Sep 03 21:23:46 2009 +0200
     1.2 +++ b/mingw32-binutils/receipt	Thu Sep 03 21:46:00 2009 +0200
     1.3 @@ -21,7 +21,7 @@
     1.4  		--prefix=/usr \
     1.5  		--infodir=/usr/share/info \
     1.6  		--mandir=/usr/share/man \
     1.7 -		--with-sysroot=/usr/$MINGW32_TARGET \
     1.8 +		--with-sysroot=/usr/lib/$MINGW32_TARGET \
     1.9  		--disable-shared \
    1.10  		--disable-debug \
    1.11  		--target=$MINGW32_TARGET \
    1.12 @@ -33,11 +33,11 @@
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.14  genpkg_rules()
    1.15  {
    1.16 -	mkdir -p $fs/usr
    1.17 +	mkdir -p $fs/usr/lib
    1.18  	cp -a $_pkg/usr/bin $fs/usr
    1.19 -	cp -a $_pkg/usr/$MINGW32_TARGET $fs/usr
    1.20 +	cp -a $_pkg/usr/lib/$MINGW32_TARGET $fs/usr/lib
    1.21  	# do not need to copy lib/libiberty.a
    1.22  	
    1.23  	#Create a symlink for --with-sysroot
    1.24 -	( cd $fs/usr/$MINGW32_TARGET && ln -s . usr )
    1.25 +	( cd $fs/usr/lib/$MINGW32_TARGET && ln -s . usr )
    1.26  }
     2.1 --- a/mingw32-gcc-c/receipt	Thu Sep 03 21:23:46 2009 +0200
     2.2 +++ b/mingw32-gcc-c/receipt	Thu Sep 03 21:46:00 2009 +0200
     2.3 @@ -22,6 +22,7 @@
     2.4  	cd $SOURCE-$VERSION-build
     2.5  	$src/configure \
     2.6  		--prefix=/usr \
     2.7 +		--libexecdir=/usr/lib \
     2.8  		--infodir=/usr/share/info \
     2.9  		--mandir=/usr/share/man \
    2.10  		--with-sysroot=/usr/$MINGW32_TARGET \
    2.11 @@ -46,7 +47,6 @@
    2.12  	# do not need to copy lib/libiberty.a
    2.13  	mkdir -p $fs/usr/lib
    2.14  	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
    2.15 -	cp -a $_pkg/usr/libexec $fs/usr
    2.16  }
    2.17  
    2.18  # Rules to setup after installation
     3.1 --- a/mingw32-gcc/receipt	Thu Sep 03 21:23:46 2009 +0200
     3.2 +++ b/mingw32-gcc/receipt	Thu Sep 03 21:46:00 2009 +0200
     3.3 @@ -48,9 +48,10 @@
     3.4  	cd $SOURCE-$VERSION-build
     3.5  	$src/configure \
     3.6  		--prefix=/usr \
     3.7 +		--libexecdir=/usr/lib \
     3.8  		--infodir=/usr/share/info \
     3.9  		--mandir=/usr/share/man \
    3.10 -		--with-sysroot=/usr/$MINGW32_TARGET \
    3.11 +		--with-sysroot=/usr/lib/$MINGW32_TARGET \
    3.12  		--disable-shared \
    3.13  		--disable-debug \
    3.14  		--target=$MINGW32_TARGET \
    3.15 @@ -66,14 +67,13 @@
    3.16  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.17  genpkg_rules()
    3.18  {
    3.19 -	mkdir -p $fs/usr
    3.20 +	mkdir -p $fs/usr/lib
    3.21  	cp -a $_pkg/usr/bin $fs/usr
    3.22 -	cp -a $_pkg/usr/$MINGW32_TARGET $fs/usr
    3.23 +	cp -a $_pkg/usr/lib/$MINGW32_TARGET $fs/usr/lib
    3.24  	cp -a $_pkg/usr/include $fs/usr
    3.25  	# do not need to copy lib/libiberty.a
    3.26  	mkdir -p $fs/usr/lib
    3.27  	cp -a $_pkg/usr/lib/gcc $fs/usr/lib
    3.28 -	cp -a $_pkg/usr/libexec $fs/usr
    3.29  }
    3.30  
    3.31  # Rules to setup after installation
    3.32 @@ -83,7 +83,7 @@
    3.33  	local root
    3.34  	root=$1
    3.35  	find $root/usr/lib/gcc/$MINGW32_TARGET/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    3.36 -	find $root/usr/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    3.37 +	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    3.38  }
    3.39  
    3.40  # Rules to clean the package
     4.1 --- a/mingw32-runtime-headers/receipt	Thu Sep 03 21:23:46 2009 +0200
     4.2 +++ b/mingw32-runtime-headers/receipt	Thu Sep 03 21:46:00 2009 +0200
     4.3 @@ -18,8 +18,8 @@
     4.4  {
     4.5  	cd $src
     4.6  	
     4.7 -	mkdir -p _pkg/usr/$MINGW32_TARGET
     4.8 -	cp -a include _pkg/usr/$MINGW32_TARGET
     4.9 +	mkdir -p _pkg/usr/lib/$MINGW32_TARGET
    4.10 +	cp -a include _pkg/usr/lib/$MINGW32_TARGET
    4.11  }
    4.12  
    4.13  # Rules to gen a SliTaz package suitable for Tazpkg.
     5.1 --- a/mingw32-runtime/receipt	Thu Sep 03 21:23:46 2009 +0200
     5.2 +++ b/mingw32-runtime/receipt	Thu Sep 03 21:46:00 2009 +0200
     5.3 @@ -37,10 +37,10 @@
     5.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     5.5  genpkg_rules()
     5.6  {
     5.7 -	mkdir -p $fs/usr/$MINGW32_TARGET
     5.8 -	cp -a $_pkg/usr/bin $fs/usr/$MINGW32_TARGET
     5.9 -	cp -a $_pkg/usr/include $fs/usr/$MINGW32_TARGET
    5.10 -	cp -a $_pkg/usr/lib $fs/usr/$MINGW32_TARGET
    5.11 +	mkdir -p $fs/usr/lib/$MINGW32_TARGET
    5.12 +	cp -a $_pkg/usr/bin $fs/usr/lib/$MINGW32_TARGET
    5.13 +	cp -a $_pkg/usr/include $fs/usr/lib/$MINGW32_TARGET
    5.14 +	cp -a $_pkg/usr/lib $fs/usr/lib/$MINGW32_TARGET
    5.15  }
    5.16  
    5.17  # Rules to setup after installation
    5.18 @@ -49,7 +49,7 @@
    5.19  	# Archives get stripped during packaging; need to run ranlib
    5.20  	local root
    5.21  	root=$1
    5.22 -	find $root/usr/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    5.23 +	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    5.24  }
    5.25  
    5.26  # Rules to clean the package
     6.1 --- a/mingw32-w32api-headers/receipt	Thu Sep 03 21:23:46 2009 +0200
     6.2 +++ b/mingw32-w32api-headers/receipt	Thu Sep 03 21:46:00 2009 +0200
     6.3 @@ -18,8 +18,8 @@
     6.4  {
     6.5  	cd $src
     6.6  	
     6.7 -	mkdir -p _pkg/usr/$MINGW32_TARGET
     6.8 -	cp -a include _pkg/usr/$MINGW32_TARGET
     6.9 +	mkdir -p _pkg/usr/lib/$MINGW32_TARGET
    6.10 +	cp -a include _pkg/usr/lib/$MINGW32_TARGET
    6.11  }
    6.12  
    6.13  # Rules to gen a SliTaz package suitable for Tazpkg.
     7.1 --- a/mingw32-w32api/receipt	Thu Sep 03 21:23:46 2009 +0200
     7.2 +++ b/mingw32-w32api/receipt	Thu Sep 03 21:46:00 2009 +0200
     7.3 @@ -37,8 +37,8 @@
     7.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     7.5  genpkg_rules()
     7.6  {
     7.7 -	mkdir -p $fs/usr/$MINGW32_TARGET
     7.8 -	cp -a $_pkg/usr/lib $fs/usr/$MINGW32_TARGET
     7.9 +	mkdir -p $fs/usr/lib/$MINGW32_TARGET
    7.10 +	cp -a $_pkg/usr/lib $fs/usr/lib/$MINGW32_TARGET
    7.11  }
    7.12  
    7.13  # Rules to setup after installation
    7.14 @@ -47,7 +47,7 @@
    7.15  	# Archives get stripped during packaging; need to run ranlib
    7.16  	local root
    7.17  	root=$1
    7.18 -	find $root/usr/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    7.19 +	find $root/usr/lib/$MINGW32_TARGET/lib/ -name *.a -exec $MINGW32_TARGET-ranlib {} \;
    7.20  }
    7.21  
    7.22  # Rules to clean the package