From 3110a76b1a778261c050c0c4d112613bc7d7ad01 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Sat, 6 Sep 2014 19:55:19 +0000 Subject: [PATCH 1/9] dmenu: add xft build option (off) --- srcpkgs/dmenu/template | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template index cac87f1bb40..98c11340d8a 100644 --- a/srcpkgs/dmenu/template +++ b/srcpkgs/dmenu/template @@ -1,14 +1,26 @@ # Template file for 'dmenu' pkgname=dmenu version=4.5 -revision=7 -makedepends="libXinerama-devel" +revision=8 +makedepends="libXinerama-devel $(vopt_if xft 'libXft-devel freetype-devel')" short_desc="A generic menu for X" maintainer="Juan RP " license="MIT" homepage="http://tools.suckless.org/dmenu/" -distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz" -checksum=082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 +distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz + 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() { sed -i -e "s|^CFLAGS =|CFLAGS += |g" \ @@ -16,7 +28,9 @@ do_build() { x11inc=$XBPS_CROSS_BASE/usr/include/X11 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() { From 413fa5ee3f3b6bc157d4fa5dc701b520d47c7ce8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Sep 2014 02:02:36 +0200 Subject: [PATCH 2/9] MesaLib: update to 10.2.7. --- srcpkgs/MesaLib/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index cbaa3176bc2..73bd4f0a9a7 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib -version=10.2.6 -revision=4 +version=10.2.7 +revision=1 wrksrc="Mesa-${version}" build_style=gnu-configure configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2" -checksum=193314d2adba98e43697d726739ac46b4299aae324fa1821aa226890c28ac806 +checksum=27b958063a4c002071f14ed45c7d2a1ee52cd85e4ac8876e8a1c273495a7d43f hostmakedepends=" automake libtool flex pkg-config llvm libxml2-python wayland-devel" From 440d5d8772723afdf3b470ab86a8e4f64f45b2ed Mon Sep 17 00:00:00 2001 From: John Galt Date: Sat, 6 Sep 2014 19:34:59 -0700 Subject: [PATCH 3/9] do-extract: allow patch distfile suffix And do nothing with them --- common/hooks/do-extract/00-distfiles.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh index 92d4714ce9b..c8907b3973e 100644 --- a/common/hooks/do-extract/00-distfiles.sh +++ b/common/hooks/do-extract/00-distfiles.sh @@ -51,6 +51,7 @@ hook() { *.tar) cursufx="tar";; *.zip) cursufx="zip";; *.rpm) cursufx="rpm";; + *.patch) cursufx="pch";; *) msg_error "$pkgver: unknown distfile suffix for $curfile.\n";; esac From 8df93a782564843e3188724168a557c95d75eace Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Sep 2014 09:05:47 +0200 Subject: [PATCH 4/9] cross-armv7l-linux-gnueabihf -> cross-arm-linux-gnueabihf7. armv7l is not a valid machine type, and config.sub does not accept it. Let's switch to the original triplet instead. --- .../cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 | 1 + .../files/glibc-2.18-xattr-compat-hack.patch | 0 .../template | 8 +++++--- srcpkgs/cross-armv7l-linux-gnueabihf-libc | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 rename srcpkgs/{cross-armv7l-linux-gnueabihf => cross-arm-linux-gnueabihf7}/files/glibc-2.18-xattr-compat-hack.patch (100%) rename srcpkgs/{cross-armv7l-linux-gnueabihf => cross-arm-linux-gnueabihf7}/template (97%) delete mode 120000 srcpkgs/cross-armv7l-linux-gnueabihf-libc diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 b/srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 new file mode 120000 index 00000000000..91475a64be9 --- /dev/null +++ b/srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 @@ -0,0 +1 @@ +cross-arm-linux-gnueabihf7 \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-xattr-compat-hack.patch similarity index 100% rename from srcpkgs/cross-armv7l-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch rename to srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-xattr-compat-hack.patch diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf7/template similarity index 97% rename from srcpkgs/cross-armv7l-linux-gnueabihf/template rename to srcpkgs/cross-arm-linux-gnueabihf7/template index 0e35ea76360..ed8bde16e7e 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf7/template @@ -1,11 +1,11 @@ -# Template build file for 'cross-armv7l-linux-gnueabihf' +# Template build file for 'cross-arm-linux-gnueabihf7' # _binutils_version=2.24 _gcc_version=4.9.1 _glibc_version=2.19 _linux_version=3.10.6 -_triplet=armv7l-linux-gnueabihf +_triplet=arm-linux-gnueabihf7 _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _CROSS_SYSROOT="/usr/${_triplet}" @@ -31,6 +31,8 @@ checksum=" lib32disabled=yes nocross=yes create_wrksrc=yes +replaces="cross-armv7l-linux-gnueabihf>=0 cross-armv7l-linux-gnueabihf-libc>=0" + hostmakedepends="perl flex" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" depends="${pkgname}-libc-${version}_${revision}" @@ -283,7 +285,7 @@ do_clean() { rm -rf /usr/libexec/gcc/${_triplet} } -cross-armv7l-linux-gnueabihf-libc_package() { +cross-arm-linux-gnueabihf7-libc_package() { short_desc+=" - glibc files" noarch=yes nostrip=yes diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf-libc b/srcpkgs/cross-armv7l-linux-gnueabihf-libc deleted file mode 120000 index 3833a4b58bd..00000000000 --- a/srcpkgs/cross-armv7l-linux-gnueabihf-libc +++ /dev/null @@ -1 +0,0 @@ -cross-armv7l-linux-gnueabihf \ No newline at end of file From 2f3537525a8d9cf1157651bee73cf329c6e5fa9e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Sep 2014 09:06:53 +0200 Subject: [PATCH 5/9] cross-profiles/armv7hf.sh: switch to the arm-linux-gnueabihf7 cross compiler. --- common/cross-profiles/armv7hf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cross-profiles/armv7hf.sh b/common/cross-profiles/armv7hf.sh index fe738c1f24c..c6b1519d501 100644 --- a/common/cross-profiles/armv7hf.sh +++ b/common/cross-profiles/armv7hf.sh @@ -1,7 +1,7 @@ # Cross build profile for ARMv7 GNU EABI Hard Float. XBPS_TARGET_ARCH="armv7l" -XBPS_CROSS_TRIPLET="armv7l-linux-gnueabihf" +XBPS_CROSS_TRIPLET="arm-linux-gnueabihf7" XBPS_CFLAGS="-O2 -pipe -fstack-protector-strong" XBPS_CXXFLAGS="$XBPS_CFLAGS" XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" From 10e3477ab97a7e263dc6d85f0f4c8ea09b364099 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Sep 2014 09:07:35 +0200 Subject: [PATCH 6/9] Revert "gcc: update triplet for armv7l." This reverts commit 2998d95ba922b0fd4b32e49eed4a8bd17b38a9c6. --- srcpkgs/gcc/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 24c66a78618..b289704f357 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -2,7 +2,7 @@ pkgname=gcc _majorver=4.9 version=${_majorver}.1 -revision=6 +revision=5 short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" @@ -33,8 +33,7 @@ case "$XBPS_TARGET_MACHINE" in x86_64) _triplet="x86_64-unknown-linux-gnu";; x86_64-musl) _triplet="x86_64-linux-musl";; armv5tel) _triplet="arm-linux-gnueabi";; - armv6l) _triplet="arm-linux-gnueabihf";; - armv7l) _triplet="armv7l-linux-gnueabihf";; + armv[67]l) _triplet="arm-linux-gnueabihf";; arm*-musl) _triplet="arm-linux-musleabi";; esac @@ -62,6 +61,9 @@ do_configure() { _langs="c,c++,lto" _args+=" --disable-multilib --host=$XBPS_CROSS_TRIPLET --with-build-sysroot=${XBPS_CROSS_BASE}" else + case "$XBPS_TARGET_MACHINE" in + arm*) _args+=" --build=${_triplet}";; + esac _langs="c,c++,objc,obj-c++,fortran,lto,go,java" _args+=" --enable-java-gc=boehm --enable-fast-character" fi From 172be05be585ec543a9b609cb970316b1a324192 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Sep 2014 09:09:16 +0200 Subject: [PATCH 7/9] gcc: update armv7l triplet again. --- srcpkgs/gcc/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index b289704f357..1578b83185f 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -2,7 +2,7 @@ pkgname=gcc _majorver=4.9 version=${_majorver}.1 -revision=5 +revision=7 short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org" @@ -33,7 +33,8 @@ case "$XBPS_TARGET_MACHINE" in x86_64) _triplet="x86_64-unknown-linux-gnu";; x86_64-musl) _triplet="x86_64-linux-musl";; armv5tel) _triplet="arm-linux-gnueabi";; - armv[67]l) _triplet="arm-linux-gnueabihf";; + armv6l) _triplet="arm-linux-gnueabihf";; + armv7l) _triplet="arm-linux-gnueabihf7";; arm*-musl) _triplet="arm-linux-musleabi";; esac From 2c97174071aef2b0fcc3cb29614b5ff153248617 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Sep 2014 09:31:17 +0200 Subject: [PATCH 8/9] cross-arm-linux-gnueabihf7: add missing subpkg symlink. --- ...cross-arm-linux-gnueabihf7 => cross-arm-linux-gnueabihf7-libc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename srcpkgs/{cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 => cross-arm-linux-gnueabihf7-libc} (100%) diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 b/srcpkgs/cross-arm-linux-gnueabihf7-libc similarity index 100% rename from srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 rename to srcpkgs/cross-arm-linux-gnueabihf7-libc From a472ec780b90f22ff4e3afd2453d464a7995f3b4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 7 Sep 2014 09:52:02 +0200 Subject: [PATCH 9/9] cross-arm-linux-gnueabihf7: bump to trigger autobuilds. --- srcpkgs/cross-arm-linux-gnueabihf7/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/template b/srcpkgs/cross-arm-linux-gnueabihf7/template index ed8bde16e7e..71e4815e2ce 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf7/template +++ b/srcpkgs/cross-arm-linux-gnueabihf7/template @@ -11,7 +11,7 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.18 +version=0.19 revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP "