# HG changeset patch # User Christophe Lincoln # Date 1396210079 -7200 # Node ID e6bbb8cc067750a4a84c25452c26eeb4f7a04671 # Parent c358d2c8fa302920edba958c6eea17944b02a438 libxcb: back to 1.9.1 for ARM (1.10 is needed for wayland) diff -r c358d2c8fa30 -r e6bbb8cc0677 fpc-bootstrap/receipt --- a/fpc-bootstrap/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/fpc-bootstrap/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fpc-bootstrap" -VERSION="2.4.2" +VERSION="2.6.2" CATEGORY="development" SHORT_DESC="bootstrap to compile fpc." MAINTAINER="slaxemulator@gmail.com" @@ -9,7 +9,6 @@ TARBALL="i386-linux-ppc386.bz2" WEB_SITE="http://freepascal.org/" WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$TARBALL" -COOK_OPT="!repack_src !unpack" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r c358d2c8fa30 -r e6bbb8cc0677 fpc-src/receipt --- a/fpc-src/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/fpc-src/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fpc-src" -VERSION="2.4.2" +VERSION="2.6.4" CATEGORY="development" SHORT_DESC="Sources for the FreePascal compiler (requierd by the Lazarus IDE)." MAINTAINER="slaxemulator@gmail.com" @@ -10,9 +10,7 @@ TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://www.freepascal.org/" WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/source/$TARBALL" -COOK_OPT="!strip" - -DEPENDS="" +HOST_ARCH="i486 arm" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r c358d2c8fa30 -r e6bbb8cc0677 fpc/description.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fpc/description.txt Sun Mar 30 22:07:59 2014 +0200 @@ -0,0 +1,3 @@ +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. diff -r c358d2c8fa30 -r e6bbb8cc0677 fpc/receipt --- a/fpc/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/fpc/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -1,9 +1,9 @@ # SliTaz package receipt. PACKAGE="fpc" -VERSION="2.4.2" +VERSION="2.6.4" CATEGORY="development" -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." +SHORT_DESC="The Free Pascal Compiler" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2 LGPL2.1" SOURCE="fpcbuild" @@ -13,19 +13,39 @@ CONFIG_FILE="/etc/fpc.cfg" TAGS="compiler pascal" +CROSS_BUGS="arm-slitaz-gnueabi-as: Command not found" +#HOST_ARCH="i486 arm" + DEPENDS="ncurses" BUILD_DEPENDS="fpc-bootstrap" +# Handle cross compilation. ARM: fpc-bootstrap build host must be installed +case "$ARCH" in + arm*) BUILD_DEPENDS="" ;; +esac + # Rules to configure and make the package. compile_rules() { - cd $src - make NOGDB=1 build - make -j1 NOGDB=1 PREFIX=$DESTDIR/usr install - + case "$ARCH" in + i?86) + make ${ARCH_ARGS} NOGDB=1 build + make -j1 NOGDB=1 PREFIX=$DESTDIR/usr install ;; + arm*) + make crossinstall \ + NOGDB=1 \ + CPU_TARGET=arm \ + OS_TARGET=linux \ + OPT=-dFPC_ARMEL \ + CROSSBINDIR=/cross/$ARCH/tools/bin \ + BINUTILSPREFIX=arm-slitaz-gnueabi- \ + INSTALL_PREFIX=$DESTDIR/usr ;; + esac && + # install package license - install -m 755 -d $DESTDIR/usr/share/licenses/fpc - install -m 644 $src/fpcsrc/rtl/COPYING.FPC $DESTDIR/usr/share/licenses/fpc/ + install -m 755 -d $DESTDIR/usr/share/licenses/fpc && + install -m 644 $src/fpcsrc/rtl/COPYING.FPC \ + $DESTDIR/usr/share/licenses/fpc/ } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -34,10 +54,9 @@ mkdir -p $fs/usr $fs/etc cp -a $install/usr/bin $fs/usr cp -a $install/usr/lib $fs/usr - # create symlink for compiler ln -s /usr/lib/$PACKAGE/$VERSION/ppc386 $fs/usr/bin - + # config file mkdir -p $fs/etc cp -a $fs/usr/lib/fpc/$VERSION/samplecfg $fs/etc/fpc.cfg } diff -r c358d2c8fa30 -r e6bbb8cc0677 libxcb-dev/receipt --- a/libxcb-dev/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/libxcb-dev/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -2,6 +2,7 @@ PACKAGE="libxcb-dev" VERSION="1.10" +ARM_VERSION="1.9.1" CATEGORY="development" SHORT_DESC="Development files for libxcb" MAINTAINER="mallory@sweetpeople.org" @@ -12,6 +13,15 @@ WANTED="libxcb" DEPENDS="xorg-libXau-dev xorg-libXdmcp-dev pkg-config" +# Handle SliTaz arch +case "$SLITAZ_ARCH" in + arm*) VERSION="$ARM_VERSION" ;; +esac + +case "$ARCH" in + arm*) VERSION="$ARM_VERSION" ;; +esac + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r c358d2c8fa30 -r e6bbb8cc0677 libxcb/receipt --- a/libxcb/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/libxcb/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -2,6 +2,7 @@ PACKAGE="libxcb" VERSION="1.10" +ARM_VERSION="1.9.1" CATEGORY="x-window" SHORT_DESC="A C binding to the X11 protocol" MAINTAINER="pankso@slitaz.org" @@ -15,9 +16,17 @@ BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev \ autoconf automake libtool" +# Handle SliTaz arch +case "$SLITAZ_ARCH" in + arm*) VERSION="$ARM_VERSION" ;; +esac + case "$ARCH" in - arm) + arm*) # We need host xcb-proto libxslt-dev file installed + VERSION="$ARM_VERSION" + TARBALL="$PACKAGE-$VERSION.tar.bz2" + WGET_URL="${WEB_SITE}dist/$TARBALL" BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev" ;; esac diff -r c358d2c8fa30 -r e6bbb8cc0677 ppp-dev/receipt --- a/ppp-dev/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/ppp-dev/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -8,6 +8,7 @@ LICENSE="BSD GPL" WEB_SITE="http://ppp.samba.org/" WANTED="ppp" +HOST_ARCH="i486 arm" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r c358d2c8fa30 -r e6bbb8cc0677 ppp/receipt --- a/ppp/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/ppp/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -10,11 +10,11 @@ WEB_SITE="http://ppp.samba.org/" WGET_URL="ftp://ftp.samba.org/pub/ppp/$TARBALL" CONFIG_FILES="/etc/ppp" +HOST_ARCH="i486 arm" # Rules to configure and make the package. compile_rules() { - cd $src if ! grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ; then sed -i /#endif/d include/linux/if_pppol2tp.h cat >> include/linux/if_pppol2tp.h </dev/null # add empty peers dir mkdir -p $fs/etc/ppp/peers # hide login/pass from regular users diff -r c358d2c8fa30 -r e6bbb8cc0677 rp-pppoe/receipt --- a/rp-pppoe/receipt Sun Mar 30 21:43:58 2014 +0200 +++ b/rp-pppoe/receipt Sun Mar 30 22:07:59 2014 +0200 @@ -10,6 +10,7 @@ WEB_SITE="http://www.roaringpenguin.com/products/pppoe" WGET_URL="http://www.roaringpenguin.com/files/download/$TARBALL" TAGS="network pppoe" +HOST_ARCH="i486" BUILD_DEPENDS="ppp" @@ -17,9 +18,9 @@ compile_rules() { cd $src/src - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && + ./configure \ + --prefix=/usr \ + $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install }