From e42b3e385822fc1b08807a585d4bb2015c823690 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 15 Jan 2020 22:08:42 -0500 Subject: meta-openembedded: subtree update:459dbf1078..ea8604a0e3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (6): xfsprogs: Remove obsolete patch gpsd: Add a PACKAGECONFIG for disabling usb support libqmi: Upgrade 1.24.0 -> 1.24.2 enchant2: Upgrade 2.2.3 -> 2.2.7 geany-plugins: Use enchant2 instead of the old enchant enchant2: Remove, moved to oe-core Alex Kiernan (11): nftables: Fix documentation generation ldns: Add recipe ostree: Fix DISTRO_FEATURES with ptest but w/o xattr ostree: Drop tests for soup/xattr with ptest ostree: Change PACKAGECONFIG to use manpages ostree: Add PACKAGECONFIG for builtin-grub2-mkconfig ostree: Backport build/test fixes from upstream ostree: Upgrade 2019.5 -> 2019.6 ostree: Add support for gjs tests nftables: Expand PACKAGECONFIG, cleanup build ostree: Tidy FILES_${PN} using PACKAGE_BEFORE_PN Alexander Kanavin (1): enscript/indent/sharutils: fix build with gettext 0.20.x Alistair Francis (2): mycroft: RDEPENDS on mpg123 to allow singing openocd: Enable remote-bitbang build option Andreas Müller (76): gnome-system-monitor: add gsettings to inherit tracker-miners: initial add 2.3.1 nautilus: add tracker-miners to RDPENDS libgnomekbd: cleanup DEPENDS inherit gsettings / remove unused config nodejs: Add PACKAGECONFIG share to allow other projects to use node as library xserver-xorg-cvt-native: initial add 1.20.5 mutter: initial add 3.34.1 pinpoint: remove dead project gnome-keyring: upgrade 3.28.2 -> 3.34.0 libgsf: upgrade 1.14.45 -> 1.14.46 libgnome-keyring: remove gvfs: upgrade 1.41.2 -> 1.42.1 grilo: initial add 0.3.10 gsound: initial add 1.0.2 gnome-backgrounds: initial add 3.34.0 metacity: upgrade 3.32.0 -> 3.34.1 gjs: initial add 1.58.3 gdm: re-add 3.34.1 gnome-shell: initial add 3.34.1 gnome-shell-extensions: initial add 3.34.1 accountsservice: initial add 0.6.55 rest: initial add 0.8.1 gnome-online-accounts: initial add 3.34.1 gnome-control-center: re-add 3.34.1 gnome-session: inital add 3.34.1 gnome-panel: (re)add 3.34.1 gnome-flashback: initial add 3.34.1 Add: packagegroup-gnome-apps / packagegroup-gnome-desktop glfw: add features_check to inherit stalonetray: Add x11 to required distro feature projucer: add x11 to required distro features colord-gtk: add polkit to required distro features yelp: add x11 to required distro features file-roller: remove nautilus from DEPENDS libgdata: add x11 to required distro features accountsservice: Hack musl build fix accountsservice: fix build for systemd not in DISTRO_FEATURES gnome-font-viewer: fix copy & paste typo in SUMMARY libxfce4ui: give up glade3 (=glade for gtk2) support glade3: remove ancient version of glade exo: remove pythonnative from inherit geany: remove pythonnative from inherit gnome-tweaks: initial add 3.34.0 libhandy: initial add 0.0.12 fluidsynth: upgrade 2.0.9 -> 2.1.0 exo: upgrade 0.12.10 -> 0.12.11 tumbler: upgrade 0.2.7 -> 0.2.8 catfish: upgrade 1.4.10 -> 1.4.11 cppunit: upgrade 1.14.0 -> 1.15.1 xfce4-terminal: upgrade 0.8.8 -> 0.8.9 gnome-calculator: initial add 3.34.1 evince: upgrade 3.34.1 -> 3.34.1 file-roller: upgrade 3.32.2 -> 3.32.3 evolution-data-server: upgrade 3.34.1 -> 3.34.2 gedit: upgrade 3.34.0 -> 3.34.1 gnome-autoar: upgrade 0.2.3 -> 0.2.4 gnome-control-center: upgrade 3.34.1 -> 3.34.2 gnome-desktop3: upgrade 3.34.1 -> 3.34.2 gnome-flashback: upgrade 3.34.1 -> 3.34.2 gnome-session: 3.34.1 -> 3.34.2 gnome-settings-daemon: upgrade 3.34.1 -> 3.34.2 gnome-shell-extensions: upgrade 3.34.1 -> 3.34.2 gnome-shell: upgrade 3.34.1 -> 3.34.2 gvfs: upgrade 1.42.1 -> 1.42.2 libgdata: upgrade 0.17.10 -> 0.17.11 mutter: upgrade 3.34.1 -> 3.34.2 nautilus: upgrade 3.34.1 -> 3.34.2 yelp-xsl: upgrade 3.34.0 -> 3.34.2 poppler: upgrade 0.82.0 -> 0.84.0 xfce4-terminal: upgrade 0.8.9 -> 0.8.9.1 mutter: upgrade 3.34.2 -> 3.34.3 gnome-shell: upgrade 3.34.2 -> 3.34.3 evolution-data-server: upgrade 3.34.2 -> 3.34.3 gjs: upgrade 1.58.3 -> 1.58.4 gnome-desktop3: upgrade 3.34.2 -> 3.34.3 libsigc++-3: let meson build Andrei Gherzan (1): kernel-selftest: Include rtc tests Andrej Valek (1): ntp: split ntpdc into separate package Andrey Zhizhikin (1): flatbuffers: add PIC compiler flag required for aarch64 André Draszik (4): python3-jsonrpcserver: update to v4.1.0 python3-jsonrpcserver: allow to use as non-root oniguruma: update to v6.9.4 oniguruma: enable ptest Armin Kuster (3): glfw: missing feature check. libvncserver: fix build depends issue surf: Add opengl requirement Bartosz Golaszewski (10): librsync: new package xdelta3: update to v3.1.0 xdelta3: add native and nativesdk to BBCLASSEXTEND speedtest-cli: new package doxygen: upgrade v1.8.16 -> v1.8.17 libsigrok: upgrade v0.5.1 -> v0.5.2 libsigrokdecode: upgrade v0.5.2 -> v0.5.3 libsigrok: add support for bluetooth integration cloc: new package libsigrok: add support for hidapi integration Changqing Li (5): samba: fix wrong shebang for python3 gtk-xfce-engine: remove this recipe xfce4-kbdleds-plugin: remove this recipe xfce-dusk-gtk3: correct invalid SRC_URI libhugetlbfs: update patch to make it work for python3 Denys Dmytriyenko (1): netperf: add "intervals" and "histogram" PACKAGECONFIGs Diego Rondini (2): cups-filters: add recipe qpdf: add recipe Fabio Berton (1): nanopb: Add recipe for version 0.4.0 Gianfranco Costamagna (6): boinc: update recipe to version 7.16.3 vboxguestdrivers: update to version 6.1.0 and unblacklist websocketpp: add various upstream accepted and proposed patches to fix various issues, including: brotli: rename static libraries avoding the -static suffix. cpprest: fix cmake installation directory websocketpp: also install examples in a new -examples subpackage Hongxu Jia (2): gvfs: add user polkitd and missing depends python3-astor: fix VERSION file not found Jacopo Dall'Aglio (1): netplan: add recipe Jens Rehsack (6): log4cplus: update to 2.0.5 libstatgrab: add logging/tracing options libtest-warnings-perl: add recipe libfile-slurper-perl: add recipe libconfig-autoconf-perl: add recipe libunix-statgrab: add recipe Kai Kang (12): blueman: disable appindicator support xfce4-panel-profiles: 1.0.8 -> 1.0.9 exo: 0.12.9 -> 0.12.10 thunar: 1.8.9 -> 1.8.10 fltk: fix build error when enable package config examples corosync: fix build error when package config rdma enabled rdma-core: 18.1 -> 27.0 openl2tp: update systemd service file bdwgc: make libatomic-ops as dependency volume-key: not create python2 bindings libbytesize: disable doc build adduser: set default shell with /sbin/nologin Khem Raj (113): python-evdev: Fix build for 32bit arches with 64bit time_t x11vnc: Fix build for 32bit arches with 64bit time_t evtest: Fix build for 32bit arches with 64bit time_t lirc: Fix build for 32bit arches with 64bit time_t v4l-utils: Update to 1.18.0 tslib: Fix build for 32bit arches with 64bit time_t utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit time_t directfb: Fix build for 32bit arches with 64bit time_t kernel-module-emlog: Use compile task from module bbclass emlog: Use RRECOMMEND instead of RDEPEND projucer: Upgrade to 5.4.5 packagegroup-meta-oe: Remove nodejs and uim on riscv libnih: Fix build with latest gettext liblockdev: Loosen the regexp for py3 sigrok-cli: Update to 0.7.1 python-pywbem: Update to 0.15.0 udisks2: Update to 2.8.4 id3lib: Update to newer debian patchset libdc1394: Update to 2.2.6 release libsmi: Use right name for tcl license hdf5: Upgrade to 1.8.21 xterm: Fix latent issue found with musl mozjs: extend --with-intl-api=build to all mips klibc: Apply -no-integrated-as on mips/clang grpc: Define libdir and cmakedir in terms of multilib ufs-utils: Renames from ufs-tool breakpad: Update to latest upstream rsyslog: Sync VALGRIND supported arch list packagegroup-meta-oe: Remove ppc64 specific incompatible packages libpfm4: Moved here from oe-core rdma-core: Replace pthread_yield with sched_yield fvwm: Upgrade to 2.6.9 nlohmann-json: Upgrade to 3.7.3 libqb: Add --enable-nosection-fallback with mips64/clang lcdproc: Upgrade to latest top of tree tinyalsa: fix installation libdir path to match multilibs luajit: Add ppc/ppc64 to unsupported arch list rsyslog: Do not assume atomic built-ins on ppc hiredis: Upgrade to 0.14.0 libfann: Define LIB_SUFFIX suitable for OE multilib needs libgit2: Upgrade to 0.28.4 libinih: Fix multilib build poco: Define LIB_SUFFIX per OE multilibs libcec: Fix multilib build dfu-util-native,sjf2410-linux-native: Fix Deploy in multimachine builds mpv: Remove luajit dependency for ppc64 cannelloni: Update to latest and fix multilib builds nvme-cli: Use nonarch libdir for dracut config files cli11: Fix multilib build lockdev: Make baselib configurable avro-c: Update to 1.9.1 nftables: Package python scripts into nonarch libdir mercurial: Add python scripts into separate python package fluentbit: Fix packaging in multilib env dcadec: Define BASELIB as a knob dbus-broker: Use nonarch_libdir for systemd catalog files websocketapp: Fix multilib build ade: Fix install paths in multilib builds thrift: Upgrade to 0.13 gattlib: Update to latest tip rygel: Use nonarch_libdir for systemd units firewalld: Package firewalld files iwd: Package module conf files via nonarch_libdir civetweb: Upgrade to latest tip ruli: Define OOP_LIB_DIR and INSTALL_LIB_DIR liblightmodbus: Fix packaging errors when using multilib ostree: Fix packaging errors when using lib64 libdir boinc-client: Use nonarch_libdir for systemd_units spirv-tools: Fix multilib builds pam-plugin-ldapdb: Include for std::invalid_argument dvb-apps: Replace stime with clock_settime redis: Upgrade to 5.0.7 cannelloni: Include stdexcept for runtime_error libubox: Update to latest upm: Fix 'may be used uninitialized' errors memcached: upgrade to 1.5.20 ltrace: Fix build with gcc10 mpd: Fix build with gcc10 wvstreams: Fix build with gcc10 tvheadend: Fix format-truncation warnings open-vm-tools: Ignore -Warray-bounds jsoncpp: Upgrade to 1.9.2 ippool: Fix strncpy -Wformat-truncation warning opensc: Fix misaligned indentation glm: Upgrade to 0.9.9.6 rocksdb: Upgrade to 6.5.2 mariadb: Upgrade to 10.4.11 ruli: Fix implicit conversion from 'unsigned int' to 'float' glfw: Update to latest fluentbit: Upgrade to 1.3.5 renderdoc: Upgrade to 1.5 spirv-tools: Upgrade to v2019.5 upm: Disable -Wno-misleading-indentation with clang10+ libyui: Disable Warnings as errors sanlock: Upgrade to 3.8.0+ udisks2: Updare to latest master beyond 2.8.4 netcat: Fix build with gettext 0.20.x gtkperf: Fix build with latest gettext 0.20.x hddtemp: Fix build with latest gettext 0.20.x vorbis-tools: Use external gettext rwmem: Upgrade to latest wireshark: Enable plugins when enabling qt5 python3-jsonrpcserver: Use PYTHON_BASEVERSION instead of hardcoding py version smbnetfs: Update to latest 0.6.2 rev makedumpfile: Drop linking with libebl cmpi-bindings: append PYTHON_ABI suffix to libpython soname websocketpp: Fix clang specific flags in cmake files rocksdb: Disable Werror spirv-tools: Disable Werror libspatialite: Workaround proj_api.h deprecation in proj 6.0.0 zbar: Switch to github and update to latest gstd: Upgrade to 0.8.1 gst-shark: Upgrade to 0.6.1 Laurent Bonnans (1): opensc: fix RDEPENDS in pcsc PACKAGECONFIG Leon Anavi (1): mosquitto: update to 1.6.8 Martin Jansa (2): googletest: fix build with newer oe-core without python in HOSTTOOLS proj: upgrade to 6.2.0 Max Krummenacher (1): libsoc: use python3 for python bindings Maxime Roussin-Bélanger (1): libvncserver: add missing cmake configration option to packageconfig Mingde (Matthew) Zeng (1): poppler/poppler-data: Add HOMEPAGE tags Nicola Lunghi (1): python3-jsonrpcserver: update to 4.1.2 Pau Espin Pedrol (1): lksctp-tools: Add RRECOMENDS kernel-module-sctp for pkg lksctp-tools Peter Kolbus (9): python(3)-ujson: extend to native(sdk) python-ipaddress: remove unneeded pip dependency python3-html2text: add recipe python(3)-beautifulsoup4: fix RDEPENDS python3-soupsieve: add recipe python-soupsieve: add recipe python(3)-beautifulsoup4: add soupsieve to RDEPENDS python3-booleanpy: add recipe python3-license-expression: add recipe Pierre-Jean Texier (3): libssh2: add nativesdk support python3-xmltodict: add recipe libmxml: upgrade 3.0 -> 3.1 Quanyang Wang (1): glog: fix do_fetch error Randy MacLeod (3): imagemagick: update from 7.8.47 to 7.9.16 tigervnc: update from 1.9.0 to 1.10.1 rsyslog: update from 8.1910 to 8.1911 Robert Yang (1): rocksdb: Fix compile error for DEBUG_BUILD Ross Burton (11): python-jsonpointer: enable native/nativesdk python3-pystemd: upgrade to 0.7.0 python-slip-dbus: don't use relative paths python-m2crypto: don't use relative paths python-coloredlogs: don't use relative paths python-lxml: remove redundant sed (fixed in 4.3.0 onwards) python-lxml: remove redundant RDEPENDS_class-native opencv: don't download during configure opencv: also download face alignment data in do_fetch() opencv: PACKAGECONFIG for G-API, use system ADE opencv: abort configure if we need to download Stefan Agner (1): Revert "zstd: move recipe to oe-core" Stefan Lendl (2): tinyproxy: Install a default tinyproxy.conf tinyproxy: Fix user and group in tinyproxy install Sumit Garg (1): mariadb: fix library LZ4 lookup Todd Cunningham (2): libnftnl: upgrade 1.1.4 -> 1.1.5 nftables: upgrade 0.9.2 -> 0.9.3 Trevor Gamblin (4): python-twisted: add python3-pyserial to RDEPENDS python-twisted: add missing RDEPENDS for conch samba: disable guest access and anonymous queries python3-twisted: fix broken MemoryReactor import Wang Mingyu (66): python-cmd2: upgrade 0.9.19 -> 0.9.21 python-pluggy: upgrade 0.13.0 -> 0.13.1 python-pyasn1: upgrade 0.4.7 -> 0.4.8 python-pyopenssl: upgrade 19.0.0 -> 19.1.0 python-simplejson: upgrade 3.16.0 -> 3.17.0 python-thrift: upgrade 0.11.0 -> 0.13.0 python-alembic: upgrade 1.3.0 -> 1.3.1 python-dbus: upgrade 1.2.12 -> 1.2.14 python-pbr: upgrade 5.4.3 -> 5.4.4 python-paste: 3.2.2 -> 3.2.3 python-lxml: 4.4.1 -> 4.4.2 postgresql: 12.0 -> 12.1 python-jsonschema: 3.1.1 -> 3.2.0 python-pytest: upgrade 5.2.2 -> 5.3.1 xterm: upgrade 350 -> 351 wireshark: upgrade 3.0.6 -> 3.0.7 python3-xxhash: upgrade 1.4.2 -> 1.4.3 fuse3: upgrade 3.8.0 -> 3.9.0 kea: upgrade 1.7.0 -> 1.7.2 krb5: upgrade 1.17 -> 1.17.1 hwdata: upgrade 0.329 -> 0.330 python-pytest: upgrade 5.2.1 -> 5.3.2 python-waitress: upgrade 1.3.1 -> 1.4.1 python-cachetools: upgrade 3.1.1 -> 4.0.0 python-sqlalchemy: upgrade 1.1.17 -> 1.3.12 strongswan: upgrade 5.8.1 -> 5.8.2 smartmontools: upgrade 7.0 -> 7.1 spitools: upgrade 0.8.3 -> 0.8.4 python-pyyaml: upgrade 5.1.2 -> 5.2 arno-iptables-firewall: upgrade 2.0.3 -> 2.1.0 ipvsadm: upgrade 1.30 -> 1.31 lftp: upgrade 4.8.4 -> 4.9.0 nghttp2: upgrade 1.39.2 -> 1.40.0 opensaf: upgrade 5.19.07 -> 5.19.10 wolfssl: upgrade 4.2.0 -> 4.3.0 kea: upgrade 1.7.2 -> 1.7.3 wireshark: upgrade 3.0.7 -> 3.2.0 botan: upgrade 2.11.0 -> 2.13.0 cppzmq: upgrade 4.4.1 -> 4.5.0 iozone3: upgrade 487 -> 488 libmbim: upgrade 1.20.2 -> 1.20.4 libnfc: upgrade to 1.7.1 libsigc++-2.0: upgrade 3.0.0 -> 3.0.2 libuv: upgrade 1.33.1 -> 1.34.0 phoronix-test-suite: upgrade 9.0.1 -> 9.2.1 rabbitmq-c: upgrade 0.9.0 -> 0.10.0 cscope: upgrade 15.8b -> 15.9 msgpack-c: upgrade 3.1.1 -> 3.2.1 gnuplot: upgrade 5.2.2 -> 5.2.8 gphoto2: upgrade 2.5.14 -> 2.5.23 gtkwave: upgrade 3.3.102 -> 3.3.103 haveged: upgrade 1.9.6 -> 1.9.8 libgphoto2: upgrade 2.5.17 -> 2.5.23 libplist: upgrade 2.0.0 -> 2.1.0 ipmiutil: upgrade 3.0.5 -> 3.1.5 libburn: upgrade 1.5.0 -> 1.5.2 libdvdread: upgrade 6.0.1 -> 6.0.2 libsdl2-image: upgrade 2.0.3 -> 2.0.5 libsdl2-mixer: upgrade 2.0.2 -> 2.0.4 libsdl2-ttf: upgrade 2.0.14 -> 2.0.15 yad: upgrade 4.1 -> 5.0 python3-astor: 0.8 -> 0.8.1 python3-bandit: 1.5.1 -> 1.6.2 python-asn1crypto: 1.2.0 -> 1.3.0 python-bitarray: 1.2.0 -> 1.2.1 python-pyconnman: 0.1.0 -> 0.2.0 William A. Kennington III via Openembedded-devel (1): stunnel: bump to version 5.56 Yi Zhao (4): phpmyadmin: upgrade 4.9.1 -> 4.9.2 tk: upgrade 8.6.9 -> 8.6.10 ntp: restrict NTP mode 6 queries samba: upgrade 4.10.10 -> 4.10.11 Yongxin Liu (1): ndctl: Upgrade to v67 Zang Ruochen (17): python-alembic: upgrade 1.3.1 -> 1.3.2 python-beautifulsoup4: upgrade 4.8.1 -> 4.8.2 python-bitarray: upgrade 1.1.0 -> 1.2.0 python-certifi: upgrade 2019.9.11 -> 2019.11.28 python-cmd2: upgrade 0.9.21 -> 0.9.22 python-engineio: upgrade 3.10.0 -> 3.11.1 python-parse: upgrade 1.12.1 -> 1.14.0 python-passlib: upgrade 1.7.1 -> 1.7.2 python-pexpect: upgrade 4.6.0 -> 4.7.0 python-psutil: upgrade 5.6.5 -> 5.6.7 python-py: upgrade 1.8.0 -> 1.8.1 python-pycryptodome: upgrade 3.9.3 -> 3.9.4 python-pymisp: upgrade 2.4.117.2 -> 2.4.119.1 python-pymongo: upgrade 3.9.0 -> 3.10.0 python-pyparsing: upgrade 2.4.5 -> 2.4.6 python-pyperf: upgrade 1.6.1 -> 1.7.0 python-backports-functools-lru-cache: Add python3 version Zhixiong Chi (1): dnsmasq: CVE-2019-14834 hmenn (1): add sqlite-orm v1.5 madhavank27 (1): Added bb file for libcamera integration sangelovic (1): sdbus-c++: Introduce recipes for sdbus-c++ library and its tools Change-Id: I5e7559de35d61167e234161ffb768f6f95d30f41 Signed-off-by: Brad Bishop --- ...-Do-not-add-stack-pointer-to-clobber-list.patch | 61 ++++++++++++++ ...001-disable-calls-to-getcontext-with-musl.patch | 10 +-- .../0001-lss-Match-syscalls-to-match-musl.patch | 25 ++++-- .../breakpad/breakpad/dont-clobber-rsp.patch | 76 ----------------- .../breakpad/breakpad/mcontext.patch | 59 ------------- .../recipes-devtools/breakpad/breakpad_git.bb | 12 +-- .../meta-oe/recipes-devtools/cloc/cloc_1.84.bb | 19 +++++ .../recipes-devtools/cscope/cscope_15.8b.bb | 24 ------ .../meta-oe/recipes-devtools/cscope/cscope_15.9.bb | 24 ++++++ .../recipes-devtools/doxygen/doxygen_1.8.16.bb | 17 ---- .../recipes-devtools/doxygen/doxygen_1.8.17.bb | 17 ++++ .../flatbuffers/flatbuffers_1.11.0.bb | 4 +- .../recipes-devtools/geany/geany-plugins_1.36.bb | 2 +- .../meta-oe/recipes-devtools/geany/geany_1.36.bb | 2 +- .../recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb | 23 ------ .../recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb | 23 ++++++ .../meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb | 18 ++++ ...sg-fix-array-out-of-bounds-GCC-10-warning.patch | 42 ++++++++++ .../recipes-devtools/libubox/libubox_git.bb | 3 +- ...cplus-version-entry-from-ELF-.comment-sec.patch | 40 --------- .../recipes-devtools/log4cplus/log4cplus_2.0.4.bb | 20 ----- .../recipes-devtools/log4cplus/log4cplus_2.0.5.bb | 19 +++++ ...e-the-struct-pointers-are-null-initilized.patch | 46 +++++++++++ ...0001-hook-Do-not-append-int-to-std-string.patch | 2 +- .../meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 + .../recipes-devtools/luajit/luajit_2.0.5.bb | 4 +- .../recipes-devtools/mercurial/mercurial_5.2.bb | 3 + .../recipes-devtools/msgpack/msgpack-c_3.1.1.bb | 19 ----- .../recipes-devtools/msgpack/msgpack-c_3.2.1.bb | 19 +++++ .../recipes-devtools/nanopb/nanopb_0.4.0.bb | 28 +++++++ .../nlohmann-json/nlohmann-json_3.7.3.bb | 27 ++++++ .../nlohmann-json/nlohmann-json_git.bb | 29 ------- ...0003-Install-both-binaries-and-use-libdir.patch | 96 ++++++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 5 +- .../recipes-devtools/openocd/openocd_git.bb | 3 +- .../recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb | 22 +++++ .../tk/configure.use.fontconfig.with.xft.patch | 13 --- .../recipes-devtools/tcltk/tk/confsearch.diff | 14 ++-- .../meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff | 4 +- .../recipes-devtools/tcltk/tk/non-linux.diff | 27 ------ .../recipes-devtools/tcltk/tk/tklibrary.diff | 22 ----- .../meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb | 93 +++++++++++++++++++++ .../meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb | 96 ---------------------- 43 files changed, 612 insertions(+), 501 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff create mode 100644 meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb (limited to 'meta-openembedded/meta-oe/recipes-devtools') diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch new file mode 100644 index 000000000..6e5849098 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Do-not-add-stack-pointer-to-clobber-list.patch @@ -0,0 +1,61 @@ +From 5c63eb5d56abd4e5232add4727247965a863d851 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 15 Dec 2019 14:02:45 -0800 +Subject: [PATCH] Do not add stack pointer to clobber list + +It was being ignored until now when gcc 9.0 became capable +of flagging these silent ignore via [1]. + +We weren't actually clobbering the stack pointers here +so it should not cause change in behavior. + +[1] https://gcc.gnu.org/PR52813 + +Signed-off-by: Khem Raj +--- + linux_syscall_support.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/linux_syscall_support.h b/linux_syscall_support.h +index 9276f56..6e73309 100644 +--- a/linux_syscall_support.h ++++ b/linux_syscall_support.h +@@ -1955,7 +1955,7 @@ struct kernel_statfs { + LSS_ENTRYPOINT \ + "pop %%ebx" \ + args \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res) + #undef _syscall0 + #define _syscall0(type,name) \ +@@ -2012,7 +2012,7 @@ struct kernel_statfs { + : "i" (__NR_##name), "ri" ((long)(arg1)), \ + "c" ((long)(arg2)), "d" ((long)(arg3)), \ + "S" ((long)(arg4)), "D" ((long)(arg5)) \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res); \ + } + #undef _syscall6 +@@ -2034,7 +2034,7 @@ struct kernel_statfs { + : "i" (__NR_##name), "0" ((long)(&__s)), \ + "c" ((long)(arg2)), "d" ((long)(arg3)), \ + "S" ((long)(arg4)), "D" ((long)(arg5)) \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res); \ + } + LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, +@@ -2120,7 +2120,7 @@ struct kernel_statfs { + : "0"(-EINVAL), "i"(__NR_clone), + "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), + "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) +- : "esp", "memory", "ecx", "edx", "esi", "edi"); ++ : "memory", "ecx", "edx", "esi", "edi"); + LSS_RETURN(int, __res); + } + +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch index bc79727ed..466abe5f8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch @@ -8,11 +8,9 @@ Signed-off-by: Andre McCurdy src/client/linux/handler/exception_handler.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -Index: git/src/client/linux/handler/exception_handler.cc -=================================================================== ---- git.orig/src/client/linux/handler/exception_handler.cc -+++ git/src/client/linux/handler/exception_handler.cc -@@ -495,7 +495,19 @@ bool ExceptionHandler::SimulateSignalDel +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -490,7 +490,19 @@ bool ExceptionHandler::SimulateSignalDel siginfo.si_code = SI_USER; siginfo.si_pid = getpid(); ucontext_t context; @@ -32,7 +30,7 @@ Index: git/src/client/linux/handler/exception_handler.cc return HandleSignal(sig, &siginfo, &context); } -@@ -680,9 +692,14 @@ bool ExceptionHandler::WriteMinidump() { +@@ -675,9 +687,14 @@ bool ExceptionHandler::WriteMinidump() { sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); CrashContext context; diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch index 2b892ad64..bdd787afd 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch @@ -8,11 +8,9 @@ Signed-off-by: Khem Raj linux_syscall_support.h | 3 +++ 1 file changed, 3 insertions(+) -Index: lss/linux_syscall_support.h -=================================================================== ---- lss.orig/linux_syscall_support.h -+++ lss/linux_syscall_support.h -@@ -793,6 +793,9 @@ struct kernel_statfs { +--- a/linux_syscall_support.h ++++ b/linux_syscall_support.h +@@ -816,6 +816,9 @@ struct kernel_statfs { #define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) #endif @@ -22,7 +20,7 @@ Index: lss/linux_syscall_support.h #if defined(__x86_64__) #ifndef ARCH_SET_GS -@@ -924,6 +927,7 @@ struct kernel_statfs { +@@ -947,6 +950,7 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 324 #endif @@ -30,7 +28,7 @@ Index: lss/linux_syscall_support.h /* End of i386 definitions */ #elif defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) #ifndef __NR_setresuid -@@ -1211,6 +1215,12 @@ struct kernel_statfs { +@@ -1239,6 +1243,12 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 285 #endif @@ -43,3 +41,16 @@ Index: lss/linux_syscall_support.h /* End of x86-64 definitions */ #elif defined(__mips__) #if _MIPS_SIM == _MIPS_SIM_ABI32 +@@ -1418,6 +1428,12 @@ struct kernel_statfs { + #ifndef __NR_ioprio_get + #define __NR_ioprio_get (__NR_Linux + 274) + #endif ++ ++#undef __NR_pread ++#define __NR_pread __NR_pread64 ++#undef __NR_pwrite ++#define __NR_pwrite __NR_pwrite64 ++ + /* End of MIPS (64bit API) definitions */ + #else + #ifndef __NR_setresuid diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch deleted file mode 100644 index edf903552..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d1d7b616219fd47736c804ff4c2f393d7184a75b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 23 Dec 2018 16:58:04 -0800 -Subject: [PATCH] chromium: stack pointer clobber - -Do not add stack pointer to clobber list - -it was being ignored until gcc 9.0 became capable -of flagging this silent ignoring via [1] - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813 - -Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] -Signed-off-by: Khem Raj ---- - src/third_party/lss/linux_syscall_support.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -Index: b/src/third_party/lss/linux_syscall_support.h -=================================================================== ---- a/src/third_party/lss/linux_syscall_support.h -+++ b/src/third_party/lss/linux_syscall_support.h -@@ -1957,7 +1957,7 @@ struct kernel_statfs { - LSS_ENTRYPOINT \ - "pop %%ebx" \ - args \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res) - #undef _syscall0 - #define _syscall0(type,name) \ -@@ -1966,7 +1966,7 @@ struct kernel_statfs { - __asm__ volatile(LSS_ENTRYPOINT \ - : "=a" (__res) \ - : "0" (__NR_##name) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - #undef _syscall1 -@@ -2014,7 +2014,7 @@ struct kernel_statfs { - : "i" (__NR_##name), "ri" ((long)(arg1)), \ - "c" ((long)(arg2)), "d" ((long)(arg3)), \ - "S" ((long)(arg4)), "D" ((long)(arg5)) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - #undef _syscall6 -@@ -2036,7 +2036,7 @@ struct kernel_statfs { - : "i" (__NR_##name), "0" ((long)(&__s)), \ - "c" ((long)(arg2)), "d" ((long)(arg3)), \ - "S" ((long)(arg4)), "D" ((long)(arg5)) \ -- : "esp", "memory"); \ -+ : "memory"); \ - LSS_RETURN(type,__res); \ - } - LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, -@@ -2122,7 +2122,7 @@ struct kernel_statfs { - : "0"(-EINVAL), "i"(__NR_clone), - "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), - "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) -- : "esp", "memory", "ecx", "edx", "esi", "edi"); -+ : "memory", "ecx", "edx", "esi", "edi"); - LSS_RETURN(int, __res); - } - -@@ -2407,7 +2407,7 @@ struct kernel_statfs { - "d"(LSS_SYSCALL_ARG(parent_tidptr)), - "r"(LSS_SYSCALL_ARG(newtls)), - "r"(LSS_SYSCALL_ARG(child_tidptr)) -- : "rsp", "memory", "r8", "r10", "r11", "rcx"); -+ : "memory", "r8", "r10", "r11", "rcx"); - } - LSS_RETURN(int, __res); - } diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch index 42e073b94..51393967b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch @@ -3,48 +3,6 @@ map the mcontext_t structure for musl Upstream-Status: Inappropriate[need to consider Android] Signed-off-by: Khem Raj -Index: git/src/client/linux/dump_writer_common/thread_info.cc -=================================================================== ---- git.orig/src/client/linux/dump_writer_common/thread_info.cc -+++ git/src/client/linux/dump_writer_common/thread_info.cc -@@ -229,7 +229,6 @@ void ThreadInfo::FillCPUContext(RawConte - } - - #elif defined(__mips__) -- - uintptr_t ThreadInfo::GetInstructionPointer() const { - return mcontext.pc; - } -@@ -263,8 +262,11 @@ void ThreadInfo::FillCPUContext(RawConte - out->cause = 0; // Not stored in mcontext - - for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) -+#ifdef __GLIBC__ - out->float_save.regs[i] = mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs; -- -+#else -+ out->float_save.regs[i] = mcontext.fpregs[i]; -+#endif - out->float_save.fpcsr = mcontext.fpc_csr; - #if _MIPS_SIM == _ABIO32 - out->float_save.fir = mcontext.fpc_eir; -Index: git/src/client/linux/dump_writer_common/ucontext_reader.cc -=================================================================== ---- git.orig/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ git/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -247,8 +247,11 @@ void UContextReader::FillCPUContext(RawC - out->cause = 0; // Not reported in signal context. - - for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) -+#ifdef __GLIBC__ - out->float_save.regs[i] = uc->uc_mcontext.fpregs.fp_r.fp_dregs[i]; -- -+#else -+ out->float_save.regs[i] = uc->uc_mcontext.fpregs[i]; -+#endif - out->float_save.fpcsr = uc->uc_mcontext.fpc_csr; - #if _MIPS_SIM == _ABIO32 - out->float_save.fir = uc->uc_mcontext.fpc_eir; // Unused. Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc =================================================================== --- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc @@ -58,20 +16,3 @@ Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc for (int i = EF_R0; i <= EF_R31; i++) info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; #else // __ANDROID__ -Index: git/src/tools/linux/md2core/minidump-2-core.cc -=================================================================== ---- git.orig/src/tools/linux/md2core/minidump-2-core.cc -+++ git/src/tools/linux/md2core/minidump-2-core.cc -@@ -516,8 +516,12 @@ ParseThreadRegisters(CrashedProcess::Thr - thread->mcontext.lo3 = rawregs->lo[2]; - - for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) { -+#ifdef __GLIBC__ - thread->mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs = - rawregs->float_save.regs[i]; -+#else -+ thread->mcontext.fpregs[i] = rawregs->float_save.regs[i]; -+#endif - } - - thread->mcontext.fpc_csr = rawregs->float_save.fpcsr; diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 06f3ee87d..ff5acbeac 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -19,11 +19,11 @@ PV = "1.0" SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" -SRCREV_breakpad = "5467393a3d1e7ab929fd01d79971701bf4e2c2c6" -#v1.8.0 -SRCREV_gtest = "ec44c6c1675c25b9827aacd08c02433cccde7780" +SRCREV_breakpad = "0c0e24f709288a129d665ec27d6f089189318385" +#v1.10.0 +SRCREV_gtest = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081" SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" -SRCREV_lss = "a89bf7903f3169e6bc7b8efc10a73a7571de21cf" +SRCREV_lss = "8048ece6c16c91acfe0d36d1d3cc0890ab6e945c" SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" SRC_URI = "git://github.com/google/breakpad;name=breakpad \ @@ -42,7 +42,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \ file://0001-disable-calls-to-getcontext-with-musl.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ - file://dont-clobber-rsp.patch;patchdir=src/third_party/lss;striplevel=4 \ + file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \ " S = "${WORKDIR}/git" @@ -121,3 +121,5 @@ breakpad_populate_sysroot() { #| make: *** [src/client/linux/handler/exception_handler.o] Error 1 ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv4 = "arm" + +TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb new file mode 100644 index 000000000..f9ecd0ee4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb @@ -0,0 +1,19 @@ +SUMMARY = "Count blank lines, comment lines, and physical lines of source code \ +in many programming languages." +AUTHOR = "Al Danial" + +LICENSE="GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" + +SRC_URI = "https://github.com/AlDanial/cloc/releases/download/${PV}/${BP}.tar.gz" +SRC_URI[md5sum] = "a52f3843825377cfa4e4b3b30a567ab4" +SRC_URI[sha256sum] = "c3f0a6bd2319110418ccb3e55a7a1b6d0edfd7528bfd2ae5d530938abe90f254" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -D -m 0755 ${S}/cloc ${D}${bindir}/cloc +} + +RDEPENDS_${PN} = "perl perl-modules" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb b/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb deleted file mode 100644 index 199c31e15..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2015 Igor Santos -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Cscope is a text screen based source browser" -DESCRIPTION = "Cscope is a developer's tool for browsing source code. \ - It has an impeccable Unix pedigree, having been originally \ - developed at Bell Labs back in the days of the PDP-11. \ - Cscope was part of the official AT&T Unix distribution for \ - many years, and has been used to manage projects involving 20 \ - million lines of code!" - -HOMEPAGE = "http://cscope.sourceforge.net/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=d4667b67b483823043fcffa489ea343b" - -inherit autotools - -DEPENDS += "ncurses" - -SRC_URI = "http://downloads.sourceforge.net/project/cscope/cscope/${PV}/${BP}.tar.gz" - -SRC_URI[md5sum] = "8f9409a238ee313a96f9f87fe0f3b176" -SRC_URI[sha256sum] = "4889d091f05aa0845384b1e4965aa31d2b20911fb2c001b2cdcffbcb7212d3af" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.9.bb b/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.9.bb new file mode 100644 index 000000000..99f3ba85d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.9.bb @@ -0,0 +1,24 @@ +# Copyright (C) 2015 Igor Santos +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Cscope is a text screen based source browser" +DESCRIPTION = "Cscope is a developer's tool for browsing source code. \ + It has an impeccable Unix pedigree, having been originally \ + developed at Bell Labs back in the days of the PDP-11. \ + Cscope was part of the official AT&T Unix distribution for \ + many years, and has been used to manage projects involving 20 \ + million lines of code!" + +HOMEPAGE = "http://cscope.sourceforge.net/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d4667b67b483823043fcffa489ea343b" + +inherit autotools + +DEPENDS += "ncurses" + +SRC_URI = "http://downloads.sourceforge.net/project/cscope/cscope/v${PV}/${BP}.tar.gz" + +SRC_URI[md5sum] = "16f3cce078b6c0e42299def4028eea6f" +SRC_URI[sha256sum] = "c5505ae075a871a9cd8d9801859b0ff1c09782075df281c72c23e72115d9f159" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb deleted file mode 100644 index 4df994c75..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." -HOMEPAGE = "http://www.doxygen.org/" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ - file://0001-build-don-t-look-for-Iconv.patch \ -" -SRC_URI[md5sum] = "3ec5f8bfda38a05845161fbbd5d8b439" -SRC_URI[sha256sum] = "ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82" - -inherit cmake python3native - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb new file mode 100644 index 000000000..7a4eee32c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." +HOMEPAGE = "http://www.doxygen.org/" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ + file://0001-build-don-t-look-for-Iconv.patch \ +" +SRC_URI[md5sum] = "7997a15c73a8bd6d003eaba5c2ee2b47" +SRC_URI[sha256sum] = "2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599" + +inherit cmake python3native + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb index bd6dcef4e..529441de1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb @@ -17,8 +17,8 @@ SRC_URI = "git://github.com/google/flatbuffers.git \ " # Make sure C++11 is used, required for example for GCC 4.9 -CXXFLAGS += "-std=c++11" -BUILD_CXXFLAGS += "-std=c++11" +CXXFLAGS += "-std=c++11 -fPIC" +BUILD_CXXFLAGS += "-std=c++11 -fPIC" # BUILD_TYPE=Release is required, otherwise flatc is not installed EXTRA_OECMAKE += "\ diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb index c43d23b34..a6a0b17dd 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb @@ -16,7 +16,7 @@ DEPENDS = " \ geany \ libxml2 \ libsoup-2.4 \ - enchant \ + enchant2 \ intltool-native \ libassuan \ gpgme \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb index 0d29b138a..17e16bf56 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native" -inherit features_check autotools pkgconfig perlnative pythonnative gettext +inherit features_check autotools pkgconfig perlnative gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb deleted file mode 100644 index 97fc6c73b..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "JSON C++ lib used to read and write json file." -DESCRIPTION = "Jsoncpp is an implementation of a JSON (http://json.org) reader \ - and writer in C++. JSON (JavaScript Object Notation) is a \ - lightweight data-interchange format. It is easy for humans to \ - read and write. It is easy for machines to parse and generate." - -HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" - -SRCREV = "ddabf50f72cf369bf652a95c4d9fe31a1865a781" -SRC_URI = "git://github.com/open-source-parsers/jsoncpp" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb new file mode 100644 index 000000000..a88410f2f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "JSON C++ lib used to read and write json file." +DESCRIPTION = "Jsoncpp is an implementation of a JSON (http://json.org) reader \ + and writer in C++. JSON (JavaScript Object Notation) is a \ + lightweight data-interchange format. It is easy for humans to \ + read and write. It is easy for machines to parse and generate." + +HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" + +SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f" +SRC_URI = "git://github.com/open-source-parsers/jsoncpp" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb b/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb new file mode 100644 index 000000000..2a52dd688 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "LDNS is a DNS library that facilitates DNS tool programming" +HOMEPAGE = "https://nlnetlabs.nl/ldns" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34330f15b2b4abbbaaa7623f79a6a019" + +SRC_URI = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${PV}.tar.gz" +SRC_URI[md5sum] = "166262a46995d9972aba417fd091acd5" +SRC_URI[sha256sum] = "8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229" + +DEPENDS = "openssl" + +inherit autotools-brokensep + +PACKAGECONFIG ??= "" +PACKAGECONFIG[drill] = "--with-drill,--without-drill" + +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ + libtool=${TARGET_PREFIX}libtool" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch new file mode 100644 index 000000000..4f1dd7632 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch @@ -0,0 +1,42 @@ +From a12325a0cbf3bf1d66a0b0f8d85e08083bae6066 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0tetiar?= +Date: Wed, 25 Dec 2019 10:27:59 +0100 +Subject: [PATCH] blobmsg: fix array out of bounds GCC 10 warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes following warning reported by GCC 10.0.0 20191203: + + blobmsg.c:234:2: error: 'strcpy' offset 6 from the object at 'attr' is out of the bounds of referenced subobject 'name' with type 'uint8_t[0]' {aka 'unsigned char[0]'} at offset 6 [-Werror=array-bounds] + 234 | strcpy((char *) hdr->name, (const char *)name); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + In file included from blobmsg.c:16: + blobmsg.h:42:10: note: subobject 'name' declared here + 42 | uint8_t name[]; + | ^~~~ + +Upstream-Status: Submitted [https://gitlab.com/ynezz/openwrt-libubox/commit/3775b3aa28de8c20d96b6f02786a327423b0748a] +Reported-by: Khem Raj +Signed-off-by: Petr Štetiar +--- + blobmsg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blobmsg.c b/blobmsg.c +index a860483..b6b7535 100644 +--- a/blobmsg.c ++++ b/blobmsg.c +@@ -195,7 +195,7 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v + attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED); + hdr = blob_data(attr); + hdr->namelen = cpu_to_be16(namelen); +- strcpy((char *) hdr->name, (const char *)name); ++ memcpy(hdr->name, name, namelen); + pad_end = *data = blobmsg_data(attr); + pad_start = (char *) &hdr->name[namelen]; + if (pad_start < pad_end) +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb index f9f4e08b7..7dbefa115 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -16,9 +16,10 @@ SRC_URI = "\ git://git.openwrt.org/project/libubox.git \ file://0001-version-libraries.patch \ file://fix-libdir.patch \ + file://0001-blobmsg-fix-array-out-of-bounds-GCC-10-warning.patch \ " -SRCREV = "155bf39896f126b1ba121b816922a88dc34c31e3" +SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9" PV = "1.0.1+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch b/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch deleted file mode 100644 index 44a835c35..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus/0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch +++ /dev/null @@ -1,40 +0,0 @@ -From da5338e68f146efadab7c221291ba4c949d8f12f Mon Sep 17 00:00:00 2001 -From: Vaclav Haisman -Date: Sun, 21 Jul 2019 23:23:16 -0700 -Subject: [PATCH] Remove log4cplus version entry from ELF .comment section - -Reverts -https://github.com/log4cplus/log4cplus/commit/9cb0d4ade619da4e40628c9b95ff51de3df29f1b - -Upstream-Status: Backport [https://github.com/log4cplus/log4cplus/commit/7e6addc70dffd2e30e902efd18eb845c5d5dd7bb] - -Suggested-by: Adrian Bunk -Signed-off-by: Khem Raj ---- - src/version.cxx | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/src/version.cxx b/src/version.cxx -index ce18212..e002de9 100644 ---- a/src/version.cxx -+++ b/src/version.cxx -@@ -34,16 +34,4 @@ namespace log4cplus - unsigned const version = LOG4CPLUS_VERSION; - char const versionStr[] = LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; - --namespace --{ -- --#if defined (__ELF__) && (defined (__GNUC__) || defined (__clang__)) --char const versionStrComment[] -- __attribute__ ((__used__, __section__ ((".comment")))) -- = "log4cplus " LOG4CPLUS_VERSION_STR LOG4CPLUS_VERSION_STR_SUFFIX; --#endif -- -- --} // namespace -- - } // namespace log4cplus --- -2.22.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb b/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb deleted file mode 100644 index 566de2853..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "log4cplus provides a simple C++ logging API for log management" -SECTION = "libs" -HOMEPAGE = "http://sourceforge.net/projects/log4cplus/" -BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/" - -LICENSE = "Apache-2.0 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ - file://0001-Remove-log4cplus-version-entry-from-ELF-.comment-sec.patch \ - " -SRC_URI[md5sum] = "2b5b7bc294698bf30a315a259ef9eec2" -SRC_URI[sha256sum] = "196eedbc7f2dd792dae721b1159c7ac132255bb368226353c24d4d5fa7c7797a" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" -UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb b/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb new file mode 100644 index 000000000..967ac7623 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_2.0.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "log4cplus provides a simple C++ logging API for log management" +SECTION = "libs" +HOMEPAGE = "http://sourceforge.net/projects/log4cplus/" +BUGTRACKER = "http://sourceforge.net/p/log4cplus/bugs/" + +LICENSE = "Apache-2.0 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \ + " +SRC_URI[md5sum] = "71dd956bf686195127559671f1426cff" +SRC_URI[sha256sum] = "c07115c23219390633798def30b7b51a0f79fdeb857e4b49632f17746d0ceb97" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/" +UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P\d+(\.\d+)+)/" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch new file mode 100644 index 000000000..9def41ca6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch @@ -0,0 +1,46 @@ +From 67a8fa478a4484bc4dbfb3ac74e11be1dd5af594 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 23 Dec 2019 19:35:48 -0800 +Subject: [PATCH] ensure the struct pointers are null initilized + +Do not delete if pointer is already null + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + expr.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/expr.c b/expr.c +index 4059a32..5ffd0ad 100644 +--- a/expr.c ++++ b/expr.c +@@ -189,10 +189,8 @@ int + expr_clone(struct expr_node *retp, const struct expr_node *node) + { + *retp = *node; +- ++ struct expr_node *nlhs = 0, *nrhs = 0; + switch (node->kind) { +- struct expr_node *nlhs; +- struct expr_node *nrhs; + + case EXPR_OP_ARGNO: + case EXPR_OP_SELF: +@@ -236,8 +234,10 @@ expr_clone(struct expr_node *retp, const struct expr_node *node) + if (expr_alloc_and_clone(&nlhs, node->lhs, node->own_lhs) < 0) { + if (node->kind == EXPR_OP_CALL2 + && node->u.call.own_rhs) { +- expr_destroy(nrhs); +- free(nrhs); ++ if (nrhs) { ++ expr_destroy(nrhs); ++ free(nrhs); ++ } + return -1; + } + } +-- +2.24.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch index 8f1c4b9b9..289037382 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch @@ -23,7 +23,7 @@ Signed-off-by: Khem Raj if (sysconfdir != NULL && *sysconfdir != '\0') { /* No +1, we skip the initial period. */ - syspath = malloc(strlen(sysconfdir) + sizeof FN); -+ syspath = malloc(strlen(sysconfdir) + sizeof FN + 1); ++ syspath = malloc(strlen(sysconfdir) + sizeof FN + 2); + syspath[strlen(sysconfdir) + sizeof FN + 1] = '\0'; if (syspath == NULL - || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0) diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index bb21cbca8..6b66c2529 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -28,6 +28,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-hook-Do-not-append-int-to-std-string.patch \ file://include_unistd_nr.patch \ file://0001-Bug-fix-for-data-type-length-judgment.patch \ + file://0001-ensure-the-struct-pointers-are-null-initilized.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb index c2d2180ba..08a0470b0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb @@ -90,7 +90,9 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES_luajit-common = "${datadir}/${BPN}-${PV}" -# Aarch64/mips64 is not supported in this release +# Aarch64/mips64/ppc/ppc64 is not supported in this release COMPATIBLE_HOST_aarch64 = "null" COMPATIBLE_HOST_mipsarchn32 = "null" COMPATIBLE_HOST_mipsarchn64 = "null" +COMPATIBLE_HOST_powerpc = "null" +COMPATIBLE_HOST_powerpc64 = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb index 0fec4d1f1..6dedb02aa 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb @@ -30,6 +30,9 @@ do_install () { oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/hg } +PACKAGES =+ "${PN}-python" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" + diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb deleted file mode 100644 index 90fd44e60..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "MessagePack implementation for C and C++" -DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" -HOMEPAGE = "http://msgpack.org/index.html" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ - file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ - file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ - " - -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/msgpack/msgpack-c \ - " -# cpp-3.1.1 -SRCREV = "83a82e3eb512b18d4149cabb7eb43c7e8bc081af" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb new file mode 100644 index 000000000..d410dc6e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "MessagePack implementation for C and C++" +DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" +HOMEPAGE = "http://msgpack.org/index.html" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ + file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ + file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ + " + +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/msgpack/msgpack-c \ + " +# cpp-3.2.1 +SRCREV = "8085ab8721090a447cf98bb802d1406ad7afe420" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb new file mode 100644 index 000000000..aedd53a7a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION="Protocol Buffers with small code size" +LICENSE="Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" + +DEPENDS = "protobuf-native" + +SRC_URI = "git://github.com/nanopb/nanopb.git" +SRCREV = "70f0de9877b1ce12abc0229d5df84db6349fcbfc" + +S = "${WORKDIR}/git" + +inherit cmake pythonnative + +do_install_append() { + install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py + install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb + install -Dm 0755 ${S}/generator/proto/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/proto/__init__.py +} + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN}-dev += "${libdir}/cmake/${BPN}" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-protobuf \ + protobuf-compiler \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb new file mode 100644 index 000000000..86fe673b4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "JSON for modern C++" +HOMEPAGE = "https://nlohmann.github.io/json/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" + +SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1" + +SRCREV = "e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" + +# nlohmann-json is a header only C++ library, so the main package will be empty. + +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +# other packages commonly reference the file directly as "json.hpp" +# create symlink to allow this usage +do_install_append() { + ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb deleted file mode 100644 index 4399edaab..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "JSON for modern C++" -HOMEPAGE = "https://nlohmann.github.io/json/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" - -SRC_URI = "git://github.com/nlohmann/json.git" - -PV = "3.7.0+git${SRCPV}" - -SRCREV = "ea60d40f4a60a47d3be9560d8f7bc37c163fe47b" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" - -# nlohmann-json is a header only C++ library, so the main package will be empty. - -RDEPENDS_${PN}-dev = "" - -BBCLASSEXTEND = "native nativesdk" - -# other packages commonly reference the file directly as "json.hpp" -# create symlink to allow this usage -do_install_append() { - ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch new file mode 100644 index 000000000..7aa70fec9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch @@ -0,0 +1,96 @@ +From 5bfeffdf4b5de1c60a2ff0d1ddf65db2bb9a1533 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Tue, 19 Mar 2019 23:22:40 -0400 +Subject: [PATCH 3/3] Install both binaries and use libdir. + +This allows us to build with a shared library for other users while +still providing the normal executable. + +Signed-off-by: Elliott Sales de Andrade + +Stolen from [1] + +[1] https://src.fedoraproject.org/rpms/nodejs/raw/master/f/0003-Install-both-binaries-and-use-libdir.patch + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller + +--- + configure.py | 7 +++++++ + tools/install.py | 31 ++++++++++++++----------------- + 2 files changed, 21 insertions(+), 17 deletions(-) + +diff --git a/configure.py b/configure.py +index cfd4207..eb26f7d 100755 +--- a/configure.py ++++ b/configure.py +@@ -552,6 +552,12 @@ parser.add_option('--shared', + help='compile shared library for embedding node in another project. ' + + '(This mode is not officially supported for regular applications)') + ++parser.add_option('--libdir', ++ action='store', ++ dest='libdir', ++ default='lib', ++ help='a directory to install the shared library into') ++ + parser.add_option('--without-v8-platform', + action='store_true', + dest='without_v8_platform', +@@ -1095,6 +1101,7 @@ def configure_node(o): + if options.code_cache_path: + o['variables']['node_code_cache_path'] = options.code_cache_path + o['variables']['node_shared'] = b(options.shared) ++ o['variables']['libdir'] = options.libdir + node_module_version = getmoduleversion.get_version() + + if sys.platform == 'darwin': +diff --git a/tools/install.py b/tools/install.py +index 028c32e..bf443c4 100755 +--- a/tools/install.py ++++ b/tools/install.py +@@ -117,26 +117,23 @@ def subdir_files(path, dest, action): + + def files(action): + is_windows = sys.platform == 'win32' +- output_file = 'node' + output_prefix = 'out/Release/' ++ output_libprefix = output_prefix + +- if 'false' == variables.get('node_shared'): +- if is_windows: +- output_file += '.exe' ++ if is_windows: ++ output_bin = 'node.exe' ++ output_lib = 'node.dll' + else: +- if is_windows: +- output_file += '.dll' +- else: +- output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') +- # GYP will output to lib.target except on OS X, this is hardcoded +- # in its source - see the _InstallableTargetInstallPath function. +- if sys.platform != 'darwin': +- output_prefix += 'lib.target/' +- +- if 'false' == variables.get('node_shared'): +- action([output_prefix + output_file], 'bin/' + output_file) +- else: +- action([output_prefix + output_file], 'lib/' + output_file) ++ output_bin = 'node' ++ output_lib = 'libnode.' + variables.get('shlib_suffix') ++ # GYP will output to lib.target except on OS X, this is hardcoded ++ # in its source - see the _InstallableTargetInstallPath function. ++ if sys.platform != 'darwin': ++ output_libprefix += 'lib.target/' ++ ++ action([output_prefix + output_bin], 'bin/' + output_bin) ++ if 'true' == variables.get('node_shared'): ++ action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) + + if 'true' == variables.get('node_use_dtrace'): + action(['out/Release/node.d'], 'lib/dtrace/node.d') +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index e36995c25..71a47636b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -17,12 +17,13 @@ COMPATIBLE_HOST_riscv32 = "null" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0003-Install-both-binaries-and-use-libdir.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ file://0007-v8-don-t-override-ARM-CFLAGS.patch \ " SRC_URI_append_class-target = " \ - file://0005-Link-atomic-library.patch \ file://0002-Using-native-torque.patch \ + file://0005-Link-atomic-library.patch \ " SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3" @@ -57,6 +58,7 @@ PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[shared] = "--shared" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" # We don't want to cross-compile during target compile, @@ -99,6 +101,7 @@ do_configure () { ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ + --libdir=${D}${libdir} \ ${ARCHFLAGS} \ ${PACKAGECONFIG_CONFARGS} } diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 9ec77fdc4..e95f1cfa5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -53,4 +53,5 @@ FILES_${PN} = " \ " PACKAGECONFIG[sysfsgpio] = "--enable-sysfsgpio,--disable-sysfsgpio" -PACKAGECONFIG ??= "sysfsgpio" +PACKAGECONFIG[remote-bitbang] = "--enable-remote-bitbang,--disable-remote-bitbang" +PACKAGECONFIG ??= "sysfsgpio remote-bitbang" diff --git a/meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb b/meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb new file mode 100644 index 000000000..4a27e4b2a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "SQLite ORM light header only library for modern C++" +HOMEPAGE = "https://github.com/fnc12/sqlite_orm" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5bf5ee8bb16d8e19359efe11bdc3f2" + +inherit cmake + +DEPENDS += "sqlite3" + +SRCREV = "e8a9e9416f421303f4b8970caab26dadf8bae98b" +SRC_URI = "git://github.com/fnc12/sqlite_orm;protocol=https" +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += "-DSqliteOrm_BuildTests=OFF" + +BBCLASSEXTEND = "native nativesdk" + +FILES_${PN}-dev += "${libdir}/cmake/${BPN}" + +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" \ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch deleted file mode 100644 index a0c157f5a..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.in.orig 2014-05-10 14:35:39.859147385 +0000 -+++ b/configure.in 2014-05-10 14:36:20.282925184 +0000 -@@ -554,8 +554,8 @@ - dnl make sure package configurator (xft-config or pkg-config - dnl says that xft is present. - found_xft=yes -- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" -- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" -+ XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" -+ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" - AC_MSG_RESULT([$found_xft]) - dnl make sure that compiling against Xft header file doesn't bomb - if test "$found_xft" = "yes" ; then diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index 8cc07bcfa..229acf3e7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff @@ -16,31 +16,31 @@ Index: a/unix/configure =================================================================== --- a/unix/configure.orig +++ b/unix/configure -@@ -1432,6 +1432,7 @@ echo "$as_me: error: ${with_tclconfig} d +@@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ + `ls -d /usr/lib/tcl8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ Index: a/unix/tcl.m4 =================================================================== --- a/unix/tcl.m4.orig +++ b/unix/tcl.m4 -@@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ +@@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ + `ls -d /usr/lib/tcl8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ -@@ -227,6 +228,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ +@@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ -+ `ls -d /usr/share/tcltk/tk8.6 2>/dev/null` \ ++ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ + `ls -d /usr/lib/tk8.6 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ - `ls -d /usr/local/lib/tk8.6 2>/dev/null` \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff index d1bb7105c..4aa5d6b89 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff +++ b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff @@ -8,8 +8,8 @@ - XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" - if test "$found_xft" = "no" ; then found_xft=yes - XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" - XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" + XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" + XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" - fi AC_MSG_RESULT([$found_xft]) dnl make sure that compiling against Xft header file doesn't bomb diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff deleted file mode 100644 index 7d31f9fdc..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff +++ /dev/null @@ -1,27 +0,0 @@ -Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes -building on non-linux Debian architectures. - ---- tk8.5-8.5.8.orig/unix/configure -+++ tk8.5-8.5.8/unix/configure -@@ -4447,6 +4447,9 @@ - if test "`uname -s`" = "AIX" ; then - tcl_cv_sys_version=AIX-`uname -v`.`uname -r` - fi -+ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then -+ tcl_cv_sys_version=NetBSD-Debian -+ fi - fi - fi - ---- tk8.5-8.5.8.orig/unix/tcl.m4 -+++ tk8.5-8.5.8/unix/tcl.m4 -@@ -962,6 +962,9 @@ - if test "`uname -s`" = "AIX" ; then - tcl_cv_sys_version=AIX-`uname -v`.`uname -r` - fi -+ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then -+ tcl_cv_sys_version=NetBSD-Debian -+ fi - fi - fi - ]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff deleted file mode 100644 index ee38c2a1a..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- tk8.5-8.5.8.orig/unix/configure -+++ tk8.5-8.5.8/unix/configure -@@ -11070,7 +11070,7 @@ - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" - fi - --TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' -+test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' - PRIVATE_INCLUDE_DIR='$(includedir)' - HTML_DIR='$(DISTDIR)/html' - TK_PKG_DIR='tk$(VERSION)' ---- tk8.5-8.5.8.orig/unix/configure.in -+++ tk8.5-8.5.8/unix/configure.in -@@ -607,7 +607,7 @@ - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" - fi - --TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' -+test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' - PRIVATE_INCLUDE_DIR='$(includedir)' - HTML_DIR='$(DISTDIR)/html' - TK_PKG_DIR='tk$(VERSION)' diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb new file mode 100644 index 000000000..b564e1260 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb @@ -0,0 +1,93 @@ +SUMMARY = "Tool Command Language ToolKit Extension" +HOMEPAGE = "http://tcl.sourceforge.net" +SECTION = "devel/tcltk" + +# http://www.tcl.tk/software/tcltk/license.html +LICENSE = "tcl" +LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ + file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ +" + +DEPENDS = "tcl virtual/libx11 libxt" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ + file://confsearch.diff;striplevel=2 \ + file://tkprivate.diff;striplevel=2 \ + file://fix-xft.diff \ +" +SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" +SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" + +S = "${WORKDIR}/${BPN}${PV}/unix" + +# Short version format: "8.6" +VER = "${@os.path.splitext(d.getVar('PV'))[0]}" + +LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" +inherit autotools features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = "\ + --enable-threads \ + --with-x \ + --with-tcl=${STAGING_BINDIR}/crossscripts \ + --libdir=${libdir} \ +" +export TK_LIBRARY='${libdir}/tk${VER}' +do_install_append() { + ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 + oe_libinstall -so libtk${VER} ${D}${libdir} + ln -sf wish${VER} ${D}${bindir}/wish + + sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh + sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh + install -d ${D}${bindir_crossscripts} + install -m 0755 tkConfig.sh ${D}${bindir_crossscripts} +} + +PACKAGECONFIG ??= "xft" +PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" +PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" + +PACKAGES =+ "${PN}-lib" + +FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" +FILES_${PN} += "${libdir}/tk*" + +# isn't getting picked up by shlibs code +RDEPENDS_${PN} += "tk-lib" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native nativesdk" + +# Fix the path in sstate +SSTATE_SCAN_FILES += "*Config.sh" + +inherit binconfig + +SYSROOT_DIRS += "${bindir_crossscripts}" + +# Fix some paths that might be used by Tcl extensions +BINCONFIG_GLOB = "*Config.sh" + +# Cleanup host path from ${libdir}/tclConfig.sh and remove the +# ${bindir_crossscripts}/tclConfig.sh from target +PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" +tcl_package_preprocess() { + sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ + -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ + -e "s;${STAGING_INCDIR};${includedir};g" \ + -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ + ${PKGD}${libdir}/tkConfig.sh + + rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb deleted file mode 100644 index 3d7767074..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY = "Tool Command Language ToolKit Extension" -HOMEPAGE = "http://tcl.sourceforge.net" -SECTION = "devel/tcltk" - -# http://www.tcl.tk/software/tcltk/license.html -LICENSE = "tcl" -LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ - file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ -" - -DEPENDS = "tcl virtual/libx11 libxt" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ - file://confsearch.diff;striplevel=2 \ - file://non-linux.diff;striplevel=2 \ - file://tklibrary.diff;striplevel=2 \ - file://tkprivate.diff;striplevel=2 \ - file://fix-xft.diff \ - file://configure.use.fontconfig.with.xft.patch \ -" -SRC_URI[md5sum] = "e3cf6290999ee30651d75864eccfec63" -SRC_URI[sha256sum] = "d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac" - -S = "${WORKDIR}/${BPN}${PV}/unix" - -# Short version format: "8.6" -VER = "${@os.path.splitext(d.getVar('PV'))[0]}" - -LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = "\ - --enable-threads \ - --with-x \ - --with-tcl=${STAGING_BINDIR}/crossscripts \ - --libdir=${libdir} \ -" -export TK_LIBRARY='${libdir}/tk${VER}' -do_install_append() { - ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 - oe_libinstall -so libtk${VER} ${D}${libdir} - ln -sf wish${VER} ${D}${bindir}/wish - - sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh - sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tkConfig.sh - install -d ${D}${bindir_crossscripts} - install -m 0755 tkConfig.sh ${D}${bindir_crossscripts} -} - -PACKAGECONFIG ??= "xft" -PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" -PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" - -PACKAGES =+ "${PN}-lib" - -FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" -FILES_${PN} += "${libdir}/tk*" - -# isn't getting picked up by shlibs code -RDEPENDS_${PN} += "tk-lib" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native nativesdk" - -# Fix the path in sstate -SSTATE_SCAN_FILES += "*Config.sh" - -inherit binconfig - -SYSROOT_DIRS += "${bindir_crossscripts}" - -# Fix some paths that might be used by Tcl extensions -BINCONFIG_GLOB = "*Config.sh" - -# Cleanup host path from ${libdir}/tclConfig.sh and remove the -# ${bindir_crossscripts}/tclConfig.sh from target -PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" -tcl_package_preprocess() { - sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ - -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ - -e "s;${STAGING_INCDIR};${includedir};g" \ - -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ - ${PKGD}${libdir}/tkConfig.sh - - rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh -} -- cgit v1.2.3