snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

Merge branch 'master' of https://github.com/voidlinux/xbps-packages into llvm35

Browse source 
Conflicts:
	srcpkgs/MesaLib/template
This commit is contained in:
John Galt 2014-09-07 01:08:00 -07:00
commit f6246958b0
9 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/cross-profiles/armv7hf.sh
View file

@ -1,7 +1,7 @@
# Cross build profile for ARMv7 GNU EABI Hard Float. # Cross build profile for ARMv7 GNU EABI Hard Float.
XBPS_TARGET_ARCH="armv7l" XBPS_TARGET_ARCH="armv7l"
XBPS_CROSS_TRIPLET="armv7l-linux-gnueabihf" XBPS_CROSS_TRIPLET="arm-linux-gnueabihf7"
XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong" XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong"
XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CXXFLAGS="$XBPS_CFLAGS"
XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"

1
common/hooks/do-extract/00-distfiles.sh
View file

@ -51,6 +51,7 @@ hook() {
*.tar) cursufx="tar";; *.tar) cursufx="tar";;
*.zip) cursufx="zip";; *.zip) cursufx="zip";;
*.rpm) cursufx="rpm";; *.rpm) cursufx="rpm";;
*.patch) cursufx="pch";;
*) msg_error "$pkgver: unknown distfile suffix for $curfile.\n";; *) msg_error "$pkgver: unknown distfile suffix for $curfile.\n";;
esac esac

6
srcpkgs/MesaLib/template
View file

@ -1,7 +1,7 @@
# Template build file for 'MesaLib'. # Template build file for 'MesaLib'.
pkgname=MesaLib pkgname=MesaLib
version=10.2.6 version=10.2.7
revision=5 revision=2
wrksrc="Mesa-${version}" wrksrc="Mesa-${version}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.mesa3d.org/" homepage="http://www.mesa3d.org/"
license="MIT, LGPL-2.1" license="MIT, LGPL-2.1"
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2" distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2"
checksum=193314d2adba98e43697d726739ac46b4299aae324fa1821aa226890c28ac806 checksum=27b958063a4c002071f14ed45c7d2a1ee52cd85e4ac8876e8a1c273495a7d43f
hostmakedepends=" hostmakedepends="
automake libtool flex pkg-config llvm libxml2-python wayland-devel" automake libtool flex pkg-config llvm libxml2-python wayland-devel"

1
srcpkgs/cross-arm-linux-gnueabihf7-libc Symbolic link
View file

@ -0,0 +1 @@
cross-arm-linux-gnueabihf7

0
srcpkgs/cross-armv7l-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch → srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-xattr-compat-hack.patch
View file

10
srcpkgs/cross-armv7l-linux-gnueabihf/template → srcpkgs/cross-arm-linux-gnueabihf7/template
View file

