summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-04-27 11:04:51 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-31 10:18:33 +0200
commitec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 (patch)
treee16d2a838f4561d5538928a58f805e5f1373225a /meta-oe/recipes-connectivity
parent6775acb048dabd624c5c8197b683aba45ed91569 (diff)
downloadmeta-openembedded-ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3.tar.gz
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch14
-rw-r--r--meta-oe/recipes-connectivity/bluez/bluez4.inc47
-rw-r--r--meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb36
-rw-r--r--meta-oe/recipes-connectivity/soft66/files/fix-ar.patch13
-rw-r--r--meta-oe/recipes-connectivity/soft66/soft66_git.bb20
-rw-r--r--meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch18
-rw-r--r--meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch15
-rw-r--r--meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb26
-rw-r--r--meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch76
-rw-r--r--meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb53
-rw-r--r--meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice-3.5.1/0002-Modify-Makefile-for-cross-compile.patch292
-rw-r--r--meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb87
12 files changed, 0 insertions, 697 deletions
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 0c77f1a20..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Pending [package obsolete/not maintained by upstream]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac
5--- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200
6+++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200
7@@ -2,7 +2,7 @@
8 AC_INIT(bluez-hcidump, 2.5)
9
10 AM_INIT_AUTOMAKE([foreign subdir-objects])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 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 5240ccfd8..000000000
--- a/meta-oe/recipes-connectivity/bluez/bluez4.inc
+++ /dev/null
@@ -1,47 +0,0 @@
1SUMMARY = "Linux Bluetooth Stack Userland V4"
2DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
3HOMEPAGE = "http://www.bluez.org"
4SECTION = "libs"
5LICENSE = "GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
9 file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
10
11RPROVIDES_${PN} += "${PN}-systemd"
12RREPLACES_${PN} += "${PN}-systemd"
13RCONFLICTS_${PN} += "${PN}-systemd"
14
15DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
16RDEPENDS_${PN}-dev = "bluez-hcidump"
17
18PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pie systemd', d)}"
19PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
20PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
21PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
22
23ASNEEDED = ""
24
25SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz"
26S = "${WORKDIR}/bluez-${PV}"
27
28inherit autotools-brokensep pkgconfig systemd
29
30EXTRA_OECONF = "\
31 --disable-gstreamer \
32 --enable-usb \
33 --enable-tools \
34 --enable-bccmd \
35 --enable-hid2hci \
36 --enable-dfutool \
37 --disable-hidd \
38 --disable-pand \
39 --disable-dund \
40 --disable-cups \
41 --enable-test \
42 --enable-datafiles \
43 --with-udevdir=`pkg-config --variable=udevdir udev` \
44 --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
45"
46
47EXCLUDE_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 b6098d84a..000000000
--- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SUMMARY = "Cellphone tools and driver software"
2SECTION = "console/network"
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
5
6SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2"
7
8DEPENDS = "glib-2.0 intltool-native"
9X11DEPENDS = " libxpm gtk+"
10
11PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
12PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
13PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical"
14PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite"
15PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
16PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0"
17PACKAGECONFIG[x11] = ",--without-x,${X11DEPENDS}"
18
19inherit autotools pkgconfig
20
21PACKAGES += "libgnokii libgnokii-dev"
22
23EXTRA_OECONF = "--disable-smsd"
24
25FILES_${PN} = "${bindir} ${sbindir}"
26FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
27 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
28 /lib/*.a /lib/*.o ${datadir}/aclocal \
29"
30FILES_${PN}-dev = ""
31FILES_libgnokii = "${libdir}/libgnokii.so.*"
32
33SRC_URI[md5sum] = "d9627f4a1152d3ea7806df4532850d5f"
34SRC_URI[sha256sum] = "8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501"
35
36PNBLACKLIST[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 bf1ffdfc6..000000000
--- a/meta-oe/recipes-connectivity/soft66/files/fix-ar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1---
2 configure.ac | 1 +
3 1 file changed, 1 insertion(+)
4
5--- git.orig/configure.ac
6+++ git/configure.ac
7@@ -7,5 +7,6 @@ AC_PROG_CC
8 AC_CONFIG_HEADERS([config.h])
9 AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile])
10 PKG_CHECK_MODULES([FTDI], [libftdi >= 0.13])
11 AC_OUTPUT
12 AM_PROG_CC_C_O
13+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 816f58350..000000000
--- a/meta-oe/recipes-connectivity/soft66/soft66_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1SUMMARY = "Library and tools for Soft66ADD and related SDR radio receivers"
2LICENSE = "GPLv3 & LGPLv3+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
4 file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 "
5
6PNBLACKLIST[soft66] ?= "BROKEN: depends on broken libftdi - the recipe will be removed on 2017-09-01 unless the issue is fixed"
7
8DEPENDS = "libftdi"
9
10PV = "0.1.3+gitr${SRCPV}"
11PR = "r1"
12
13SRCREV = "a1dab25e73896c90c98227ac8055f227b830d512"
14SRC_URI = "git://home.horsten.com/soft66 \
15file://fix-ar.patch"
16
17S = "${WORKDIR}/git"
18
19inherit autotools pkgconfig
20
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 a7737fbf0..000000000
--- a/meta-oe/recipes-connectivity/telepathy/libtelepathy/doublefix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Fix double reference to this file to work with recent autoconf+automake
2
3RP 1/2/10
4
5Upstream-Status: Inappropriate [configuration]
6
7Index: libtelepathy-0.3.3/src/Makefile.am
8===================================================================
9--- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000
10+++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000
11@@ -27,7 +27,6 @@
12 tp-chan-type-text-gen.h \
13 tp-chan-type-tubes-gen.h \
14 tp-conn-iface-aliasing-gen.h \
15- tp-conn-iface-avatars-gen.h \
16 tp-conn-iface-capabilities-gen.h \
17 tp-conn-iface-contact-info-gen.h \
18 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 37679ab76..000000000
--- a/meta-oe/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libtelepathy-0.3.1/configure.ac
4===================================================================
5--- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000
6+++ libtelepathy-0.3.1/configure.ac 2008-01-04 12:07:28.000000000 +0000
7@@ -51,7 +51,7 @@
8 AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
9 fi
10
11-AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
12+AC_CHECK_PROGS([PYTHON], [python2.5 python2.4 python2.3 python])
13 if test -z "$PYTHON"; then
14 AC_MSG_ERROR([Python is required to compile this package])
15 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 783bd5d73..000000000
--- a/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "Telepathy framework"
2DESCRIPTION = "Telepathy is a D-Bus framework for unifying real time \
3communication, including instant messaging, voice calls and video calls. It \
4abstracts differences between protocols to provide a unified interface for \
5applications."
6HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
7DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib libxslt-native"
8LICENSE = "LGPLv2.1+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
10 file://src/tp-conn.c;beginline=1;endline=19;md5=4c58069f77d601cc59200bce5396c7cb"
11PR = "r5"
12
13SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
14 file://prefer_python_2.5.patch \
15 file://doublefix.patch \
16"
17
18SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370"
19SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878"
20
21inherit autotools pkgconfig pythonnative
22
23FILES_${PN} += "${datadir}/telepathy \
24 ${datadir}/dbus-1"
25
26PNBLACKLIST[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 ece1da6bc..000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control/tmc-Makefile-fix-race.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1From: Robert Yang <liezhi.yang@windriver.com>
2Date: Sun, 22 Sep 2013 23:21:01 -0400
3Subject: [PATCH] src/Makefile.am: fix race issue for _gen/gtypes.h and _gen/gtypes-body.h
4
5There might be an error when parallel build:
6
7[snip]
8Traceback (most recent call last):
9 File "/path/to/tools/glib-gtypes-generator.py", line 304, in <module>
10 GTypesGenerator(dom, argv[1], argv[2])()
11 File "/path/to/tools/glib-gtypes-generator.py", line 295, in __call__
12 file_set_contents(self.output + '.h', ''.join(self.header))
13 File "/path/to/tools/libtpcodegen.py", line 42, in file_set_contents
14 os.rename(filename + '.tmp', filename)
15OSError: [Errno 2] No such file or directory
16[snip]
17
18This is a race issue, the _gen/gtypes.h and _gen/gtypes-body.h may
19write(remove/rename) _gen/gtypes.tmp at the same time, then there would
20be the error.
21
22There was a similar bug in telepathy-glib which was already fixed, we use the
23similar patch to fix it.
24
25Upstream-Status: Pending
26
27Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
28---
29 src/Makefile.am | 18 +++++++++++++++---
30 1 file changed, 15 insertions(+), 3 deletions(-)
31
32diff --git a/src/Makefile.am b/src/Makefile.am
33--- a/src/Makefile.am
34+++ b/src/Makefile.am
35@@ -288,7 +288,11 @@ _gen/interfaces-body.h: _gen/mcd.xml \
36 $(tools_dir)/glib-interfaces-body-generator.xsl \
37 $< > $@
38
39-_gen/gtypes.h _gen/gtypes-body.h: _gen/mcd.xml \
40+# do nothing, output as a side-effect
41+_gen/gtypes.h: _gen/gtypes-body.h
42+ @:
43+
44+_gen/gtypes-body.h: _gen/mcd.xml \
45 $(top_srcdir)/tools/glib-gtypes-generator.py
46 $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
47 $< _gen/gtypes mc
48@@ -309,7 +313,11 @@ _gen/%.xml: %.xml $(wildcard $(top_srcdir)/xml/*.xml) Makefile.am
49 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
50 $< > $@
51
52-_gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \
53+# do nothing, output as a side-effect
54+_gen/cli-%.h: _gen/cli-%-body.h
55+ @:
56+
57+_gen/cli-%-body.h: _gen/%.xml \
58 $(tools_dir)/glib-client-gen.py Makefile.am
59 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \
60 --group=`echo $* | tr x- x_` \
61@@ -317,7 +325,11 @@ _gen/cli-%-body.h _gen/cli-%.h: _gen/%.xml \
62 --tp-proxy-api=0.7.6 \
63 $< Mc_Cli _gen/cli-$*
64
65-_gen/svc-%.c _gen/svc-%.h: _gen/%.xml \
66+# do nothing, output as a side-effect
67+_gen/svc-%.h: _gen/svc-%.c
68+ @:
69+
70+_gen/svc-%.c: _gen/%.xml \
71 $(tools_dir)/glib-ginterface-gen.py Makefile.am
72 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
73 --filename=_gen/svc-$* \
74--
751.7.10.4
76
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 6a4d5d006..000000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb
+++ /dev/null
@@ -1,53 +0,0 @@
1SUMMARY = "Central control for Telepathy IM connection managers"
2HOMEPAGE = "http://telepathy.freedesktop.org/wiki/Mission_Control/"
3LICENSE = "LGPLv2.1+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
5 file://src/request.h;beginline=1;endline=21;md5=f80534d9af1c33291b3b79609f196eb2"
6SECTION = "libs"
7DEPENDS = "libtelepathy dbus-glib gconf libxslt-native"
8
9SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-mission-control/${BP}.tar.gz \
10 file://tmc-Makefile-fix-race.patch \
11 "
12SRC_URI[md5sum] = "421115a35b9e427807326877f86e7f43"
13SRC_URI[sha256sum] = "14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723"
14
15inherit autotools-brokensep pkgconfig pythonnative
16
17PACKAGECONFIG ??= ""
18PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,upower"
19
20# to select connman or nm you need to use "connectivity" and "connman" or "nm", default is to disable both
21PACKAGECONFIG[connectivity] = ",--with-connectivity=no"
22PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman"
23PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager"
24
25PACKAGES =+ " \
26 libmissioncontrol \
27 libmissioncontrol-config \
28 libmissioncontrol-server \
29 libmissioncontrol-dev \
30 libmissioncontrol-config-dev \
31 libmissioncontrol-server-dev \
32 libmissioncontrol-dbg \
33 libmissioncontrol-config-dbg \
34 libmissioncontrol-server-dbg \
35"
36
37FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas"
38
39FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*"
40FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*"
41FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*"
42
43FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \
44 ${includedir}/libmissioncontrol/ \
45 ${libdir}/pkgconfig/libmissioncontrol.pc"
46FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*"
47FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*"
48
49FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*"
50FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*"
51FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*"
52
53PNBLACKLIST[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 43096d2bc..000000000
--- 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 @@
1Upstream-Status: Inappropriate
2
3This patch lets you build Ice with OpenEmbedded. I doubt you could do
4a regular build after applying this patch.
5
6From bc622ce74fa03a935278d21736a5a251466e1798 Mon Sep 17 00:00:00 2001
7From: Tom Rondeau <tom@trondeau.com>
8Date: Wed, 16 Apr 2014 14:34:51 -0400
9Subject: [PATCH] Modify Makefiles for cross compile
10
11---
12 config/Make.common.rules | 20 +++++++------
13 cpp/Makefile | 9 +++---
14 cpp/config/Make.rules | 32 ++++++++++++--------
15 cpp/config/Make.rules.Linux | 18 ++---------
16 cpp/src/IceStorm/FreezeDB/Makefile | 2 +-
17 py/config/Make.rules | 58 +++++++++++++++++++-----------------
18 6 files changed, 70 insertions(+), 69 deletions(-)
19
20diff --git a/config/Make.common.rules b/config/Make.common.rules
21index d7b1d59..a3fb17e 100644
22--- a/config/Make.common.rules
23+++ b/config/Make.common.rules
24@@ -65,9 +65,9 @@ ifeq ($(UNAME),Linux)
25 #
26 # Some Linux distributions like Debian/Ubuntu don't use /usr/lib64.
27 #
28- ifeq ($(shell test -d /usr/lib64 && echo 0),0)
29- lp64suffix = 64
30- endif
31+ #ifeq ($(shell test -d /usr/lib64 && echo 0),0)
32+ # lp64suffix = 64
33+ #endif
34 ifeq ($(LP64),)
35 LP64 = yes
36 endif
37@@ -244,12 +244,13 @@ else
38 slicedir = $(ice_dir)/slice
39 endif
40
41-ifeq ($(prefix), /usr)
42- install_slicedir = /usr/share/Ice-$(VERSION)/slice
43-else
44- install_slicedir = $(prefix)/slice
45-endif
46+#ifeq ($(prefix), /usr)
47+# install_slicedir = /usr/share/Ice-$(VERSION)/slice
48+#else
49+# install_slicedir = $(prefix)/slice
50+#endif
51
52+install_slicedir = $(prefix)/slice
53 #
54 # Set environment variables for the Slice translator.
55 #
56@@ -265,7 +266,8 @@ ifneq ($(ice_dir), /usr)
57 endif
58
59 ifeq ($(UNAME),Linux)
60- export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH)
61+ #export LD_LIBRARY_PATH := $(ice_lib_dir):$(LD_LIBRARY_PATH)
62+ export LD_LIBRARY_PATH := $(ICE_HOME)/lib:$(LD_LIBRARY_PATH)
63 endif
64
65 ifeq ($(UNAME),SunOS)
66diff --git a/cpp/Makefile b/cpp/Makefile
67index a68f113..1f44f57 100644
68--- a/cpp/Makefile
69+++ b/cpp/Makefile
70@@ -11,11 +11,12 @@ top_srcdir = .
71
72 include $(top_srcdir)/config/Make.rules
73
74-SUBDIRS = config src include test
75+#SUBDIRS = config src include test
76+SUBDIRS = config src include
77
78-ifeq ($(shell uname | grep MINGW),)
79-SUBDIRS := $(SUBDIRS) demo
80-endif
81+#ifeq ($(shell uname | grep MINGW),)
82+#SUBDIRS := $(SUBDIRS) demo
83+#endif
84
85 INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) \
86 $(install_configdir) $(install_mandir)
87diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
88index 37461ae..197c5e8 100644
89--- a/cpp/config/Make.rules
90+++ b/cpp/config/Make.rules
91@@ -175,11 +175,12 @@ headerdir = $(top_srcdir)/include
92 # includedir is not handled the same as bindir and libdir
93 # because it is used in the .depend files
94 #
95-ifdef ice_src_dist
96- includedir = $(top_srcdir)/include
97-else
98- includedir = $(ice_dir)/include
99-endif
100+#ifdef ice_src_dist
101+# includedir = $(top_srcdir)/include
102+#else
103+# includedir = $(ice_dir)/include
104+#endif
105+includedir = $(top_srcdir)/include
106
107 #
108 # Platform specific definitions
109@@ -277,14 +278,17 @@ ICECPPFLAGS = -I$(slicedir)
110 SLICE2CPPFLAGS = $(ICECPPFLAGS)
111
112 ifeq ($(ice_dir), /usr)
113- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS)
114+ LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS)
115 else
116 CPPFLAGS += -I$(includedir)
117- ifdef ice_src_dist
118- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
119- else
120- LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix)
121- endif
122+# We must always build using the libraries in the source tree, the host's are obviously
123+# not what we want for the target
124+ LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir) $(call rpathlink,$(libdir))
125+# ifdef ice_src_dist
126+# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
127+# else
128+# LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(ice_dir)/$(libsubdir)$(cpp11suffix)
129+# endif
130 endif
131
132 ifeq ($(FLEX_NOLINE),yes)
133@@ -313,8 +317,10 @@ endif
134
135 ifdef ice_src_dist
136 SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION))
137- SLICE2CPP = $(bindir)/slice2cpp
138- SLICE2FREEZE = $(bindir)/slice2freeze
139+# SLICE2CPP = $(bindir)/slice2cpp
140+# SLICE2FREEZE = $(bindir)/slice2freeze
141+ SLICE2CPP = $(ICE_HOME)/bin/slice2cpp
142+ SLICE2FREEZE = $(ICE_HOME)/bin/slice2freeze
143 else
144 SLICEPARSERLIB = $(ice_dir)/$(libsubdir)$(cpp11suffix)/$(call mklibfilename,Slice,$(VERSION))
145 SLICE2CPP = $(ice_dir)/$(binsubdir)$(cpp11suffix)/slice2cpp
146diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
147index 5d5717c..8363c6e 100644
148--- a/cpp/config/Make.rules.Linux
149+++ b/cpp/config/Make.rules.Linux
150@@ -31,7 +31,7 @@ ifeq ($(CXX),c++)
151 CXX = g++
152 endif
153
154-ifeq ($(CXX),g++)
155+#ifeq ($(CXX),g++)
156
157 ifneq ($(SUSE_i586),)
158 CXXARCHFLAGS += -march=i586
159@@ -71,14 +71,6 @@ ifeq ($(CXX),g++)
160 CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED
161 endif
162
163- ifeq ($(MACHINE),x86_64)
164- ifeq ($(LP64),yes)
165- CXXARCHFLAGS += -m64
166- else
167- CXXARCHFLAGS += -m32
168- endif
169- endif
170-
171 CXXFLAGS = $(CXXARCHFLAGS) -Wall -Werror -pthread
172
173 ifneq ($(GENPIC),no)
174@@ -102,15 +94,11 @@ ifeq ($(CXX),g++)
175
176 rpathlink = -Wl,-rpath-link,$(1)
177
178- ifneq ($(embedded_runpath_prefix),)
179- LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,$(runpath_libdir)
180- else
181- LDPLATFORMFLAGS = -Wl,--enable-new-dtags
182- endif
183+ LDPLATFORMFLAGS = -Wl,--enable-new-dtags -Wl,-rpath,../../../lib
184
185 LDPLATFORMFLAGS += -rdynamic
186
187-endif
188+#endif
189
190 ifeq ($(CXX),icpc)
191 $(warning ===================================================================)
192diff --git a/cpp/src/IceStorm/FreezeDB/Makefile b/cpp/src/IceStorm/FreezeDB/Makefile
193index 7c844b7..cf15cb1 100644
194--- a/cpp/src/IceStorm/FreezeDB/Makefile
195+++ b/cpp/src/IceStorm/FreezeDB/Makefile
196@@ -66,7 +66,7 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
197
198 $(MIGRATE): $(MOBJS)
199 rm -f $@
200- $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS)
201+ $(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS) -ldb_cxx
202
203 # The slice2freeze rules are structured like this to avoid issues with
204 # parallel make.
205diff --git a/py/config/Make.rules b/py/config/Make.rules
206index 43ce01b..1349342 100644
207--- a/py/config/Make.rules
208+++ b/py/config/Make.rules
209@@ -92,21 +92,23 @@ ifeq ($(shell test -f $(top_srcdir)/config/Make.rules.$(UNAME) && echo 0),0)
210 include $(top_srcdir)/config/Make.rules.$(UNAME)
211 else
212 include $(top_srcdir)/../cpp/config/Make.rules.$(UNAME)
213-endif
214+endif
215
216 libdir = $(top_srcdir)/python
217-ifneq ($(prefix), /usr)
218-install_pythondir = $(prefix)/python
219-install_libdir = $(prefix)/python
220-else
221- ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
222- install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
223- install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
224- else
225- install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
226- install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
227- endif
228-endif
229+#ifneq ($(prefix), /usr)
230+#install_pythondir = $(prefix)/python
231+#install_libdir = $(prefix)/python
232+#else
233+# ifeq ($(shell test -d $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages && echo 0),0)
234+# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
235+# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/dist-packages
236+# else
237+# install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
238+# install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
239+# endif
240+#endif
241+install_pythondir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
242+install_libdir = $(prefix)/$(libsubdir)/$(PYTHON_VERSION)/site-packages
243
244 ifeq ($(UNAME),SunOS)
245 ifeq ($(LP64),yes)
246@@ -115,19 +117,21 @@ ifeq ($(UNAME),SunOS)
247 endif
248 endif
249
250-ifdef ice_src_dist
251- ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
252- ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
253- else
254- ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir)
255- endif
256- ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
257- ICE_FLAGS = -I$(ice_cpp_dir)/include
258-endif
259-ifdef ice_bin_dist
260- ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
261- ICE_FLAGS = -I$(ice_dir)/include
262-endif
263+#ifdef ice_src_dist
264+# ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
265+# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
266+# else
267+# ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir)
268+# endif
269+# ICE_LIB_DIR = -L$(ice_cpp_dir)/lib
270+# ICE_FLAGS = -I$(ice_cpp_dir)/include
271+#endif
272+#ifdef ice_bin_dist
273+# ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir)
274+# ICE_FLAGS = -I$(ice_dir)/include
275+#endif
276+ICE_LIB_DIR = -L$(top_srcdir)/../cpp/lib
277+ICE_FLAGS = -I$(ice_cpp_dir)/include
278 ICE_LIBS = $(ICE_LIB_DIR) -lIce -lSlice -lIceUtil
279
280 ifneq ($(embedded_runpath_prefix),)
281@@ -137,7 +141,7 @@ endif
282 CPPFLAGS =
283 ICECPPFLAGS = -I$(slicedir)
284 SLICE2PYFLAGS = $(ICECPPFLAGS)
285-LDFLAGS = $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
286+LDFLAGS += $(LDPLATFORMFLAGS) $(CXXFLAGS) -L$(libdir)
287
288 ifdef ice_src_dist
289 ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
290--
2911.7.9.5
292
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 7c833b0eb..000000000
--- a/meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb
+++ /dev/null
@@ -1,87 +0,0 @@
1DESCRIPTION = "The Internet Communications Engine"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://ICE_LICENSE;md5=3dc3037023cc2ae6b2c5b995da529515"
4DEPENDS = "bzip2 expat openssl python db mcpp"
5DEPENDS_prepend_class-target = "zeroc-ice-native "
6
7SRC_URI = "http://www.zeroc.com/download/Ice/3.5/Ice-${PV}.tar.gz \
8 file://0002-Modify-Makefile-for-cross-compile.patch \
9 "
10SRC_URI[md5sum] = "f00c59983cc904bca977133c0a9b3e80"
11SRC_URI[sha256sum] = "989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392"
12
13#| MapDb.cpp: In constructor 'Freeze::MapDb::MapDb(const ConnectionIPtr&, const string&, const string&, const string&, const KeyCompareBasePtr&, const std::vector<IceUtil::Handle<Freeze::MapIndexBase> >&, bool)':
14#| MapDb.cpp:138:46: error: call of overloaded 'set_bt_compare(int (*)(DB*, const DBT*, const DBT*))' is ambiguous
15#| MapDb.cpp:138:46: note: candidates are:
16#| /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) <near match>
17#| /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*)}'
18#| /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*)) <near match>
19#| /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*)}'
20#| make[3]: *** [MapDb.o] Error 1
21PNBLACKLIST[zeroc-ice] ?= "BROKEN: not compatible with default db version - the recipe will be removed on 2017-09-01 unless the issue is fixed"
22
23S = "${WORKDIR}/Ice-${PV}"
24
25inherit python-dir pkgconfig
26
27export PYTHON_VERSION = "python2.7"
28
29do_configure() {
30 :
31}
32
33do_compile_prepend_class-target () {
34 export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
35 export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
36 export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
37}
38
39do_compile_prepend_class-nativesdk () {
40 export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
41 export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
42 export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
43}
44
45do_compile_prepend_class-native () {
46 export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
47 export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
48 export ICE_HOME="${S}/cpp"
49}
50
51do_compile() {
52 oe_runmake -C ${S} cpp
53 oe_runmake -C ${S} py
54}
55
56do_install_prepend_class-target () {
57 export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
58 export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
59 export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
60}
61
62do_install_prepend_class-nativesdk () {
63 export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}"
64 export PYTHON_LIB_DIR="${STAGING_LIBDIR}/${PYTHON_DIR}"
65 export ICE_HOME="${STAGING_DIR_NATIVE}/usr"
66}
67
68do_install_prepend_class-native () {
69 export ICE_HOME="${S}/cpp"
70}
71
72do_install() {
73 oe_runmake -C ${S}/cpp prefix=${D}${prefix} install install-common
74 oe_runmake -C ${S}/py prefix=${D}${prefix} install
75}
76
77PACKAGES += "${PN}-python ${PN}-python-dev ${PN}-python-dbg"
78
79FILES_${PN}-doc += "${prefix}/man/man1"
80FILES_${PN} += "${prefix}/*LICENSE ${libdir}/ImportKey.class ${prefix}/RELEASE_NOTES ${prefix}/CHANGES"
81FILES_${PN}-dev += "${includedir} ${prefix}/slice ${prefix}/config"
82FILES_${PN}-python-dev = "${PYTHON_SITEPACKAGES_DIR}/IcePy.so"
83FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.py ${PYTHON_SITEPACKAGES_DIR}/IcePy.so.* ${PYTHON_SITEPACKAGES_DIR}/Ice*/*.py"
84FILES_${PN}-python-dbg = "${PYTHON_SITEPACKAGES_DIR}/.debug"
85FILES_${PN}-dev += "${bindir}/slice* ${datadir}/Ice-${PV}/slice/*"
86
87BBCLASSEXTEND = "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 16:31:59 +0000