From 6a9ca72eb0f1c1a903e5ad5da7f31c4cf099b796 Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Mon, 28 Sep 2020 08:51:45 +0300 Subject: [PATCH 1/2] New package: cross-avr-gdb --- srcpkgs/cross-avr-gdb/template | 80 ++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 srcpkgs/cross-avr-gdb/template diff --git a/srcpkgs/cross-avr-gdb/template b/srcpkgs/cross-avr-gdb/template new file mode 100644 index 00000000000..e01a4bf6bfa --- /dev/null +++ b/srcpkgs/cross-avr-gdb/template @@ -0,0 +1,80 @@ +# Template file for 'cross-${_triplet}-${_pkgname}' +_triplet=avr +_pkgname=gdb +pkgname=cross-${_triplet}-${_pkgname} +version=9.2 +revision=1 +wrksrc=${_pkgname}-${version} +build_style=gnu-configure +pycompile_dirs="/usr/share/gdb/python" +configure_args="\ + --target=${_triplet} \ + --program-prefix=${_triplet}- \ + --disable-werror \ + --disable-nls \ + --with-system-readline \ + --with-system-gdbinit=/etc/gdb/gdbinit \ + --with-system-zlib $(vopt_enable gdbserver) \ + $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static') \ + $(vopt_if python --with-python=/usr/bin/python3)" +hostmakedepends="texinfo perl $(vopt_if python python3-devel)" +makedepends="ncurses-devel zlib-devel readline-devel expat-devel + $(vopt_if python 'python3-devel gettext-libs')" +depends=gdb +short_desc="GNU Debugger for AVR" +maintainer="Artur Sinila " +license="GPL-3.0-or-later" +homepage="https://www.gnu.org/software/gdb/" +distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz" +checksum=360cd7ae79b776988e89d8f9a01c985d0b1fa21c767a4295e5f88cb49175c555 +python_version=3 + +if [ "${CROSS_BUILD}" ]; then + # Make python3.x detection work in cross builds + CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" + CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" +fi +CFLAGS+=" -fcommon" +CXXFLAGS+=" -fcommon" +# Package build options +build_options="gdbserver static python" +desc_option_gdbserver="Enable support for building GDB server" +# By default, don't enable any of build options +#build_options_default="gdbserver" +# Both options cannot be enabled at the same time +vopt_conflict gdbserver static + +post_extract() { + vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c + mkdir -p build +} + +do_configure() { + cd build + ../configure ${configure_args/with-sysroot/with-build-sysroot} \ + CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -fcommon" + export gl_cv_func_gettimeofday_clobber=no + export gl_cv_func_working_strerror=yes + export gl_cv_func_strerror_0_works=yes +} + +do_build() { + cd build + make ${makejobs} all +} + +do_install() { + cd build + make DESTDIR=${DESTDIR} ${makejobs} install + # resolve conflicts with binutils + rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib + rm -rf ${DESTDIR}/usr/lib64 + for f in bfd configure standards; do + rm -f ${DESTDIR}/usr/share/info/${f}.info* + done +} + +post_install() { + # resolve conflicts with binutils and native gdb + rm -fr usr/{share/{locale,gdb,info},include} +} From e2cf076193c5f93490351627eb807d619da2f3af Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Mon, 28 Sep 2020 02:28:34 +0300 Subject: [PATCH 2/2] android-studio: update to 4.0.1.0 --- srcpkgs/android-studio/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template index 1353bf14c7e..8c48149987b 100644 --- a/srcpkgs/android-studio/template +++ b/srcpkgs/android-studio/template @@ -1,11 +1,11 @@ # Template file for 'android-studio' pkgname=android-studio -version=4.0.0 -revision=2 +version=4.0.1 +revision=1 # _studio_build and _studio_rev are for downloading the zip from dl.google.com # https://developer.android.com/studio/#resources as of 2018-07-12 -_studio_build=193.6514223 -_studio_rev=16 +_studio_build=193.6626763 +_studio_rev=0 archs="x86_64 i686" create_wrksrc=yes hostmakedepends="tar" @@ -16,7 +16,7 @@ license="Apache-2.0" homepage="http://tools.android.com/" # changelog="https://developer.android.com/studio/releases/index.html" distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz" -checksum=70c04dc542281c015a700fad73d7d62ce9dace774bc12050cad9f1d6363112eb +checksum=f2f82744e735eae43fa018a77254c398a3bab5371f09973a37483014b73b7597 repository=nonfree restricted=yes python_version=2