wok rev 16194
libxcb: back to 1.9.1 for ARM (1.10 is needed for wayland)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Sun Mar 30 22:07:59 2014 +0200 (2014-03-30) |
| parents | c358d2c8fa30 |
| children | 77740860516c |
| files | fpc-bootstrap/receipt fpc-src/receipt fpc/description.txt fpc/receipt libxcb-dev/receipt libxcb/receipt ppp-dev/receipt ppp/receipt rp-pppoe/receipt |
line diff
1.1 --- a/fpc-bootstrap/receipt Sun Mar 30 21:43:58 2014 +0200 1.2 +++ b/fpc-bootstrap/receipt Sun Mar 30 22:07:59 2014 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="fpc-bootstrap" 1.7 -VERSION="2.4.2" 1.8 +VERSION="2.6.2" 1.9 CATEGORY="development" 1.10 SHORT_DESC="bootstrap to compile fpc." 1.11 MAINTAINER="slaxemulator@gmail.com" 1.12 @@ -9,7 +9,6 @@ 1.13 TARBALL="i386-linux-ppc386.bz2" 1.14 WEB_SITE="http://freepascal.org/" 1.15 WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$TARBALL" 1.16 -COOK_OPT="!repack_src !unpack" 1.17 1.18 # Rules to gen a SliTaz package suitable for Tazpkg. 1.19 genpkg_rules()
2.1 --- a/fpc-src/receipt Sun Mar 30 21:43:58 2014 +0200 2.2 +++ b/fpc-src/receipt Sun Mar 30 22:07:59 2014 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="fpc-src" 2.7 -VERSION="2.4.2" 2.8 +VERSION="2.6.4" 2.9 CATEGORY="development" 2.10 SHORT_DESC="Sources for the FreePascal compiler (requierd by the Lazarus IDE)." 2.11 MAINTAINER="slaxemulator@gmail.com" 2.12 @@ -10,9 +10,7 @@ 2.13 TARBALL="$SOURCE-$VERSION.tar.gz" 2.14 WEB_SITE="http://www.freepascal.org/" 2.15 WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/source/$TARBALL" 2.16 -COOK_OPT="!strip" 2.17 - 2.18 -DEPENDS="" 2.19 +HOST_ARCH="i486 arm" 2.20 2.21 # Rules to gen a SliTaz package suitable for Tazpkg. 2.22 genpkg_rules()
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/fpc/description.txt Sun Mar 30 22:07:59 2014 +0200 3.3 @@ -0,0 +1,3 @@ 3.4 +The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 3.5 +32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time 3.6 +library.
4.1 --- a/fpc/receipt Sun Mar 30 21:43:58 2014 +0200 4.2 +++ b/fpc/receipt Sun Mar 30 22:07:59 2014 +0200 4.3 @@ -1,9 +1,9 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="fpc" 4.7 -VERSION="2.4.2" 4.8 +VERSION="2.6.4" 4.9 CATEGORY="development" 4.10 -SHORT_DESC="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." 4.11 +SHORT_DESC="The Free Pascal Compiler" 4.12 MAINTAINER="slaxemulator@gmail.com" 4.13 LICENSE="GPL2 LGPL2.1" 4.14 SOURCE="fpcbuild" 4.15 @@ -13,19 +13,39 @@ 4.16 CONFIG_FILE="/etc/fpc.cfg" 4.17 TAGS="compiler pascal" 4.18 4.19 +CROSS_BUGS="arm-slitaz-gnueabi-as: Command not found" 4.20 +#HOST_ARCH="i486 arm" 4.21 + 4.22 DEPENDS="ncurses" 4.23 BUILD_DEPENDS="fpc-bootstrap" 4.24 4.25 +# Handle cross compilation. ARM: fpc-bootstrap build host must be installed 4.26 +case "$ARCH" in 4.27 + arm*) BUILD_DEPENDS="" ;; 4.28 +esac 4.29 + 4.30 # Rules to configure and make the package. 4.31 compile_rules() 4.32 { 4.33 - cd $src 4.34 - make NOGDB=1 build 4.35 - make -j1 NOGDB=1 PREFIX=$DESTDIR/usr install 4.36 - 4.37 + case "$ARCH" in 4.38 + i?86) 4.39 + make ${ARCH_ARGS} NOGDB=1 build 4.40 + make -j1 NOGDB=1 PREFIX=$DESTDIR/usr install ;; 4.41 + arm*) 4.42 + make crossinstall \ 4.43 + NOGDB=1 \ 4.44 + CPU_TARGET=arm \ 4.45 + OS_TARGET=linux \ 4.46 + OPT=-dFPC_ARMEL \ 4.47 + CROSSBINDIR=/cross/$ARCH/tools/bin \ 4.48 + BINUTILSPREFIX=arm-slitaz-gnueabi- \ 4.49 + INSTALL_PREFIX=$DESTDIR/usr ;; 4.50 + esac && 4.51 + 4.52 # install package license 4.53 - install -m 755 -d $DESTDIR/usr/share/licenses/fpc 4.54 - install -m 644 $src/fpcsrc/rtl/COPYING.FPC $DESTDIR/usr/share/licenses/fpc/ 4.55 + install -m 755 -d $DESTDIR/usr/share/licenses/fpc && 4.56 + install -m 644 $src/fpcsrc/rtl/COPYING.FPC \ 4.57 + $DESTDIR/usr/share/licenses/fpc/ 4.58 } 4.59 4.60 # Rules to gen a SliTaz package suitable for Tazpkg. 4.61 @@ -34,10 +54,9 @@ 4.62 mkdir -p $fs/usr $fs/etc 4.63 cp -a $install/usr/bin $fs/usr 4.64 cp -a $install/usr/lib $fs/usr 4.65 - 4.66 # create symlink for compiler 4.67 ln -s /usr/lib/$PACKAGE/$VERSION/ppc386 $fs/usr/bin 4.68 - 4.69 + # config file 4.70 mkdir -p $fs/etc 4.71 cp -a $fs/usr/lib/fpc/$VERSION/samplecfg $fs/etc/fpc.cfg 4.72 }
5.1 --- a/libxcb-dev/receipt Sun Mar 30 21:43:58 2014 +0200 5.2 +++ b/libxcb-dev/receipt Sun Mar 30 22:07:59 2014 +0200 5.3 @@ -2,6 +2,7 @@ 5.4 5.5 PACKAGE="libxcb-dev" 5.6 VERSION="1.10" 5.7 +ARM_VERSION="1.9.1" 5.8 CATEGORY="development" 5.9 SHORT_DESC="Development files for libxcb" 5.10 MAINTAINER="mallory@sweetpeople.org" 5.11 @@ -12,6 +13,15 @@ 5.12 WANTED="libxcb" 5.13 DEPENDS="xorg-libXau-dev xorg-libXdmcp-dev pkg-config" 5.14 5.15 +# Handle SliTaz arch 5.16 +case "$SLITAZ_ARCH" in 5.17 + arm*) VERSION="$ARM_VERSION" ;; 5.18 +esac 5.19 + 5.20 +case "$ARCH" in 5.21 + arm*) VERSION="$ARM_VERSION" ;; 5.22 +esac 5.23 + 5.24 # Rules to gen a SliTaz package suitable for Tazpkg. 5.25 genpkg_rules() 5.26 {
6.1 --- a/libxcb/receipt Sun Mar 30 21:43:58 2014 +0200 6.2 +++ b/libxcb/receipt Sun Mar 30 22:07:59 2014 +0200 6.3 @@ -2,6 +2,7 @@ 6.4 6.5 PACKAGE="libxcb" 6.6 VERSION="1.10" 6.7 +ARM_VERSION="1.9.1" 6.8 CATEGORY="x-window" 6.9 SHORT_DESC="A C binding to the X11 protocol" 6.10 MAINTAINER="pankso@slitaz.org" 6.11 @@ -15,9 +16,17 @@ 6.12 BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev \ 6.13 autoconf automake libtool" 6.14 6.15 +# Handle SliTaz arch 6.16 +case "$SLITAZ_ARCH" in 6.17 + arm*) VERSION="$ARM_VERSION" ;; 6.18 +esac 6.19 + 6.20 case "$ARCH" in 6.21 - arm) 6.22 + arm*) 6.23 # We need host xcb-proto libxslt-dev file installed 6.24 + VERSION="$ARM_VERSION" 6.25 + TARBALL="$PACKAGE-$VERSION.tar.bz2" 6.26 + WGET_URL="${WEB_SITE}dist/$TARBALL" 6.27 BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev" ;; 6.28 esac 6.29
7.1 --- a/ppp-dev/receipt Sun Mar 30 21:43:58 2014 +0200 7.2 +++ b/ppp-dev/receipt Sun Mar 30 22:07:59 2014 +0200 7.3 @@ -8,6 +8,7 @@ 7.4 LICENSE="BSD GPL" 7.5 WEB_SITE="http://ppp.samba.org/" 7.6 WANTED="ppp" 7.7 +HOST_ARCH="i486 arm" 7.8 7.9 # Rules to gen a SliTaz package suitable for Tazpkg. 7.10 genpkg_rules()
8.1 --- a/ppp/receipt Sun Mar 30 21:43:58 2014 +0200 8.2 +++ b/ppp/receipt Sun Mar 30 22:07:59 2014 +0200 8.3 @@ -10,11 +10,11 @@ 8.4 WEB_SITE="http://ppp.samba.org/" 8.5 WGET_URL="ftp://ftp.samba.org/pub/ppp/$TARBALL" 8.6 CONFIG_FILES="/etc/ppp" 8.7 +HOST_ARCH="i486 arm" 8.8 8.9 # Rules to configure and make the package. 8.10 compile_rules() 8.11 { 8.12 - cd $src 8.13 if ! grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ; then 8.14 sed -i /#endif/d include/linux/if_pppol2tp.h 8.15 cat >> include/linux/if_pppol2tp.h <<EOT 8.16 @@ -31,7 +31,7 @@ 8.17 #endif 8.18 EOT 8.19 fi 8.20 - ./configure --prefix=/usr --mandir=/usr/share/man \ 8.21 + ./configure --prefix=/usr \ 8.22 $CONFIGURE_ARGS && 8.23 make && 8.24 make DESTDIR=$DESTDIR/usr install 8.25 @@ -42,7 +42,7 @@ 8.26 { 8.27 mkdir -p $fs/usr 8.28 cp -a $install/usr/sbin $fs/usr 8.29 - cp -a $install/usr/lib $fs/usr 8.30 + [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr 8.31 cp -a $stuff/pppnc-server $fs/usr/sbin 8.32 ln $fs/usr/sbin/pppnc-server $fs/usr/sbin/pppnc-client 8.33 # Config files. 8.34 @@ -53,7 +53,8 @@ 8.35 # PPP scripts. 8.36 cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts 8.37 cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts 8.38 - sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' $fs/etc/ppp/scripts/ppp-on 8.39 + sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' \ 8.40 + $fs/etc/ppp/scripts/ppp-on 8.41 8.42 cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts 8.43 cp -a $src/scripts/callback $fs/etc/ppp/scripts 8.44 @@ -96,7 +97,7 @@ 8.45 chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down 8.46 8.47 # insert #!/bin/sh on top line in ip* scripts 8.48 - sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 8.49 + sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null 8.50 # add empty peers dir 8.51 mkdir -p $fs/etc/ppp/peers 8.52 # hide login/pass from regular users
9.1 --- a/rp-pppoe/receipt Sun Mar 30 21:43:58 2014 +0200 9.2 +++ b/rp-pppoe/receipt Sun Mar 30 22:07:59 2014 +0200 9.3 @@ -10,6 +10,7 @@ 9.4 WEB_SITE="http://www.roaringpenguin.com/products/pppoe" 9.5 WGET_URL="http://www.roaringpenguin.com/files/download/$TARBALL" 9.6 TAGS="network pppoe" 9.7 +HOST_ARCH="i486" 9.8 9.9 BUILD_DEPENDS="ppp" 9.10 9.11 @@ -17,9 +18,9 @@ 9.12 compile_rules() 9.13 { 9.14 cd $src/src 9.15 - ./configure --prefix=/usr --infodir=/usr/share/info \ 9.16 - --mandir=/usr/share/man \ 9.17 - $CONFIGURE_ARGS && 9.18 + ./configure \ 9.19 + --prefix=/usr \ 9.20 + $CONFIGURE_ARGS && 9.21 make && 9.22 make DESTDIR=$DESTDIR install 9.23 }