From ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Apr 2017 11:04:51 +0200 Subject: recipes: remove blacklisted recipes * as PNBLACKLIST message says, these recipes are blacklisted for long time and nobody showed any interest to fix them * remove all unused .patch and .inc files as well Signed-off-by: Martin Jansa --- .../obsolete_automake_macros.patch | 14 - meta-oe/recipes-connectivity/bluez/bluez4.inc | 47 ---- .../recipes-connectivity/gnokii/gnokii_0.6.31.bb | 36 --- .../recipes-connectivity/soft66/files/fix-ar.patch | 13 - meta-oe/recipes-connectivity/soft66/soft66_git.bb | 20 -- .../telepathy/libtelepathy/doublefix.patch | 18 -- .../telepathy/libtelepathy/prefer_python_2.5.patch | 15 -- .../telepathy/libtelepathy_0.3.3.bb | 26 -- .../tmc-Makefile-fix-race.patch | 76 ------ .../telepathy/telepathy-mission-control_5.16.1.bb | 53 ---- .../0002-Modify-Makefile-for-cross-compile.patch | 292 --------------------- .../zeroc-ice/zeroc-ice_3.5.1.bb | 87 ------ 12 files changed, 697 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch delete mode 100644 meta-oe/recipes-connectivity/bluez/bluez4.inc delete mode 100644 meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb delete mode 100644 meta-oe/recipes-connectivity/soft66/files/fix-ar.patch delete mode 100644 meta-oe/recipes-connectivity/soft66/soft66_git.bb delete mode 100644 meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch delete mode 100644 meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch delete mode 100644 meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb delete mode 100644 meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch delete mode 100644 meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb (limited to 'meta-oe/recipes-connectivity') diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch deleted file mode 100644 index 0c77f1a20d..0000000000 --- a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending [package obsolete/not maintained by upstream] - -Signed-off-by: Marko Lindqvist -diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac ---- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200 -+++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200 -@@ -2,7 +2,7 @@ - AC_INIT(bluez-hcidump, 2.5) - - AM_INIT_AUTOMAKE([foreign subdir-objects]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/meta-oe/recipes-connectivity/bluez/bluez4.inc b/meta-oe/recipes-connectivity/bluez/bluez4.inc deleted file mode 100644 index 5240ccfd8b..0000000000 --- a/meta-oe/recipes-connectivity/bluez/bluez4.inc +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Linux Bluetooth Stack Userland V4" -DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries." -HOMEPAGE = "http://www.bluez.org" -SECTION = "libs" -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ - file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ - file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" - -DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1" -RDEPENDS_${PN}-dev = "bluez-hcidump" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pie systemd', d)}" -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" -PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," -PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" - -ASNEEDED = "" - -SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz" -S = "${WORKDIR}/bluez-${PV}" - -inherit autotools-brokensep pkgconfig systemd - -EXTRA_OECONF = "\ - --disable-gstreamer \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-dfutool \ - --disable-hidd \ - --disable-pand \ - --disable-dund \ - --disable-cups \ - --enable-test \ - --enable-datafiles \ - --with-udevdir=`pkg-config --variable=udevdir udev` \ - --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \ -" - -EXCLUDE_FROM_WORLD = "1" diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb deleted file mode 100644 index b6098d84a8..0000000000 --- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Cellphone tools and driver software" -SECTION = "console/network" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2" - -DEPENDS = "glib-2.0 intltool-native" -X11DEPENDS = " libxpm gtk+" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" -PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" -PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0" -PACKAGECONFIG[x11] = ",--without-x,${X11DEPENDS}" - -inherit autotools pkgconfig - -PACKAGES += "libgnokii libgnokii-dev" - -EXTRA_OECONF = "--disable-smsd" - -FILES_${PN} = "${bindir} ${sbindir}" -FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ - /lib/*.a /lib/*.o ${datadir}/aclocal \ -" -FILES_${PN}-dev = "" -FILES_libgnokii = "${libdir}/libgnokii.so.*" - -SRC_URI[md5sum] = "d9627f4a1152d3ea7806df4532850d5f" -SRC_URI[sha256sum] = "8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501" - -PNBLACKLIST[gnokii] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130662/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-oe/recipes-connectivity/soft66/files/fix-ar.patch b/meta-oe/recipes-connectivity/soft66/files/fix-ar.patch deleted file mode 100644 index bf1ffdfc6f..0000000000 --- a/meta-oe/recipes-connectivity/soft66/files/fix-ar.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - ---- git.orig/configure.ac -+++ git/configure.ac -@@ -7,5 +7,6 @@ AC_PROG_CC - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile]) - PKG_CHECK_MODULES([FTDI], [libftdi >= 0.13]) - AC_OUTPUT - AM_PROG_CC_C_O -+AM_PROG_AR diff --git a/meta-oe/recipes-connectivity/soft66/soft66_git.bb b/meta-oe/recipes-connectivity/soft66/soft66_git.bb deleted file mode 100644 index 816f58350a..0000000000 --- a/meta-oe/recipes-connectivity/soft66/soft66_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Library and tools for Soft66ADD and related SDR radio receivers" -LICENSE = "GPLv3 & LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 " - -PNBLACKLIST[soft66] ?= "BROKEN: depends on broken libftdi - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -DEPENDS = "libftdi" - -PV = "0.1.3+gitr${SRCPV}" -PR = "r1" - -SRCREV = "a1dab25e73896c90c98227ac8055f227b830d512" -SRC_URI = "git://home.horsten.com/soft66 \ -file://fix-ar.patch" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - diff --git a/meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch b/meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch deleted file mode 100644 index a7737fbf03..0000000000 --- a/meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix double reference to this file to work with recent autoconf+automake - -RP 1/2/10 - -Upstream-Status: Inappropriate [configuration] - -Index: libtelepathy-0.3.3/src/Makefile.am -=================================================================== ---- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000 -+++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000 -@@ -27,7 +27,6 @@ - tp-chan-type-text-gen.h \ - tp-chan-type-tubes-gen.h \ - tp-conn-iface-aliasing-gen.h \ -- tp-conn-iface-avatars-gen.h \ - tp-conn-iface-capabilities-gen.h \ - tp-conn-iface-contact-info-gen.h \ - tp-conn-iface-forwarding-gen.h \ diff --git a/meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch b/meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch deleted file mode 100644 index 37679ab761..0000000000 --- a/meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: libtelepathy-0.3.1/configure.ac -=================================================================== ---- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000 -+++ libtelepathy-0.3.1/configure.ac 2008-01-04 12:07:28.000000000 +0000 -@@ -51,7 +51,7 @@ - AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) - fi - --AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) -+AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python]) - if test -z "$PYTHON"; then - AC_MSG_ERROR([Python is required to compile this package]) - fi diff --git a/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb b/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb deleted file mode 100644 index 783bd5d73e..0000000000 --- a/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Telepathy framework" -DESCRIPTION = "Telepathy is a D-Bus framework for unifying real time \ -communication, including instant messaging, voice calls and video calls. It \ -abstracts differences between protocols to provide a unified interface for \ -applications." -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib libxslt-native" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://src/tp-conn.c;beginline=1;endline=19;md5=4c58069f77d601cc59200bce5396c7cb" -PR = "r5" - -SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ - file://prefer_python_2.5.patch \ - file://doublefix.patch \ -" - -SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370" -SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878" - -inherit autotools pkgconfig pythonnative - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" - -PNBLACKLIST[libtelepathy] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130609/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch deleted file mode 100644 index ece1da6bc3..0000000000 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Robert Yang -Date: Sun, 22 Sep 2013 23:21:01 -0400 -Subject: [PATCH] src/Makefile.am: fix race issue for _gen/gtypes.h and _gen/gtypes-body.h - -There might be an error when parallel build: - -[snip] -Traceback (most recent call last): - File "/path/to/tools/glib-gtypes-generator.py", line 304, in - GTypesGenerator(dom, argv[1], argv[2])() - File "/path/to/tools/glib-gtypes-generator.py", line 295, in __call__ - file_set_contents(self.output + '.h', ''.join(self.header)) - File "/path/to/tools/libtpcodegen.py", line 42, in file_set_contents - os.rename(filename + '.tmp', filename) -OSError: [Errno 2] No such file or directory -[snip] - -This is a race issue, the _gen/gtypes.h and _gen/gtypes-body.h may -write(remove/rename) _gen/gtypes.tmp at the same time, then there would -be the error. - -There was a similar bug in telepathy-glib which was already fixed, we use the -similar patch to fix it. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang ---- - src/Makefile.am | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -288,7 +288,11 @@ _gen/interfaces-body.h: _gen/mcd.xml \ - $(tools_dir)/glib-interfaces-body-generator.xsl \ - $< > $@ - --_gen/gtypes.h _gen/gtypes-body.h: _gen/mcd.xml \ -+# do nothing, output as a side-effect -+_gen/gtypes.h: _gen/gtypes-body.h -+ @: -+ -+_gen/gtypes-body.h: _gen/mcd.xml \ - $(top_srcdir)/tools/glib-gtypes-generator.py - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ - $< _gen/gtypes mc -@@ -309,7 +313,11 @@ _gen/%.xml: %.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \ - $< > $@ - --_gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \ -+# do nothing, output as a side-effect -+_gen/cli-%.h: _gen/cli-%-body.h -+ @: -+ -+_gen/cli-%-body.h: _gen/%.xml \ - $(tools_dir)/glib-client-gen.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ - --group=`echo $* | tr x- x_` \ -@@ -317,7 +325,11 @@ _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \ - --tp-proxy-api=0.7.6 \ - $< Mc_Cli _gen/cli-$* - --_gen/svc-%.c _gen/svc-%.h: _gen/%.xml \ -+# do nothing, output as a side-effect -+_gen/svc-%.h: _gen/svc-%.c -+ @: -+ -+_gen/svc-%.c: _gen/%.xml \ - $(tools_dir)/glib-ginterface-gen.py Makefile.am - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ - --filename=_gen/svc-$* \ --- -1.7.10.4 - diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb deleted file mode 100644 index 6a4d5d0069..0000000000 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Central control for Telepathy IM connection managers" -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/Mission_Control/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ - file://src/request.h;beginline=1;endline=21;md5=f80534d9af1c33291b3b79609f196eb2" -SECTION = "libs" -DEPENDS = "libtelepathy dbus-glib gconf libxslt-native" - -SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-mission-control/${BP}.tar.gz \ - file://tmc-Makefile-fix-race.patch \ - " -SRC_URI[md5sum] = "421115a35b9e427807326877f86e7f43" -SRC_URI[sha256sum] = "14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723" - -inherit autotools-brokensep pkgconfig pythonnative - -PACKAGECONFIG ??= "" -PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower" - -# to select connman or nm you need to use "connectivity" and "connman" or "nm", default is to disable both -PACKAGECONFIG[connectivity] = ",--with-connectivity=no" -PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman" -PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager" - -PACKAGES =+ " \ - libmissioncontrol \ - libmissioncontrol-config \ - libmissioncontrol-server \ - libmissioncontrol-dev \ - libmissioncontrol-config-dev \ - libmissioncontrol-server-dev \ - libmissioncontrol-dbg \ - libmissioncontrol-config-dbg \ - libmissioncontrol-server-dbg \ -" - -FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas" - -FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*" -FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*" -FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*" - -FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \ - ${includedir}/libmissioncontrol/ \ - ${libdir}/pkgconfig/libmissioncontrol.pc" -FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*" -FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*" - -FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*" -FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*" -FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*" - -PNBLACKLIST[telepathy-mission-control] ?= "Depends on blacklisted libtelepathy - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch b/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch deleted file mode 100644 index 43096d2bce..0000000000 --- a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch +++ /dev/null @@ -1,292 +0,0 @@ -Upstream-Status: Inappropriate - -This patch lets you build Ice with OpenEmbedded. I doubt you could do -a regular build after applying this patch. - -From bc622ce74fa03a935278d21736a5a251466e1798 Mon Sep 17 00:00:00 2001 -From: Tom Rondeau -Date: Wed, 16 Apr 2014 14:34:51 -0400 -Subject: [PATCH] Modify Makefiles for cross compile - ---- - config/Make.common.rules | 20 +++++++------ - cpp/Makefile | 9 +++--- - cpp/config/Make.rules | 32 ++++++++++++-------- - cpp/config/Make.rules.Linux | 18 ++--------- - cpp/src/IceStorm/FreezeDB/Makefile | 2 +- - py/config/Make.rules | 58 +++++++++++++++++++----------------- - 6 files changed, 70 insertions(+), 69 deletions(-) - -diff --git a/config/Make.common.rules b/config/Make.common.rules -index d7b1d59..a3fb17e 100644 ---- a/config/Make.common.rules -+++ b/config/Make.common.rules -@@ -65,9 +65,9 @@ ifeq ($(UNAME),Linux) - # - # Some Linux distributions like Debian/Ubuntu don't use /usr/lib64. - # -- ifeq ($(shell test -d /usr/lib64 && echo 0),0) -- lp64suffix = 64 -- endif -+ #ifeq ($(shell test -d /usr/lib64 && echo 0),0) -+ # lp64suffix = 64 -+ #endif - ifeq ($(LP64),) - LP64 = yes - endif -@@ -244,12 +244,13 @@ else - slicedir = $(ice_dir)/slice - endif - --ifeq ($(prefix), /usr) -- install_slicedir = /usr/share/Ice-$(VERSION)/slice --else -- install_slicedir = $(prefix)/slice --endif -+#ifeq ($(prefix), /usr) -+# install_slicedir = /usr/share/Ice-$(VERSION)/slice -+#else -+# install_slicedir = $(prefix)/slice -+#endif - -+install_slicedir = $(prefix)/slice - # - # Set environment variables for the Slice translator. - # -@@ -265,7 +266,8 @@ ifneq ($(ice_dir), /usr) - endif - - ifeq ($(UNAME),Linux) -- export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) -+ #export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH) -+ export LD_LIBRARY_PATH := $(ICE_HOME)/lib:$(LD_LIBRARY_PATH) - endif - - ifeq ($(UNAME),SunOS) -diff --git a/cpp/Makefile b/cpp/Makefile -index a68f113..1f44f57 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -11,11 +11,12 @@ top_srcdir = . - - include $(top_srcdir)/config/Make.rules - --SUBDIRS = config src include test -+#SUBDIRS = config src include test -+SUBDIRS = config src include - --ifeq ($(shell uname | grep MINGW),) --SUBDIRS := $(SUBDIRS) demo --endif -+#ifeq ($(shell uname | grep MINGW),) -+#SUBDIRS := $(SUBDIRS) demo -+#endif - - INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) \ - $(install_configdir) $(install_mandir) -diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules -index 37461ae..197c5e8 100644 ---- a/cpp/config/Make.rules -+++ b/cpp/config/Make.rules -@@ -175,11 +175,12 @@ headerdir = $(top_srcdir)/include - # includedir is not handled the same as bindir and libdir - # because it is used in the .depend files - # --ifdef ice_src_dist -- includedir = $(top_srcdir)/include --else -- includedir = $(ice_dir)/include --endif -+#ifdef ice_src_dist -+# includedir = $(top_srcdir)/include -+#else -+# includedir = $(ice_dir)/include -+#endif -+includedir = $(top_srcdir)/include - - # - # Platform specific definitions -@@ -277,14 +278,17 @@ ICECPPFLAGS = -I$(slicedir) - SLICE2CPPFLAGS = $(ICECPPFLAGS) - - ifeq ($(ice_dir), /usr) -- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -+ LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) - else - CPPFLAGS += -I$(includedir) -- ifdef ice_src_dist -- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) -- else -- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix) -- endif -+# We must always build using the libraries in the source tree, the host's are obviously -+# not what we want for the target -+ LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) $(call rpathlink,$(libdir)) -+# ifdef ice_src_dist -+# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) -+# else -+# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix) -+# endif - endif - - ifeq ($(FLEX_NOLINE),yes) -@@ -313,8 +317,10 @@ endif - - ifdef ice_src_dist - SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION)) -- SLICE2CPP = $(bindir)/slice2cpp -- SLICE2FREEZE = $(bindir)/slice2freeze -+# SLICE2CPP = $(bindir)/slice2cpp -+# SLICE2FREEZE = $(bindir)/slice2freeze -+ SLICE2CPP = $(ICE_HOME)/bin/slice2cpp -+ SLICE2FREEZE = $(ICE_HOME)/bin/slice2freeze - else - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)$(cpp11suffix)/$(call mklibfilename,Slice,$(VERSION)) - SLICE2CPP = $(ice_dir)/$(binsubdir)$(cpp11suffix)/slice2cpp -diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux -index 5d5717c..8363c6e 100644 ---- a/cpp/config/Make.rules.Linux -+++ b/cpp/config/Make.rules.Linux -@@ -31,7 +31,7 @@ ifeq ($(CXX),c++) - CXX = g++ - endif - --ifeq ($(CXX),g++) -+#ifeq ($(CXX),g++) - - ifneq ($(SUSE_i586),) - CXXARCHFLAGS += -march=i586 -@@ -71,14 +71,6 @@ ifeq ($(CXX),g++) - CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED - endif - -- ifeq ($(MACHINE),x86_64) -- ifeq ($(LP64),yes) -- CXXARCHFLAGS += -m64 -- else -- CXXARCHFLAGS += -m32 -- endif -- endif -- - CXXFLAGS = $(CXXARCHFLAGS) -Wall -Werror -pthread - - ifneq ($(GENPIC),no) -@@ -102,15 +94,11 @@ ifeq ($(CXX),g++) - - rpathlink = -Wl,-rpath-link,$(1) - -- ifneq ($(embedded_runpath_prefix),) -- LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,$(runpath_libdir) -- else -- LDPLATFORMFLAGS = -Wl,--enable-new-dtags -- endif -+ LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,../../../lib - - LDPLATFORMFLAGS += -rdynamic - --endif -+#endif - - ifeq ($(CXX),icpc) - $(warning ===================================================================) -diff --git a/cpp/src/IceStorm/FreezeDB/Makefile b/cpp/src/IceStorm/FreezeDB/Makefile -index 7c844b7..cf15cb1 100644 ---- a/cpp/src/IceStorm/FreezeDB/Makefile -+++ b/cpp/src/IceStorm/FreezeDB/Makefile -@@ -66,7 +66,7 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) - - $(MIGRATE): $(MOBJS) - rm -f $@ -- $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS) -+ $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS) -ldb_cxx - - # The slice2freeze rules are structured like this to avoid issues with - # parallel make. -diff --git a/py/config/Make.rules b/py/config/Make.rules -index 43ce01b..1349342 100644 ---- a/py/config/Make.rules -+++ b/py/config/Make.rules -@@ -92,21 +92,23 @@ ifeq ($(shell test -f $(top_srcdir)/config/Make.rules.$(UNAME) && echo 0),0) - include $(top_srcdir)/config/Make.rules.$(UNAME) - else - include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME) --endif -+endif - - libdir = $(top_srcdir)/python --ifneq ($(prefix), /usr) --install_pythondir = $(prefix)/python --install_libdir = $(prefix)/python --else -- ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0) -- install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages -- install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages -- else -- install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages -- install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages -- endif --endif -+#ifneq ($(prefix), /usr) -+#install_pythondir = $(prefix)/python -+#install_libdir = $(prefix)/python -+#else -+# ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0) -+# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages -+# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages -+# else -+# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages -+# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages -+# endif -+#endif -+install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages -+install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages - - ifeq ($(UNAME),SunOS) - ifeq ($(LP64),yes) -@@ -115,19 +117,21 @@ ifeq ($(UNAME),SunOS) - endif - endif - --ifdef ice_src_dist -- ifeq ($(ice_cpp_dir), $(ice_dir)/cpp) -- ICE_LIB_DIR = -L$(ice_cpp_dir)/lib -- else -- ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) -- endif -- ICE_LIB_DIR = -L$(ice_cpp_dir)/lib -- ICE_FLAGS = -I$(ice_cpp_dir)/include --endif --ifdef ice_bin_dist -- ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) -- ICE_FLAGS = -I$(ice_dir)/include --endif -+#ifdef ice_src_dist -+# ifeq ($(ice_cpp_dir), $(ice_dir)/cpp) -+# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib -+# else -+# ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) -+# endif -+# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib -+# ICE_FLAGS = -I$(ice_cpp_dir)/include -+#endif -+#ifdef ice_bin_dist -+# ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) -+# ICE_FLAGS = -I$(ice_dir)/include -+#endif -+ICE_LIB_DIR = -L$(top_srcdir)/../cpp/lib -+ICE_FLAGS = -I$(ice_cpp_dir)/include - ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil - - ifneq ($(embedded_runpath_prefix),) -@@ -137,7 +141,7 @@ endif - CPPFLAGS = - ICECPPFLAGS = -I$(slicedir) - SLICE2PYFLAGS = $(ICECPPFLAGS) --LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) -+LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) - - ifdef ice_src_dist - ifeq ($(ice_cpp_dir), $(ice_dir)/cpp) --- -1.7.9.5 - diff --git a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb b/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb deleted file mode 100644 index 7c833b0eb6..0000000000 --- a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb +++ /dev/null @@ -1,87 +0,0 @@ -DESCRIPTION = "The Internet Communications Engine" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://ICE_LICENSE;md5=3dc3037023cc2ae6b2c5b995da529515" -DEPENDS = "bzip2 expat openssl python db mcpp" -DEPENDS_prepend_class-target = "zeroc-ice-native " - -SRC_URI = "http://www.zeroc.com/download/Ice/3.5/Ice-${PV}.tar.gz \ - file://0002-Modify-Makefile-for-cross-compile.patch \ - " -SRC_URI[md5sum] = "f00c59983cc904bca977133c0a9b3e80" -SRC_URI[sha256sum] = "989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392" - -#| MapDb.cpp: In constructor 'Freeze::MapDb::MapDb(const ConnectionIPtr&, const string&, const string&, const string&, const KeyCompareBasePtr&, const std::vector >&, bool)': -#| MapDb.cpp:138:46: error: call of overloaded 'set_bt_compare(int (*)(DB*, const DBT*, const DBT*))' is ambiguous -#| MapDb.cpp:138:46: note: candidates are: -#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:272:14: note: virtual int Db::set_bt_compare(bt_compare_fcn_type) -#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:272:14: note: no known conversion for argument 1 from 'int (*)(DB*, const DBT*, const DBT*) {aka int (*)(__db*, const __db_dbt*, const __db_dbt*)}' to 'bt_compare_fcn_type {aka int (*)(__db*, const __db_dbt*, const __db_dbt*, long unsigned int*)}' -#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note: virtual int Db::set_bt_compare(int (*)(Db*, const Dbt*, const Dbt*, size_t*)) -#| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/db_cxx.h:273:14: note: no known conversion for argument 1 from 'int (*)(DB*, const DBT*, const DBT*) {aka int (*)(__db*, const __db_dbt*, const __db_dbt*)}' to 'int (*)(Db*, const Dbt*, const Dbt*, size_t*) {aka int (*)(Db*, const Dbt*, const Dbt*, long unsigned int*)}' -#| make[3]: *** [MapDb.o] Error 1 -PNBLACKLIST[zeroc-ice] ?= "BROKEN: not compatible with default db version - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -S = "${WORKDIR}/Ice-${PV}" - -inherit python-dir pkgconfig - -export PYTHON_VERSION = "python2.7" - -do_configure() { - : -} - -do_compile_prepend_class-target () { - export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" - export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" - export ICE_HOME="${STAGING_DIR_NATIVE}/usr" -} - -do_compile_prepend_class-nativesdk () { - export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" - export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" - export ICE_HOME="${STAGING_DIR_NATIVE}/usr" -} - -do_compile_prepend_class-native () { - export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" - export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" - export ICE_HOME="${S}/cpp" -} - -do_compile() { - oe_runmake -C ${S} cpp - oe_runmake -C ${S} py -} - -do_install_prepend_class-target () { - export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" - export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" - export ICE_HOME="${STAGING_DIR_NATIVE}/usr" -} - -do_install_prepend_class-nativesdk () { - export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}" - export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}" - export ICE_HOME="${STAGING_DIR_NATIVE}/usr" -} - -do_install_prepend_class-native () { - export ICE_HOME="${S}/cpp" -} - -do_install() { - oe_runmake -C ${S}/cpp prefix=${D}${prefix} install install-common - oe_runmake -C ${S}/py prefix=${D}${prefix} install -} - -PACKAGES += "${PN}-python ${PN}-python-dev ${PN}-python-dbg" - -FILES_${PN}-doc += "${prefix}/man/man1" -FILES_${PN} += "${prefix}/*LICENSE ${libdir}/ImportKey.class ${prefix}/RELEASE_NOTES ${prefix}/CHANGES" -FILES_${PN}-dev += "${includedir} ${prefix}/slice ${prefix}/config" -FILES_${PN}-python-dev = "${PYTHON_SITEPACKAGES_DIR}/IcePy.so" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.py ${PYTHON_SITEPACKAGES_DIR}/IcePy.so.* ${PYTHON_SITEPACKAGES_DIR}/Ice*/*.py" -FILES_${PN}-python-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug" -FILES_${PN}-dev += "${bindir}/slice* ${datadir}/Ice-${PV}/slice/*" - -BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg