Index: head/devel/xtensa-esp32-elf/Makefile =================================================================== --- head/devel/xtensa-esp32-elf/Makefile (revision 531469) +++ head/devel/xtensa-esp32-elf/Makefile (revision 531470) @@ -1,114 +1,113 @@ # Created by: Craig Leres # $FreeBSD$ PORTNAME= xtensa-esp32-elf DISTVERSION= 1.22.0.g20171219 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= SOURCEWARE/binutils/releases/binutils:source1 \ GNU/binutils:source1 \ https://github.com/libexpat/libexpat/releases/download/R_2_1_0/:source2 \ SF/expat/expat/2.1.0:source2 \ GCC/releases/gcc-5.2.0:source3 \ GNU/gdb:source4 \ GNU/gmp:source5 \ http://isl.gforge.inria.fr/:source6 \ GNU/mpc:source7 \ http://www.mpfr.org/mpfr-3.1.3/:source8 \ GNU/mpfr:source8 \ ftp://ftp.invisible-island.net/ncurses/:source9 \ GNU/ncurses:source9 \ SOURCEWARE/newlib:source10 \ ftp://sources.redhat.com/pub/newlib/:source10 DISTFILES= binutils-2.25.1.tar.bz2:source1 \ expat-2.1.0.tar.gz:source2 \ gcc-5.2.0.tar.bz2:source3 \ gdb-7.10.tar.xz:source4 \ gmp-6.0.0a.tar.xz:source5 \ isl-0.14.tar.xz:source6 \ mpc-1.0.3.tar.gz:source7 \ mpfr-3.1.3.tar.xz:source8 \ ncurses-6.0.tar.gz:source9 \ newlib-2.2.0.tar.gz:source10 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= leres@FreeBSD.org COMMENT= Espressif ESP32 toolchain LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - BROKEN_armv6= fails to build: failed in step 'Installing pass-2 core C gcc compiler' BROKEN_armv7= fails to build: failed in step 'Installing pass-2 core C gcc compiler' BROKEN_powerpc64= fails to build: [ERROR] collect2: error: ld returned 1 exit status BUILD_DEPENDS= bash:shells/bash \ gawk:lang/gawk \ git:devel/git \ gpatch:devel/patch \ ${LOCALBASE}/bin/grep:textproc/gnugrep \ gperf:devel/gperf \ gsed:textproc/gsed \ help2man:misc/help2man \ makeinfo:print/texinfo \ wget:ftp/wget -USES= autoreconf:build bison gmake libtool python:2.7 +USES= autoreconf:build bison gmake libtool python USE_GCC= 7 USE_GITHUB= yes USE_LDCONFIG= ${PREFIX}/${PORTNAME}/libexec/gcc/${PORTNAME}/5.2.0 NO_MTREE= yes SUBDIR= crosstool-NG TAGNAME= 1.22.0-80-g6c4433a5 GH_TUPLE= espressif:${SUBDIR}:${TAGNAME} BINARY_ALIAS= g++=${CXX} gcc=${CC} python=${PYTHON_VERSION} BUILD_ENV= CT_ALLOW_BUILD_AS_ROOT_SURE=1 \ LD_RUN_PATH=${PREFIX}/lib/${CC} \ ${MAKE_ENV:MPATH=*} post-extract: ${MKDIR} ${BUILD_WRKSRC}/.build/tarballs .for F in $(DISTFILES:N$(EXTRACT_ONLY)) ${LN} -s ${DISTDIR}/${F:C/:source[0-9]+$//} \ ${BUILD_WRKSRC}/.build/tarballs .endfor + ${MKDIR} ${WRKSRC}/local-patches/gdb/7.10 + ${CP} ${FILESDIR}/0001-gdb-7.12.1.patch ${WRKSRC}/local-patches/gdb/7.10 echo CT_LOG_PROGRESS_BAR=n >> \ ${BUILD_WRKSRC}/samples/${PORTNAME}/crosstool.config post-patch: @${REINPLACE_CMD} -e 's/\(GNU bash, version.*4\)/\1|5/' \ ${WRKSRC}/configure.ac do-configure: cd ${BUILD_WRKSRC} && ./bootstrap ${PRINTF} "#!/bin/sh\necho '${SUBDIR:tl}-${TAGNAME}'\n" > \ ${BUILD_WRKSRC}/version.sh ${CHMOD} -w+x ${BUILD_WRKSRC}/version.sh cd ${BUILD_WRKSRC} && \ ./configure --enable-local --with-grep=${LOCALBASE}/bin/grep cd ${BUILD_WRKSRC} && \ ${SETENV} -uMAKELEVEL -uMAKEFLAGS -u.MAKE.LEVEL.ENV \ ${MAKE_CMD} install && ${SETENV} ${BUILD_ENV} ./ct-ng ${PORTNAME} do-build: cd ${BUILD_WRKSRC} && ${SETENV} ${BUILD_ENV} ./ct-ng build cd ${BUILD_WRKSRC}/builds/${PORTNAME} && \ ${CHMOD} +w . lib && \ ${RM} build.log.bz2 lib/charset.alias && \ ${CHMOD} -w . lib do-install: cd ${BUILD_WRKSRC}/builds && \ ${COPYTREE_BIN} ${PORTNAME} ${STAGEDIR}${PREFIX} ${FIND} ${STAGEDIR}${PREFIX}/${PORTNAME} -type f | \ ${XARGS} ${CHMOD} -wx ${FIND} ${STAGEDIR}${PREFIX}/${PORTNAME}/bin \ ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/gcc/${PORTNAME}/5.2.0 \ ${STAGEDIR}${PREFIX}/${PORTNAME}/${PORTNAME}/bin -type f | \ ${XARGS} ${CHMOD} +x .include Index: head/devel/xtensa-esp32-elf/files/0001-gdb-7.12.1.patch =================================================================== --- head/devel/xtensa-esp32-elf/files/0001-gdb-7.12.1.patch (nonexistent) +++ head/devel/xtensa-esp32-elf/files/0001-gdb-7.12.1.patch (revision 531470) @@ -0,0 +1,46 @@ +Derived from: + + https://github.com/crosstool-ng/crosstool-ng/issues/1206 + _PyImport_FixupBuiltin Solution patch #1206 + +--- a/gdb/python/python.c.orig 2019-06-14 11:41:02.944671520 +0800 ++++ b/gdb/python/python.c 2019-06-14 11:55:32.000000000 +0800 +@@ -1624,6 +1624,17 @@ finalize_python (void *ignore) + } + #endif + ++#ifdef IS_PY3K ++/* This is called via the PyImport_AppendInittab mechanism called ++ during initialization, to make the built-in _gdb module known to ++ Python. */ ++PyMODINIT_FUNC ++init__gdb_module (void) ++{ ++ return PyModule_Create (&python_GdbModuleDef); ++} ++#endif ++ + /* Provide a prototype to silence -Wmissing-prototypes. */ + extern initialize_file_ftype _initialize_python; + +@@ -1743,6 +1754,9 @@ message == an error message without a st + remain alive for the duration of the program's execution, so + it is not freed after this call. */ + Py_SetProgramName (progname_copy); ++ ++ /* Define _gdb as a built-in module. */ ++ PyImport_AppendInittab ("_gdb", init__gdb_module); + #else + Py_SetProgramName (progname); + #endif +@@ -1752,9 +1766,7 @@ message == an error message without a st + PyEval_InitThreads (); + + #ifdef IS_PY3K +- gdb_module = PyModule_Create (&python_GdbModuleDef); +- /* Add _gdb module to the list of known built-in modules. */ +- _PyImport_FixupBuiltin (gdb_module, "_gdb"); ++ gdb_module = PyImport_ImportModule ("_gdb"); + #else + gdb_module = Py_InitModule ("_gdb", python_GdbMethods); + #endif Property changes on: head/devel/xtensa-esp32-elf/files/0001-gdb-7.12.1.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property