From 973bc35b6a4828e7caa129f1a34b6828aa72e20c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 25 Jul 2016 11:00:48 +0200 Subject: mklibs-native: drop in favour of newer oe-core one Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- recipes-devtools/mklibs/files/ac_init_fix.patch | 19 ---------- .../mklibs/files/fix_STT_GNU_IFUNC.patch | 26 ------------- .../mklibs/files/include-unistd.h-for-gcc47.patch | 43 ---------------------- recipes-devtools/mklibs/mklibs-native_0.1.34.bb | 27 -------------- 4 files changed, 115 deletions(-) delete mode 100644 recipes-devtools/mklibs/files/ac_init_fix.patch delete mode 100644 recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch delete mode 100644 recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch delete mode 100644 recipes-devtools/mklibs/mklibs-native_0.1.34.bb (limited to 'recipes-devtools') diff --git a/recipes-devtools/mklibs/files/ac_init_fix.patch b/recipes-devtools/mklibs/files/ac_init_fix.patch deleted file mode 100644 index 422af10..0000000 --- a/recipes-devtools/mklibs/files/ac_init_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Get the version of mklibs by simpler means. The MKLIBS_VERSION string in the -configure.ac file is replaced with real version string by the -do_configure_prepend() function from the recipe .bb file. - -Upstream-Status: Inappropriate [configuration] - -Nitin A Kamble -Date: 2011/01/24 - -Index: mklibs/configure.ac -=================================================================== ---- mklibs.orig/configure.ac 2010-02-21 17:34:56.000000000 -0800 -+++ mklibs/configure.ac 2011-01-24 18:52:19.943242079 -0800 -@@ -1,4 +1,4 @@ --AC_INIT([mklibs],m4_esyscmd(dpkg-parsechangelog | perl -ne 'print $1 if m/^Version: (.*)$/;')) -+AC_INIT([mklibs], MKLIBS_VERSION) - AM_INIT_AUTOMAKE([foreign no-define]) - AC_CONFIG_HEADERS([config.h]) - AM_MAINTAINER_MODE diff --git a/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch b/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch deleted file mode 100644 index d27a489..0000000 --- a/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch +++ /dev/null @@ -1,26 +0,0 @@ -The libc6-dev in Ubuntu 9.04 is so old that the elf.h doesn't -define STT_GNU_IFUNC, so we have to define it ourselves. - -Upstream-Status: Inappropriate [other] - old release specific, maybe removable - --- Dexuan Cui (dexuan.cui@intel.com) Feb 16, 2011. - -diff --git a/src/mklibs-readelf/main.cpp b/src/mklibs-readelf/main.cpp -index 2444c39..56d93f8 100644 ---- a/src/mklibs-readelf/main.cpp -+++ b/src/mklibs-readelf/main.cpp -@@ -6,6 +6,14 @@ - #include - - #include -+/* -+ * The /usr/include/elf.h in some distributions(like Ubuntu 9.04) doesn't -+ * define the macro. We need to define it here. -+ */ -+#ifndef STT_GNU_IFUNC -+#define STT_GNU_IFUNC 10 /* Symbol is indirect code object */ -+#endif -+ - #include - - #include "elf.hpp" diff --git a/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch b/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch deleted file mode 100644 index baa12bd..0000000 --- a/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch +++ /dev/null @@ -1,43 +0,0 @@ -include to fix build on gcc 4.7 - -Many of the standard C++ library include files have been edited to no -longer include to remove namespace pollution in gcc 4.7, so -we need include manually sometimes. - -mklibs (0.1.33+nmu1) UNRELEASED; urgency=low - * Non-maintainer upload - * Fix FTBFS with gcc 4.7 due to missing include (Closes: #667282). - --- Cyril Brulebois Thu, 05 Apr 2012 00:15:27 +0000 - -mklibs (0.1.33) unstable; urgency=low - - * Adjust the libc_pic directory for multiarch as well. - -Upstream-Status: Backport - -Signed-off-by: Robert Yang - -[Added upstream information about patch] - -Signed-off-by: Saul Wold - ---- - src/mklibs-readelf/elf.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mklibs-readelf/elf.cpp b/src/mklibs-readelf/elf.cpp -index 444f330..654c46f 100644 ---- a/src/mklibs-readelf/elf.cpp -+++ b/src/mklibs-readelf/elf.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - using namespace Elf; - --- -1.7.10 - diff --git a/recipes-devtools/mklibs/mklibs-native_0.1.34.bb b/recipes-devtools/mklibs/mklibs-native_0.1.34.bb deleted file mode 100644 index b65e96b..0000000 --- a/recipes-devtools/mklibs/mklibs-native_0.1.34.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "mklibs produces cut-down shared libraries" -DESCRIPTION = "mklibs produces cut-down shared libraries that contain only the routines required by a particular set of executables." -HOMEPAGE = "https://code.launchpad.net/mklibs" -SECTION = "devel" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64" -DEPENDS = "python-native" - -PR = "r1" - -SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.gz \ - file://ac_init_fix.patch\ - file://fix_STT_GNU_IFUNC.patch\ -" -# file://include-unistd.h-for-gcc47.patch \ -#" - -SRC_URI[md5sum] = "afe0ed527ba96b8a882b5de350603007" -SRC_URI[sha256sum] = "0c13c314f5c397529f58a5a02d57d83aeb4463d6a0d80b9374c6576ec37ed39f" - -S = "${WORKDIR}/${BPN}-${PV}" - -inherit autotools gettext native - -do_configure_prepend() { - sed "s+MKLIBS_VERSION+${PV}+" ${S}/configure.ac -} -- cgit v1.2.3