@ -1,17 +1,17 @@
# Template build file for 'cross-armv7l-linux-gnueabihf' # Template build file for 'cross-arm-linux-gnueabihf7'
# #
_binutils_version=2.24 _binutils_version=2.24
_gcc_version=4.9.1 _gcc_version=4.9.1
_glibc_version=2.19 _glibc_version=2.19
_linux_version=3.10.6 _linux_version=3.10.6
_triplet=armv7l-linux-gnueabihf _triplet=arm-linux-gnueabihf7
_fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
_archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
_CROSS_SYSROOT="/usr/${_triplet}" _CROSS_SYSROOT="/usr/${_triplet}"
pkgname=cross-${_triplet} pkgname=cross-${_triplet}
version=0.18 version=0.19
revision=1 revision=1
short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -31,6 +31,8 @@ checksum="
lib32disabled=yes lib32disabled=yes
nocross=yes nocross=yes
create_wrksrc=yes create_wrksrc=yes
replaces="cross-armv7l-linux-gnueabihf>=0 cross-armv7l-linux-gnueabihf-libc>=0"
hostmakedepends="perl flex" hostmakedepends="perl flex"
makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
depends="${pkgname}-libc-${version}_${revision}" depends="${pkgname}-libc-${version}_${revision}"
@ -283,7 +285,7 @@ do_clean() {
rm -rf /usr/libexec/gcc/${_triplet} rm -rf /usr/libexec/gcc/${_triplet}
} }
cross-armv7l-linux-gnueabihf-libc_package() { cross-arm-linux-gnueabihf7-libc_package() {
short_desc+=" - glibc files" short_desc+=" - glibc files"
noarch=yes noarch=yes
nostrip=yes nostrip=yes

1
srcpkgs/cross-armv7l-linux-gnueabihf-libc
View file

@ -1 +0,0 @@
cross-armv7l-linux-gnueabihf

24
srcpkgs/dmenu/template
View file

@ -1,14 +1,26 @@
# Template file for 'dmenu' # Template file for 'dmenu'
pkgname=dmenu pkgname=dmenu
version=4.5 version=4.5
revision=7 revision=8
makedepends="libXinerama-devel" makedepends="libXinerama-devel $(vopt_if xft 'libXft-devel freetype-devel')"
short_desc="A generic menu for X" short_desc="A generic menu for X"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT" license="MIT"
homepage="http://tools.suckless.org/dmenu/" homepage="http://tools.suckless.org/dmenu/"
distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz" distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz
checksum=082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 http://tools.suckless.org/dmenu/patches/dmenu-${version}-xft.diff"
skip_extraction="${pkgname}-${version}-xft.diff"
checksum="082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850
efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f"
build_options="xft"
desc_option_xft="Enable Xft font support"
pre_build() {
if [ "$build_option_xft" ]; then
patch -Np1 -i ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-xft.diff
fi
}
do_build() { do_build() {
sed -i -e "s|^CFLAGS =|CFLAGS += |g" \ sed -i -e "s|^CFLAGS =|CFLAGS += |g" \
@ -16,7 +28,9 @@ do_build() {
x11inc=$XBPS_CROSS_BASE/usr/include/X11 x11inc=$XBPS_CROSS_BASE/usr/include/X11
x11lib=$XBPS_CROSS_BASE/usr/lib x11lib=$XBPS_CROSS_BASE/usr/lib
make CC="$CC" ${makejobs} X11INC=$x11inc X11LIB=$x11lib xftinc=-I$XBPS_CROSS_BASE/usr/include/freetype2
make CC="$CC" ${makejobs} X11INC=$x11inc X11LIB=$x11lib \
$(vopt_if xft XFTINC=$xftinc)
} }
do_install() { do_install() {

7
srcpkgs/gcc/template
View file

@ -2,7 +2,7 @@
pkgname=gcc pkgname=gcc
_majorver=4.9 _majorver=4.9
version=${_majorver}.1 version=${_majorver}.1
revision=6 revision=7
short_desc="The GNU C Compiler" short_desc="The GNU C Compiler"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://gcc.gnu.org" homepage="http://gcc.gnu.org"
@ -34,7 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
x86_64-musl) _triplet="x86_64-linux-musl";; x86_64-musl) _triplet="x86_64-linux-musl";;
armv5tel) _triplet="arm-linux-gnueabi";; armv5tel) _triplet="arm-linux-gnueabi";;
armv6l) _triplet="arm-linux-gnueabihf";; armv6l) _triplet="arm-linux-gnueabihf";;
armv7l) _triplet="armv7l-linux-gnueabihf";; armv7l) _triplet="arm-linux-gnueabihf7";;
arm*-musl) _triplet="arm-linux-musleabi";; arm*-musl) _triplet="arm-linux-musleabi";;
esac esac
@ -62,6 +62,9 @@ do_configure() {
_langs="c,c++,lto" _langs="c,c++,lto"
_args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}" _args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}"
else else
case "$XBPS_TARGET_MACHINE" in
arm*) _args+=" --build=${_triplet}";;
esac
_langs="c,c++,objc,obj-c++,fortran,lto,go,java" _langs="c,c++,objc,obj-c++,fortran,lto,go,java"
_args+=" --enable-java-gc=boehm --enable-fast-character" _args+=" --enable-java-gc=boehm --enable-fast-character"
fi fi