summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-efl/recipes-efl/e17/waker/0001-waker-remove-old-ecore_string_init-and-ecore_string_.patch54
-rw-r--r--meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch51
-rw-r--r--meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch31
-rw-r--r--meta-gnome/recipes-support/goffice/goffice/c99math.patch12
-rw-r--r--meta-gnome/recipes-support/goffice/goffice/nodolt.patch12
-rw-r--r--meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch19
-rw-r--r--meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch17
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch67
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch47
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch23
-rw-r--r--meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch12
-rw-r--r--meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch31
-rw-r--r--meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch38
-rw-r--r--meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch38
-rw-r--r--meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch46
-rw-r--r--meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch39
-rw-r--r--meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch58
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch16
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch11
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch16
-rw-r--r--meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch31
-rw-r--r--meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch72
-rw-r--r--meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch36
-rw-r--r--meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch70
-rw-r--r--meta-oe/recipes-support/mg/files/remove_ncurses_check.patch36
-rw-r--r--meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch162
-rw-r--r--meta-python/recipes-devtools/python/python-numeric/no-lapack.patch33
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2/fix-libtool-name.patch55
28 files changed, 0 insertions, 1133 deletions
diff --git a/meta-efl/recipes-efl/e17/waker/0001-waker-remove-old-ecore_string_init-and-ecore_string_.patch b/meta-efl/recipes-efl/e17/waker/0001-waker-remove-old-ecore_string_init-and-ecore_string_.patch
deleted file mode 100644
index 2e9d1046d..000000000
--- a/meta-efl/recipes-efl/e17/waker/0001-waker-remove-old-ecore_string_init-and-ecore_string_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From b6296958d5516a735053ee4140e85e2b3a896182 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 30 Jan 2011 00:27:57 +0100
4Subject: [PATCH] waker: remove old ecore_string_init and ecore_string_shutdown
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 src/bin/waker_main.c | 2 --
9 src/bin/waker_tool.c | 2 --
10 2 files changed, 0 insertions(+), 4 deletions(-)
11
12diff --git a/src/bin/waker_main.c b/src/bin/waker_main.c
13index b229cf0..dd54b31 100644
14--- a/src/bin/waker_main.c
15+++ b/src/bin/waker_main.c
16@@ -568,7 +568,6 @@ main(int argc, char **argv)
17 E_DBus_Connection *c;
18
19 ecore_init();
20- ecore_string_init();
21 ecore_app_args_set(argc, (const char **)argv);
22 e_dbus_init();
23
24@@ -586,7 +585,6 @@ main(int argc, char **argv)
25
26 e_dbus_connection_close(c);
27 e_dbus_shutdown();
28- ecore_string_shutdown();
29 ecore_shutdown();
30
31 return 0;
32diff --git a/src/bin/waker_tool.c b/src/bin/waker_tool.c
33index 3344fd2..52515c9 100644
34--- a/src/bin/waker_tool.c
35+++ b/src/bin/waker_tool.c
36@@ -93,7 +93,6 @@ main(int argc, char **argv)
37 }
38
39 ecore_init();
40- ecore_string_init();
41 ecore_app_args_set(argc, (const char **)argv);
42 e_dbus_init();
43
44@@ -301,7 +300,6 @@ main(int argc, char **argv)
45
46 e_dbus_connection_close(c);
47 e_dbus_shutdown();
48- ecore_string_shutdown();
49 ecore_shutdown();
50
51 return 0;
52--
531.7.4.rc3
54
diff --git a/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch b/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch
deleted file mode 100644
index aa7fd4bf5..000000000
--- a/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From b3cbe31c38a088af7b0dade82545475fc9b72492 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 2 Dec 2014 12:21:10 +0100
4Subject: [PATCH 2/3] evas_3d: Add Eet.h includes
5
6* with some very restrictive options like we use in efl-native, the build is complaining
7 about missing symbols from Eet.h, add include where needed
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 src/lib/evas/canvas/evas_3d_eet.c | 1 +
12 src/modules/evas/model_loaders/eet/evas_model_load_eet.c | 1 +
13 src/modules/evas/model_savers/eet/evas_model_save_eet.c | 1 +
14 3 files changed, 3 insertions(+)
15
16diff --git a/src/lib/evas/canvas/evas_3d_eet.c b/src/lib/evas/canvas/evas_3d_eet.c
17index 1515f5a..a438217 100644
18--- a/src/lib/evas/canvas/evas_3d_eet.c
19+++ b/src/lib/evas/canvas/evas_3d_eet.c
20@@ -1,3 +1,4 @@
21+#include <Eet.h>
22 #include <stdio.h>
23 #include "evas_common_private.h"
24 #include "evas_private.h"
25diff --git a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
26index 815b9f1..bff2cea 100644
27--- a/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
28+++ b/src/modules/evas/model_loaders/eet/evas_model_load_eet.c
29@@ -3,6 +3,7 @@
30 #endif
31
32 #include <Eo.h>
33+#include <Eet.h>
34 #include <stdio.h>
35 #include "evas_common_private.h"
36 #include "evas_private.h"
37diff --git a/src/modules/evas/model_savers/eet/evas_model_save_eet.c b/src/modules/evas/model_savers/eet/evas_model_save_eet.c
38index e445dca..2e1cf4e 100644
39--- a/src/modules/evas/model_savers/eet/evas_model_save_eet.c
40+++ b/src/modules/evas/model_savers/eet/evas_model_save_eet.c
41@@ -2,6 +2,7 @@
42 #include "config.h"
43 #endif
44
45+#include <Eet.h>
46 #include <stdio.h>
47 #include "evas_common_private.h"
48 #include "evas_private.h"
49--
502.3.0
51
diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch b/meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
deleted file mode 100644
index aeb02ab2c..000000000
--- a/meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1---
2 Makefile.am | 2 +-
3 gcalctool/Makefile.am | 2 --
4 2 files changed, 1 insertion(+), 3 deletions(-)
5
6Index: gcalctool-5.8.17/gcalctool/Makefile.am
7===================================================================
8--- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000
9+++ gcalctool-5.8.17/gcalctool/Makefile.am 2007-05-16 16:03:26.000000000 +0100
10@@ -1,8 +1,6 @@
11 ## Process this file with automake to produce Makefile.in
12
13 INCLUDES = \
14- -I$(includedir) \
15- -DG_DISABLE_DEPRECATED \
16 -DGDK_PIXBUF_DISABLE_DEPRECATED \
17 -DGDK_DISABLE_DEPRECATED \
18 -DGNOME_DISABLE_DEPRECATED \
19Index: gcalctool-5.8.17/Makefile.am
20===================================================================
21--- gcalctool-5.8.17.orig/Makefile.am 2007-05-16 15:35:44.000000000 +0100
22+++ gcalctool-5.8.17/Makefile.am 2007-05-16 16:06:46.000000000 +0100
23@@ -29,7 +29,7 @@ DISTCLEANFILES = \
24 gnome-doc-utils.make \
25 gcalctool.desktop
26
27-SUBDIRS = po gcalctool help
28+SUBDIRS = po gcalctool
29
30 SCHEMAS_FILE = gcalctool.schemas
31
diff --git a/meta-gnome/recipes-support/goffice/goffice/c99math.patch b/meta-gnome/recipes-support/goffice/goffice/c99math.patch
deleted file mode 100644
index 24e6c31a7..000000000
--- a/meta-gnome/recipes-support/goffice/goffice/c99math.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: goffice-0.7.14/configure.in
2===================================================================
3--- goffice-0.7.14.orig/configure.in 2009-11-14 19:14:37.106109501 +0100
4+++ goffice-0.7.14/configure.in 2009-11-14 19:19:40.907333188 +0100
5@@ -66,6 +66,7 @@
6
7 AC_ISC_POSIX
8 AC_PROG_CC
9+AC_PROG_CC_C99
10 AC_PROG_YACC
11 AM_PROG_LEX
12 AC_PROG_LN_S
diff --git a/meta-gnome/recipes-support/goffice/goffice/nodolt.patch b/meta-gnome/recipes-support/goffice/goffice/nodolt.patch
deleted file mode 100644
index ea1777a99..000000000
--- a/meta-gnome/recipes-support/goffice/goffice/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Index: goffice-0.7.14/configure.in
2===================================================================
3--- goffice-0.7.14.orig/configure.in
4+++ goffice-0.7.14/configure.in
5@@ -71,7 +71,6 @@ AC_PROG_YACC
6 AM_PROG_LEX
7 AC_PROG_LN_S
8 AM_PROG_LIBTOOL
9-DOLT
10 AC_STDC_HEADERS
11 AC_SYS_LARGEFILE
12
diff --git a/meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch b/meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch
deleted file mode 100644
index ae9370cfc..000000000
--- a/meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Taken from http://trac.macports.org/ticket/34812
2
3Fixes abiword build failing with:
4/usr/lib/libgoffice-0.8.so: undefined reference to `pcre_info'
5
6Upstream-Status: pending
7
8http://www.linuxfromscratch.org/blfs/view/cvs/x/goffice.html
9--- a/goffice/utils/regutf8.c.orig 2009-09-05 18:52:09.000000000 -0500
10+++ b/goffice/utils/regutf8.c 2012-06-09 18:04:29.000000000 -0500
11@@ -155,7 +155,7 @@
12 default: return GO_REG_BADPAT;
13 }
14 } else {
15- gor->re_nsub = pcre_info (r, NULL, NULL);
16+ gor->re_nsub = pcre_fullinfo (r, NULL, 0, NULL);
17 gor->nosub = (cflags & GO_REG_NOSUB) != 0;
18 return 0;
19 }
diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch
deleted file mode 100644
index 8701f5854..000000000
--- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1diff -Naur ../tracker-0.10.8/configure.ac tracker-0.10.8//configure.ac
2--- ../tracker-0.10.8/configure.ac 2011-04-08 15:03:30.000000000 +0300
3+++ tracker-0.10.8//configure.ac 2011-04-11 13:47:16.625914002 +0300
4@@ -218,7 +218,12 @@
5
6 # Needed to generate .gir files,
7 # see http://live.gnome.org/GnomeGoals/AddGObjectIntrospectionSupport
8-GOBJECT_INTROSPECTION_CHECK([0.9.5])
9+#GOBJECT_INTROSPECTION_CHECK([0.9.5])
10+# Satisfy missing introspection foo
11+AM_CONDITIONAL(HAVE_INTROSPECTION, test "0" == "1")
12+
13+INTROSPECTION_CFLAGS=""
14+AC_SUBST(INTROSPECTION_CFLAGS)
15
16 # NOTE: dbus and dbus-glib-1 are only used now for libtracker-client
17 # which is deprecated and tracker-writeback which will be refactored
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch
deleted file mode 100644
index 35e51342f..000000000
--- a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From 7cf366faa7a24c7146c745c8cd8dc3ae3d1cabea Mon Sep 17 00:00:00 2001
2From: Garrett Brown <themagnificentmrb@gmail.com>
3Date: Thu, 7 Jan 2016 15:55:22 -0800
4Subject: [PATCH] Fix build after platform rename
5
6update source code to use renamed platform pkg
7---
8 CMakeLists.txt | 6 +++---
9 debian/control | 2 +-
10 src/util/XMLUtils.h | 2 +-
11 3 files changed, 5 insertions(+), 5 deletions(-)
12
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index 2ce8c0d..bf6b659 100644
15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt
17@@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
18 find_package(kodi REQUIRED)
19 find_package(TinyXML REQUIRED)
20 find_package(Threads REQUIRED)
21-find_package(platform REQUIRED)
22+find_package(p8-platform REQUIRED)
23 include(UseMultiArch.cmake)
24 include(CheckAtomic.cmake)
25
26@@ -36,10 +36,10 @@ endif()
27
28 set(SOURCES src/util/XMLUtils.cpp)
29
30-include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR} ${platform_INCLUDE_DIRS})
31+include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR} ${p8-platform_INCLUDE_DIRS})
32
33 add_library(kodiplatform ${SOURCES} ${PLAT_SOURCES})
34-target_link_libraries(kodiplatform ${kodiplatform_LIBRARIES} ${platform_LIBRARIES})
35+target_link_libraries(kodiplatform ${kodiplatform_LIBRARIES} ${p8-platform_LIBRARIES})
36 set_target_properties(kodiplatform PROPERTIES VERSION ${kodiplatform_VERSION_MAJOR}.${kodiplatform_VERSION_MINOR}.${kodiplatform_VERSION_PATCH}
37 SOVERSION ${kodiplatform_VERSION_MAJOR}.0)
38
39diff --git a/debian/control b/debian/control
40index 42cadb2..e40c982 100644
41--- a/debian/control
42+++ b/debian/control
43@@ -1,7 +1,7 @@
44 Source: kodiplatform
45 Priority: extra
46 Maintainer: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
47-Build-Depends: debhelper (>= 8.0.0), cmake, libtinyxml-dev, kodi-addon-dev, libplatform-dev
48+Build-Depends: debhelper (>= 8.0.0), cmake, libtinyxml-dev, kodi-addon-dev, libp8-platform-dev
49 Standards-Version: 3.9.2
50 Section: libs
51
52diff --git a/src/util/XMLUtils.h b/src/util/XMLUtils.h
53index f22fd07..a10d831 100644
54--- a/src/util/XMLUtils.h
55+++ b/src/util/XMLUtils.h
56@@ -21,7 +21,7 @@
57 *
58 */
59
60-#include <platform/util/StdString.h>
61+#include <p8-platform/util/StdString.h>
62 #include "tinyxml.h"
63
64 class XMLUtils
65--
662.0.1
67
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch
deleted file mode 100644
index 742f25de1..000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/0001-systemd-allow-with-systemd-to-take-a-path-arg.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 40971911d653bf53de295d7462c643e4073916b9 Mon Sep 17 00:00:00 2001
2From: Joe MacDonald <joe@deserted.net>
3Date: Fri, 1 Nov 2013 12:47:18 -0400
4Subject: [PATCH] systemd: allow --with-systemd to take a path arg
5
6If building for a cross-compile environment with systemd it is convenient
7to be able to specify a systemd path for the target that may not be the
8same as that on the host.
9
10Upstream-status: Submitted [http://www.spinics.net/lists/autofs/msg00740.html]
11
12Signed-off-by: Joe MacDonald <joe@deserted.net>
13---
14 aclocal.m4 | 10 ++++++++--
15 1 file changed, 8 insertions(+), 2 deletions(-)
16
17diff --git a/aclocal.m4 b/aclocal.m4
18index 3e6f223..105e3e9 100644
19--- a/aclocal.m4
20+++ b/aclocal.m4
21@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory
22 dnl --------------------------------------------------------------------------
23 AC_DEFUN([AF_WITH_SYSTEMD],
24 [AC_ARG_WITH(systemd,
25-[ --with-systemd install systemd unit file if systemd unit directory
26- is found on system],
27+[ --with-systemd@<:@=systemddir@:>@ install systemd unit file. If 'yes'
28+ probe the system for unit directory.
29+ If a path is specified, assume that
30+ is a valid install path.],
31 [if test "$withval" = yes; then
32 if test -z "$systemddir"; then
33 AC_MSG_CHECKING([location of the systemd unit files directory])
34@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD],
35 else
36 AC_MSG_RESULT(not found)
37 fi
38+else
39+ if test "$withval" != no; then
40+ systemddir=$withval
41+ fi
42 fi])
43 ])
44
45--
461.7.10.4
47
diff --git a/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch b/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch
deleted file mode 100644
index 7dc7096c2..000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/Makefile.rules-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Index: autofs-5.0.7/Makefile.rules
2===================================================================
3--- autofs-5.0.7.orig/Makefile.rules 2012-07-24 23:05:26.000000000 -0700
4+++ autofs-5.0.7/Makefile.rules 2012-10-26 09:23:40.270204270 -0700
5@@ -34,14 +34,14 @@
6 else
7 CFLAGS ?= -O2 -Wall
8 LDFLAGS = -s
9-STRIP = strip --strip-debug
10+STRIP = ${TARGET_PREFIX}strip --strip-debug
11 endif
12 endif
13
14-CC = gcc
15-CXX = g++
16+CC ?= ${TARGET_PREFIX}gcc
17+CXX ?= ${TARGET_PREFIX}g++
18 CXXFLAGS = $(CFLAGS)
19-LD = ld
20+LD ?= ${TARGET_PREFIX}ld
21 SOLDFLAGS = -shared
22
23 CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch
deleted file mode 100644
index 6a35843ce..000000000
--- a/meta-networking/recipes-daemons/autofs/autofs/autofs-additional-distros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- autofs-4.1.4/samples/rc.autofs.in~ 2005-04-11 06:30:54.000000000 -0500
2+++ autofs-4.1.4/samples/rc.autofs.in 2007-04-07 13:18:44.000000000 -0500
3@@ -43,6 +43,9 @@
4 system=debian
5 elif [ -f /etc/redhat-release ]; then
6 system=redhat
7+elif [ -f /etc/issue ] && grep -q "^SlugOS\|Yocto" /etc/issue ; then
8+ # SlugOS and Yocto behave like Debian, at least for autofs purposes.
9+ system=debian
10 else
11 echo "$0: Unknown system, please port and contact autofs@linux.kernel.org" 1>&2
12 exit 1
diff --git a/meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch b/meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch
deleted file mode 100644
index 5f845bb4c..000000000
--- a/meta-networking/recipes-daemons/squid/files/Add-default-entry-for-cross-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From faa212a4e0aaf442ff58fca50770a8fadc1038e3 Mon Sep 17 00:00:00 2001
2Message-Id: <faa212a4e0aaf442ff58fca50770a8fadc1038e3.1382041123.git.Jim.Somerville@windriver.com>
3From: Jim Somerville <Jim.Somerville@windriver.com>
4Date: Thu, 17 Oct 2013 16:17:48 -0400
5Subject: [PATCH 1/1] Add default entry for cross compile
6
7Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
8---
9 acinclude/krb5.m4 | 6 +++++-
10 1 files changed, 5 insertions(+), 1 deletions(-)
11
12diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
13index 5d9ac36..7a072a2 100644
14--- a/acinclude/krb5.m4
15+++ b/acinclude/krb5.m4
16@@ -82,7 +82,11 @@ main(void)
17
18 return 0;
19 }
20-]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ])
21+]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ],
22+[
23+ dnl Can't test in cross compiled env - so assume good
24+ squid_cv_broken_heimdal_krb5_h=no
25+])
26 ],
27 [
28 dnl Can't test in cross compiled env - so assume good
29--
301.7.4.1
31
diff --git a/meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch b/meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch
deleted file mode 100644
index ad73c0088..000000000
--- a/meta-networking/recipes-support/curlpp/curlpp/pkgconfig_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Upstream-Status: Inappropriate [packaging]
2
3
4Index: curl-7.20.0/libcurl.pc.in
5===================================================================
6--- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000
7+++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000
8@@ -35,6 +35,7 @@
9 URL: http://curl.haxx.se/
10 Description: Library to transfer files with ftp, http, etc.
11 Version: @CURLVERSION@
12-Libs: -L${libdir} -lcurl @LIBS@
13-Libs.private: @LIBCURL_LIBS@ @LIBS@
14+Requires.private: @GNUTLS_REQUIRED@
15+Libs: -L${libdir} -lcurl
16+Libs.private: -ldl -lz
17 Cflags: -I${includedir}
18Index: curl-7.20.0/configure.ac
19===================================================================
20--- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000
21+++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000
22@@ -1668,6 +1668,7 @@
23 AC_SUBST(USE_GNUTLS, [1])
24 GNUTLS_ENABLED=1
25 USE_GNUTLS="yes"
26+ GNUTLS_REQUIRED="gnutls"
27 curl_ssl_msg="enabled (GnuTLS)"
28 ],
29 [
30@@ -1696,6 +1697,8 @@
31
32 fi dnl OPENSSL != 1
33
34+AC_SUBST(GNUTLS_REQUIRED)
35+
36 dnl ----------------------------------------------------
37 dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
38 dnl ----------------------------------------------------
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch
deleted file mode 100644
index 1de4a86d9..000000000
--- a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-don-t-compile-documentation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From feccf89f08a455460668cf286151662e4c1557b3 Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Thu, 20 Aug 2015 15:32:30 +0900
4Subject: [PATCH] Makefile.in: don't compile documentation
5
6The documentation file is not suitable for cross-compile,
7Errors will occur:
8| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory
9| ../../user/v9/drbdsetup xml-help disk-options > drbdsetup_xml-help_disk-options.xml
10| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory
11| /bin/sh: ../../user/v9/drbdsetup: /lib/ld-linux-x86-64.so.2: bad ELF interpreter: No such file or directory
12| make[1]: *** [drbdsetup_xml-help_new-resource.xml] Error 126
13
14so we do not compile it.
15
16Upstream-Status: pending
17
18Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
19---
20 Makefile.in | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/Makefile.in b/Makefile.in
24index 5365a2c..d5967d8 100644
25--- a/Makefile.in
26+++ b/Makefile.in
27@@ -45,7 +45,7 @@ WITH_84_SUPPORT = @WITH_84_SUPPORT@
28 # and not in e.g. dash. I'm too lazy to fix it to be compatible.
29 SHELL=/bin/bash
30
31-SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts documentation/v83 documentation/v84 documentation/v9
32+SUBDIRS = user/shared user/v9 user/v84 user/v83 scripts
33
34 REL_VERSION := $(shell $(SED) -ne '/^AC_INIT/{s/^[^,]*, *\([^,]*\) *,.*/\1/;p;q}' configure.ac)
35 ifdef FORCE
36--
371.8.4.2
38
diff --git a/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch b/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch
deleted file mode 100644
index 64a08add7..000000000
--- a/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1[PATCH] Do not set CC_FOR_BUILD flags
2
3Upstream-status: Pending
4
5AC_WIRESHARK_COMPILER_FLAGS_CHECK() is checking which options CC is supported,
6and put the supported options into CFLAGS, but it should not put them into
7CFLAGS_FOR_BUILD. since CC and BUILD_CC can be different, CFLAGS_FOR_BUILD is
8used by BUILD_CC
9
10BUILD_CC is used to generated host tools, do not use the gcc's optimised options,
11do not effect the running of host tools. so do not set CC_FOR_BUILD flags.
12
13Signed-off-by: Roy.Li <rongqing.li@windriver.com>
14---
15 acinclude.m4 | 8 --------
16 1 file changed, 8 deletions(-)
17
18diff --git a/acinclude.m4 b/acinclude.m4
19index 136fc27..8d3d360 100644
20--- a/acinclude.m4
21+++ b/acinclude.m4
22@@ -1755,10 +1755,6 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
23 # just the new option.
24 #
25 CFLAGS="$CFLAGS_saved $GCC_OPTION"
26- #
27- # Add it to the flags we use when building build tools.
28- #
29- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
30 ],
31 [
32 AC_MSG_RESULT(yes)
33@@ -1771,10 +1767,6 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then
34 # just the new option.
35 #
36 CFLAGS="$CFLAGS_saved $GCC_OPTION"
37- #
38- # Add it to the flags we use when building build tools.
39- #
40- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
41 fi
42 ],
43 [
44--
451.9.1
46
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch
deleted file mode 100644
index 0b8d0e4d5..000000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-install-perl-lib-to-directory-perl-instead-of-perl5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Inappropriate [oe-core specific]
2
3libhugetlbfs depends on perl, and perl installs a directory 'perl'
4and make a symlink 'perl5' to it. So just install perl libs in
5libhugetlbfs to directory 'perl' instead of 'perl5'. This can avoid
6the following error:
7| CalledProcessError: Command 'tar -cf - -C .../perl/5.14.3-r1/sysroot-destdir
8| -ps . | tar -xf - -C .../tmp/sysroots/t4240qds'
9| returned non-zero exit status 2 with output
10| tar: ./usr/lib/perl5: Cannot create symlink to `perl': File exists
11| tar: Exiting with failure status due to previous errors
12
13
14Signed-off-by: Ting Liu <b28495@freescale.com>
15
16--- a/Makefileold 2013-10-11 23:07:31.759421318 -0500
17+++ b/Makefile 2013-10-11 23:08:01.935571122 -0500
18@@ -173,17 +173,17 @@
19 DOCDIR = $(PREFIX)/share/doc/libhugetlbfs
20
21 ifdef CC32
22-PMDIR = $(PREFIX)/lib/perl5/TLBC
23+PMDIR = $(PREFIX)/lib/perl/TLBC
24 endif
25
26 ifdef CC64
27 ifeq ($(ARCH),x86_64)
28-PMDIR = $(PREFIX)/lib/perl5/TLBC
29+PMDIR = $(PREFIX)/lib/perl/TLBC
30 else
31 ifeq ($(ARCH),aarch64)
32-PMDIR = $(PREFIX)/lib/perl5/TLBC
33+PMDIR = $(PREFIX)/lib/perl/TLBC
34 else
35-PMDIR = $(PREFIX)/lib64/perl5/TLBC
36+PMDIR = $(PREFIX)/lib64/perl/TLBC
37 endif
38 endif
39 endif
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
deleted file mode 100644
index 7caaf51e6..000000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-buildsys-don-t-add-usr-include-and-usr-lib-to-config.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From a130153ae84d8bb5914879cef94df09f06825c10 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 18 Jun 2011 11:25:36 +0200
4Subject: [PATCH] buildsys: don't add /usr/include and /usr/lib to configure tests for libusb
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 config/usrp_libusb.m4 | 13 -------------
9 1 files changed, 0 insertions(+), 13 deletions(-)
10
11diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
12index cc3410f..b421820 100644
13--- a/config/usrp_libusb.m4
14+++ b/config/usrp_libusb.m4
15@@ -117,10 +117,6 @@ AC_DEFUN([USRP_LIBUSB], [
16 dnl configured to find this header.
17 AC_LANG_PUSH(C)
18 save_CPPFLAGS="$CPPFLAGS"
19- if test x$USB_INCLUDEDIR != x; then
20- USB_INCLUDES="-I$USB_INCLUDEDIR"
21- CPPFLAGS="$USB_INCLUDES"
22- fi
23 AC_MSG_CHECKING([$libusb_name for header $usb_header])
24 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
25 #include "$usb_header"
26@@ -172,9 +168,6 @@ AC_DEFUN([USRP_LIBUSB], [
27 *)
28 AC_LANG_PUSH(C)
29 save_CPPFLAGS="$CPPFLAGS"
30- if test x$USB_INCLUDEDIR != x; then
31- CPPFLAGS="$USB_INCLUDES"
32- fi
33 save_LIBS="$LIBS"
34 LIBS="$USB_LIBS"
35 AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name])
36@@ -217,9 +210,6 @@ AC_DEFUN([USRP_LIBUSB], [
37 dnl final error checking, mostly to create #define's
38 AC_LANG_PUSH(C)
39 save_CPPFLAGS="$CPPFLAGS"
40- if test x$USB_INCLUDEDIR != x; then
41- CPPFLAGS="$USB_INCLUDES"
42- fi
43 dnl Check for the header.
44 AC_CHECK_HEADERS([$usb_header], [], [libusbok=no])
45 CPPFLAGS="$save_CPPFLAGS"
46@@ -231,9 +221,6 @@ AC_DEFUN([USRP_LIBUSB], [
47 dnl check for the library (again)
48 AC_LANG_PUSH(C)
49 save_CPPFLAGS="$CPPFLAGS"
50- if test x$USB_INCLUDEDIR != x; then
51- CPPFLAGS="$USB_INCLUDES"
52- fi
53 save_LIBS="$LIBS"
54 LIBS="$USB_LIBS"
55 AC_CHECK_LIB([$usb_lib_name], [$usb_lib_func], [], [
56--
571.6.6.1
58
diff --git a/meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch b/meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch
deleted file mode 100644
index 95b636dd8..000000000
--- a/meta-oe/recipes-connectivity/obex/openobex/disable-cable-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- openobex-1.2/apps/Makefile.am~disable-cable-test
7+++ openobex-1.2/apps/Makefile.am
8@@ -6,7 +6,7 @@
9 obex_io.c obex_io.h \
10 obex_put_common.c obex_put_common.h
11
12-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
13+bin_PROGRAMS = irxfer obex_tcp irobex_palm3
14
15 obex_test_SOURCES = \
16 obex_test.c obex_test.h \
diff --git a/meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch b/meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch
deleted file mode 100644
index 1177dfeac..000000000
--- a/meta-oe/recipes-connectivity/obex/openobex/libusb_crosscompile_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1--- /tmp/acinclude.m4 2009-04-12 10:32:15.000000000 +0200
2+++ openobex-1.5/acinclude.m4 2009-04-12 10:32:38.000000000 +0200
3@@ -158,7 +158,7 @@
4 ;;
5 *)
6 PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
7- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
8+ REQUIRES="libusb"
9 ;;
10 esac
11 AC_SUBST(USB_CFLAGS)
diff --git a/meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch b/meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch
deleted file mode 100644
index 8abf8ae24..000000000
--- a/meta-oe/recipes-connectivity/obex/openobex/separate_builddir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Fix detection of IrDA failing with B!=S
2
3Upstream-Status: Pending
4
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7--- a/acinclude.m4 2014-05-24 14:05:41.757796816 +0100
8+++ b/acinclude.m4 2014-05-24 14:03:06.556795536 +0100
9@@ -54,6 +54,7 @@
10 ])
11
12 AC_DEFUN([AC_PATH_IRDA_LINUX], [
13+ CPPFLAGS="${CPPFLAGS} -I${srcdir}"
14 AC_CACHE_CHECK([for IrDA support], irda_found, [
15 AC_TRY_COMPILE([
16 #include <sys/socket.h>
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch b/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch
deleted file mode 100644
index 306e3b821..000000000
--- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/create-as-shared-lib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1--- a/src/proxy-libintl/Makefile.org 2009-09-12 23:19:04.989421607 -0700
2+++ a/src/proxy-libintl/Makefile 2009-09-12 23:21:14.100640001 -0700
3@@ -4,20 +4,20 @@ ZIPFILE = proxy-libintl-$(TIMESTAMP).zip
4 CC = gcc
5 CFLAGS = -Wall -I ../../include
6
7-all : ../../lib/libintl.a ../../lib/intl.lib
8+all : ../../lib/libintl.so ../../lib/intl.lib
9
10-../../lib/libintl.a : libintl.o
11- ar rc $@ libintl.o
12+../../lib/libintl.so : libintl.o
13+ $(CC) -shared -o $@ libintl.o
14
15-../../lib/intl.lib : ../../lib/libintl.a
16- cp ../../lib/libintl.a $@
17- strip --strip-unneeded $@
18+../../lib/intl.lib : ../../lib/libintl.so
19+ cp ../../lib/libintl.so $@
20+ $(STRIP) --strip-unneeded $@
21
22 libintl.o : libintl.c
23 $(CC) $(CFLAGS) -c libintl.c
24
25 clean :
26- rm -f *.o ../../lib/libintl.a ../../$(ZIPFILE)
27+ rm -f *.o ../../lib/libintl.so ../../$(ZIPFILE)
28
29 dist : clean all
30- cd ../..; zip $(ZIPFILE) include/libintl.h lib/{libintl.a,intl.lib} src/proxy-libintl/{README.txt,COPYING.LIB.txt,Makefile,libintl.[ch]}; manifestify $(ZIPFILE)
31+ cd ../..; zip $(ZIPFILE) include/libintl.h lib/{libintl.so,intl.lib} src/proxy-libintl/{README.txt,COPYING.LIB.txt,Makefile,libintl.[ch]}; manifestify $(ZIPFILE)
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch b/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch
deleted file mode 100644
index 7186b13c0..000000000
--- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl-20100902/stub-only.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1Index: proxy-libintl/src/proxy-libintl/libintl.c
2===================================================================
3--- proxy-libintl.orig/src/proxy-libintl/libintl.c
4+++ proxy-libintl/src/proxy-libintl/libintl.c
5@@ -18,9 +18,12 @@
6 */
7
8 #ifdef _WIN32
9-#include <windows.h>
10+# include <windows.h>
11 #else
12-#include <dlfcn.h>
13+# include <stddef.h>
14+# if !STUB_ONLY
15+# include <dlfcn.h>
16+# endif
17 typedef void* HMODULE;
18 #endif
19
20@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese
21 static int
22 use_intl_dll (HMODULE dll)
23 {
24-#ifdef _WIN32
25-#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
26-#else
27-#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
28-#endif
29+#if !STUB_ONLY
30+# ifdef _WIN32
31+# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
32+# else
33+# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
34+# endif /* _WIN32 */
35+
36
37 LOOKUP (gettext);
38 LOOKUP (dgettext);
39@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll)
40 LOOKUP (bind_textdomain_codeset);
41
42 #undef LOOKUP
43-
44+#endif /* !STUB_ONLY */
45 return 1;
46 }
47
48@@ -171,13 +176,17 @@ setup (void)
49
50 if (!beenhere)
51 {
52-#ifdef _WIN32
53- HMODULE intl_dll = LoadLibrary ("intl.dll");
54-#elif defined(__APPLE__) && defined(__MACH__)
55- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
56-#else
57- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
58-#endif
59+#if !STUB_ONLY
60+# ifdef _WIN32
61+ HMODULE intl_dll = LoadLibrary ("intl.dll");
62+# elif defined(__APPLE__) && defined(__MACH__)
63+ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
64+# else
65+ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
66+# endif
67+#else /* !STUB_ONLY */
68+ HMODULE intl_dll = NULL;
69+#endif /* STUB_ONLY */
70
71 if (intl_dll != NULL &&
72 use_intl_dll (intl_dll))
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
deleted file mode 100644
index 7da13ee3d..000000000
--- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-to-fix-lib64-can-not-be-shiped-in-64bit-target.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From f3c39fd2a4b5f53338b5f821788c63858bf860cf Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Sun, 2 Aug 2015 22:08:43 +0900
4Subject: [PATCH] to fix lib64 can not be shiped in 64bit target
5
6To fix the warning as following:
7WARNING: QA Issue: konkretcmpi: Files/directories were installed but not shipped in any package:
8 /usr/lib64
9 /usr/lib64/libkonkret.so
10 /usr/lib64/libkonkret.so.0.0.1
11 /usr/lib64/libkonkret.so.0
12 /usr/lib64/libkonkretmof.so.0.0.1
13 /usr/lib64/libkonkretmof.so
14 ...
15
16Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
17---
18 cmake/modules/FindKonkretCMPI.cmake | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/cmake/modules/FindKonkretCMPI.cmake b/cmake/modules/FindKonkretCMPI.cmake
22index b888cfd..097caed 100644
23--- a/cmake/modules/FindKonkretCMPI.cmake
24+++ b/cmake/modules/FindKonkretCMPI.cmake
25@@ -9,7 +9,7 @@ find_path(KONKRETCMPI_INCLUDE_DIR
26 find_library(KONKRETCMPI_LIBRARY
27 NAMES konkret
28 HINTS $ENV{KONKRETCMPI_LIB_DIR}
29- PATH_SUFFIXES lib64 lib
30+ PATH_SUFFIXES lib lib64
31 PATHS /usr /usr/local
32 )
33
34--
351.8.4.2
36
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch
deleted file mode 100644
index e3c4aaae5..000000000
--- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1The local function eaccess conflicts with a glibc function of the same name.
2Rename the function so that this can be build under glibc 2.4, and older
3revisions, without any problems.
4
5--- liblockfile-1.06/dotlockfile.c 2006/07/10 03:17:40 1.1
6+++ liblockfile-1.06/dotlockfile.c 2006/07/10 03:18:26
7@@ -42,7 +42,7 @@
8 extern int optind;
9 #endif
10
11-extern int eaccess(char *, gid_t, struct stat *);
12+extern int xeaccess(char *, gid_t, struct stat *);
13
14 /*
15 * Sleep for an amout of time while regulary checking if
16@@ -252,14 +252,14 @@
17 return L_ERROR;
18 }
19 gid = getgid();
20- if (eaccess(dir, gid, &st) < 0) {
21+ if (xeaccess(dir, gid, &st) < 0) {
22 if (errno == ENOENT) {
23 enoent:
24 if (!quiet) fprintf(stderr,
25 "dotlockfile: %s: no such directory\n", dir);
26 return L_TMPLOCK;
27 }
28- if ((r = eaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
29+ if ((r = xeaccess(dir, getegid(), &st) < 0) && errno == ENOENT)
30 goto enoent;
31 if (r < 0 || !ismaillock(lockfile, pwd->pw_name)) {
32 if (!quiet) fprintf(stderr,
33@@ -272,7 +272,7 @@
34 /*
35 * Now we should be able to chdir() to the lock directory.
36 * When we stat("."), it should be the same as at the
37- * eaccess() check or someone played symlink() games on us.
38+ * xeaccess() check or someone played symlink() games on us.
39 */
40 if (chdir(dir) < 0 || stat(".", &st2) < 0) {
41 if (!quiet) fprintf(stderr,
42--- liblockfile-1.06/lockfile.c 2006/07/10 03:17:40 1.1
43+++ liblockfile-1.06/lockfile.c 2006/07/10 03:18:26
44@@ -54,7 +54,7 @@
45 #ifdef LIB
46 static
47 #endif
48-int eaccess(char *fn, gid_t gid, struct stat *st)
49+int xeaccess(char *fn, gid_t gid, struct stat *st)
50 {
51 struct stat tmp;
52 uid_t uid = geteuid();
53@@ -96,7 +96,7 @@
54 *p = 0;
55 else
56 strcpy(dir, ".");
57- if (eaccess(dir, egid, NULL) >= 0) {
58+ if (xeaccess(dir, egid, NULL) >= 0) {
59 free(dir);
60 return 0;
61 }
62@@ -111,7 +111,7 @@
63 return 0;
64 mailgid = st.st_gid;
65 }
66- ret = eaccess(dir, mailgid, NULL) >= 0;
67+ ret = xeaccess(dir, mailgid, NULL) >= 0;
68 free (dir);
69 return ret;
70 }
diff --git a/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch b/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch
deleted file mode 100644
index 16137da2b..000000000
--- a/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1diff -uwr mg-20110905/configure mg-20110905-changed/configure
2--- mg-20110905/configure 2011-09-05 13:36:16.000000000 -0500
3+++ mg-20110905-changed/configure 2014-08-14 10:46:14.168715425 -0500
4@@ -163,32 +163,6 @@
5 echo 'Fails.'
6 fi
7
8-
9-if [ ! -r /usr/include/term.h ]; then
10- note 'term.h'
11- if [ -r /usr/include/ncurses/term.h ]; then
12- echo "Found in /usr/include/ncurses"
13- extraflags="$extraflags -I/usr/include/ncurses"
14- else
15- for i in pkg local; do
16- if [ -r /usr/$i/include/term.h ]; then
17- echo "Found in /usr/$i/include"
18- extralibs="$extralibs -L/usr/$i/lib"
19- extraflags="$extraflags -I/usr/$i/include"
20- break
21- else
22- false
23- fi
24- done ||
25- {
26- echo 'Not found!' >&2
27- echo 'Do you have the ncurses devel package installed?' >&2
28- echo 'If you know where term.h is, please email the author!' >&2
29- exit 1
30- }
31- fi
32-fi
33-
34 note 'base and dirname'
35 if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then
36 echo 'Not present, adding.'
diff --git a/meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch b/meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch
deleted file mode 100644
index 2a74b6850..000000000
--- a/meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch
+++ /dev/null
@@ -1,162 +0,0 @@
1From 02a24ac541df68033d4efd7e2f8a1b92dc49328d Mon Sep 17 00:00:00 2001
2From: Li xin <lixin.fnst@cn.fujitsu.com>
3Date: Mon, 27 Jul 2015 05:06:20 +0900
4Subject: [PATCH] M2Crypto: Error fix.
5
6After swig upgrade from 3.0.2 to 3.0.6,build the recipes which
7depends on python-m2crypto will occur errors like this:
8SALT_LEN = m2.PKCS5_SALT_LEN
9AttributeError: 'module' object has no attribute 'PKCS5_SALT_LEN'
10since python-m2crypto depends on swig-native
11
12Ref:
13https://github.com/martinpaljak/M2Crypto/issues/60#issuecomment-75735489
14
15This patch is from:
16http://pkgs.fedoraproject.org/cgit/m2crypto.git/tree/m2crypto-0.21.1-swig-3.0.5.patch
17
18Upstream-Status: pending
19
20Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
21---
22 M2Crypto/__init__.py | 4 ++--
23 M2Crypto/m2.py | 2 +-
24 SWIG/_lib.i | 4 ++++
25 SWIG/_pkcs7.i | 1 +
26 setup.py | 26 +++++++++++++++++++++++++-
27 5 files changed, 33 insertions(+), 4 deletions(-)
28
29diff --git a/M2Crypto/__init__.py b/M2Crypto/__init__.py
30index e7acfe7..02f4d28 100644
31--- a/M2Crypto/__init__.py
32+++ b/M2Crypto/__init__.py
33@@ -19,7 +19,7 @@ Copyright 2008-2011 Heikki Toivonen. All rights reserved.
34 version_info = (0, 21, 1)
35 version = '.'.join([str(_v) for _v in version_info])
36
37-import __m2crypto
38+import _m2crypto
39 import m2
40 import ASN1
41 import AuthCookie
42@@ -57,4 +57,4 @@ import util
43 encrypt=1
44 decrypt=0
45
46-__m2crypto.lib_init()
47+_m2crypto.lib_init()
48diff --git a/M2Crypto/m2.py b/M2Crypto/m2.py
49index e4bb695..822143f 100644
50--- a/M2Crypto/m2.py
51+++ b/M2Crypto/m2.py
52@@ -25,7 +25,7 @@ Portions created by Open Source Applications Foundation (OSAF) are
53 Copyright (C) 2004 OSAF. All Rights Reserved.
54 """
55
56-from __m2crypto import *
57+from _m2crypto import *
58 lib_init()
59
60
61diff --git a/SWIG/_lib.i b/SWIG/_lib.i
62index 42dc180..47a53b8 100644
63--- a/SWIG/_lib.i
64+++ b/SWIG/_lib.i
65@@ -100,6 +100,7 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) {
66 int cret;
67 int new_style_callback = 0, warning_raised_exception=0;
68 PyGILState_STATE gilstate;
69+ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
70
71 ssl = (SSL *)X509_STORE_CTX_get_app_data(ctx);
72
73@@ -185,6 +186,7 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) {
74 void ssl_info_callback(const SSL *s, int where, int ret) {
75 PyObject *argv, *retval, *_SSL;
76 PyGILState_STATE gilstate;
77+ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
78
79 gilstate = PyGILState_Ensure();
80
81@@ -204,6 +206,7 @@ DH *ssl_set_tmp_dh_callback(SSL *ssl, int is_export, int keylength) {
82 PyObject *argv, *ret, *_ssl;
83 DH *dh;
84 PyGILState_STATE gilstate;
85+ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
86
87 gilstate = PyGILState_Ensure();
88
89@@ -227,6 +230,7 @@ RSA *ssl_set_tmp_rsa_callback(SSL *ssl, int is_export, int keylength) {
90 PyObject *argv, *ret, *_ssl;
91 RSA *rsa;
92 PyGILState_STATE gilstate;
93+ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
94
95 gilstate = PyGILState_Ensure();
96
97diff --git a/SWIG/_pkcs7.i b/SWIG/_pkcs7.i
98index 174f40a..7bffbfc 100644
99--- a/SWIG/_pkcs7.i
100+++ b/SWIG/_pkcs7.i
101@@ -157,6 +157,7 @@ PyObject *smime_read_pkcs7(BIO *bio) {
102 BIO *bcont = NULL;
103 PKCS7 *p7;
104 PyObject *tuple, *_p7, *_BIO;
105+ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */
106
107 if (BIO_method_type(bio) == BIO_TYPE_MEM) {
108 /* OpenSSL FAQ explains that this is needed for mem BIO to return EOF,
109diff --git a/setup.py b/setup.py
110index e7c49eb..b98abe0 100644
111--- a/setup.py
112+++ b/setup.py
113@@ -20,6 +20,7 @@ except ImportError:
114 from distutils.command import build_ext
115
116 from distutils.core import Extension
117+from distutils.file_util import copy_file
118
119
120 class _M2CryptoBuildExt(build_ext.build_ext):
121@@ -57,7 +58,17 @@ class _M2CryptoBuildExt(build_ext.build_ext):
122 self.swig_opts.append('-includeall')
123 #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
124 #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
125-
126+ self.swig_opts.append('-modern')
127+ self.swig_opts.append('-builtin')
128+
129+ # These two lines are a workaround for
130+ # http://bugs.python.org/issue2624 , hard-coding that we are only
131+ # building a single extension with a known path; a proper patch to
132+ # distutils would be in the run phase, when extension name and path are
133+ # known.
134+ self.swig_opts.append('-outdir')
135+ self.swig_opts.append(os.path.join(self.build_lib, 'M2Crypto'))
136+
137 self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
138 os.path.join(os.getcwd(), 'SWIG')]
139
140@@ -71,6 +82,19 @@ class _M2CryptoBuildExt(build_ext.build_ext):
141
142 self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
143
144+ def run(self):
145+ '''Overloaded build_ext implementation to allow inplace=1 to work,
146+ which is needed for (python setup.py test).'''
147+ # This is another workaround for http://bugs.python.org/issue2624 + the
148+ # corresponding lack of support in setuptools' test command. Note that
149+ # just using self.inplace in finalize_options() above does not work
150+ # because swig is not rerun if the __m2crypto.so extension exists.
151+ # Again, hard-coding our extension name and location.
152+ build_ext.build_ext.run(self)
153+ if self.inplace:
154+ copy_file(os.path.join(self.build_lib, 'M2Crypto', '_m2crypto.py'),
155+ os.path.join('M2Crypto', '_m2crypto.py'),
156+ verbose=self.verbose, dry_run=self.dry_run)
157
158 if sys.version_info < (2,4):
159
160--
1611.8.4.2
162
diff --git a/meta-python/recipes-devtools/python/python-numeric/no-lapack.patch b/meta-python/recipes-devtools/python/python-numeric/no-lapack.patch
deleted file mode 100644
index c1916b8b9..000000000
--- a/meta-python/recipes-devtools/python/python-numeric/no-lapack.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- Numeric-23.7/setup.py~nolapack
7+++ Numeric-23.7/setup.py
8@@ -32,7 +32,7 @@
9 mathlibs = []
10
11 # delete all but the first one in this list if using your own LAPACK/BLAS
12-sourcelist = [os.path.join('Src', 'lapack_litemodule.c'),
13+sourcelist = [
14 #os.path.join('Src', 'blas_lite.c'),
15 #os.path.join('Src', 'f2c_lite.c'),
16 #os.path.join('Src', 'zlapack_lite.c'),
17@@ -40,12 +40,12 @@
18 ]
19 # set these to use your own BLAS;
20
21-library_dirs_list = ['/usr/lib/atlas']
22-libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c']
23+library_dirs_list = []
24+libraries_list = []
25
26 # set to true (1), if you also want BLAS optimized matrixmultiply/dot/innerproduct
27-use_dotblas = 1
28-include_dirs = ['/usr/include/atlas']
29+use_dotblas = 0
30+include_dirs = []
31 # You may need to set this to find cblas.h
32 # e.g. on UNIX using ATLAS this should be ['/usr/include/atlas']
33 extra_link_args = []
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/fix-libtool-name.patch b/meta-webserver/recipes-httpd/apache2/apache2/fix-libtool-name.patch
deleted file mode 100644
index 027af04c3..000000000
--- a/meta-webserver/recipes-httpd/apache2/apache2/fix-libtool-name.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1Fix build scripts to use correct libtool filename
2
3Upstream-Status: Inappropriate [configuration]
4
5---
6 httpd-2.4.2/build/config_vars.sh.in | 2 +-
7 httpd-2.4.2/configure | 2 +-
8 httpd-2.4.2/configure.in | 2 +-
9 httpd-2.4.2/support/apxs.in | 2 +-
10 4 files changed, 4 insertions(+), 4 deletions(-)
11
12--- a/build/config_vars.sh.in
13+++ b/build/config_vars.sh.in
14@@ -35,7 +35,7 @@ else
15 APU_CONFIG=@APU_CONFIG@
16 fi
17
18-APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`"
19+APR_LIBTOOL="`${APR_CONFIG} --apr-libtool | sed -e s,libtool,${host_alias}-libtool,`"
20 APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
21 test -n "@APU_CONFIG@" && APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
22
23--- a/configure
24+++ b/configure
25@@ -6205,7 +6205,7 @@ case $host in
26 if test "x$LTFLAGS" = "x"; then
27 LTFLAGS='--silent'
28 fi
29- my_libtool=`$apr_config --apr-libtool`
30+ my_libtool=`$apr_config --apr-libtool | sed -e s,libtool,${host_alias}-libtool,`
31 LIBTOOL="$my_libtool \$(LTFLAGS)"
32 libtoolversion=`$my_libtool --version`
33 case $libtoolversion in
34--- a/configure.in
35+++ b/configure.in
36@@ -264,7 +264,7 @@ case $host in
37 if test "x$LTFLAGS" = "x"; then
38 LTFLAGS='--silent'
39 fi
40- my_libtool=`$apr_config --apr-libtool`
41+ my_libtool=`$apr_config --apr-libtool | sed -e s,libtool,${host_alias}-libtool,`
42 LIBTOOL="$my_libtool \$(LTFLAGS)"
43 libtoolversion=`$my_libtool --version`
44 case $libtoolversion in
45--- a/support/apxs.in
46+++ b/support/apxs.in
47@@ -352,7 +352,7 @@ if ($apr_major_version < 2) {
48 }
49 }
50
51-my $libtool = `$apr_config --apr-libtool`;
52+my $libtool = `$apr_config --apr-libtool| sed -e s,libtool,${host_alias}-libtool,`;
53 chomp($libtool);
54
55 my $apr_includedir = `$apr_config --includes`;
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 23:33:24 +0000