Update openembedded-core / meta-openembedded / bitbake (1.25.0)

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-devtools / opkg / opkg / 0003-Statically-link-libopkg-and-libbb.patch

diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch
deleted file mode 100644 (file)
index cfb7268..0000000
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 698fdfccb2b2855fbe73ecad159b7987b49ddded Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:23:43 +0200
-Subject: [PATCH 03/10] Statically link libopkg and libbb
-
-* Based on https://dev.openwrt.org/browser/trunk/package/opkg/patches/007-force_static.patch
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libbb/Makefile.am   |    8 ++++----
- libopkg/Makefile.am |   14 +++-----------
- src/Makefile.am     |    4 ++--
- tests/Makefile.am   |    6 +++---
- 4 files changed, 12 insertions(+), 20 deletions(-)
-
-diff --git a/libbb/Makefile.am b/libbb/Makefile.am
-index 1cc82df..337d94f 100644
---- a/libbb/Makefile.am
-+++ b/libbb/Makefile.am
-@@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@
- BUILD_CPU=@build_cpu@
- ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@
- 
--noinst_LTLIBRARIES = libbb.la
-+noinst_LIBRARIES = libbb.a
- 
--libbb_la_SOURCES = gz_open.c \
-+libbb_a_SOURCES = gz_open.c \
-       libbb.h \
-       unzip.c \
-       wfopen.c \
-@@ -22,5 +22,5 @@ libbb_la_SOURCES = gz_open.c \
-       all_read.c \
-       mode_string.c
- 
--libbb_la_CFLAGS = $(ALL_CFLAGS)
--#libbb_la_LDFLAGS = -static
-+libbb_a_CFLAGS = $(ALL_CFLAGS)
-+#libbb_a_LDFLAGS = -static
-diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
-index 043c5c4..5882595 100644
---- a/libopkg/Makefile.am
-+++ b/libopkg/Makefile.am
-@@ -38,18 +38,10 @@ if HAVE_SHA256
- opkg_util_sources += sha256.c sha256.h
- endif
- 
--lib_LTLIBRARIES = libopkg.la
--libopkg_la_SOURCES = \
-+noinst_LIBRARIES = libopkg.a
-+libopkg_a_SOURCES = \
-       $(opkg_libcore_sources) \
-       $(opkg_cmd_sources) $(opkg_db_sources) \
-       $(opkg_util_sources) $(opkg_list_sources)
- 
--libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
--
--libopkg_la_LDFLAGS = -version-info 1:0:0
--
--# make sure we only export symbols that are for public use
--#libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*"
--
--
--
-+libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index efdc19d..bb7a792 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${ALL_CFLAGS}
- bin_PROGRAMS = opkg-cl
- 
- opkg_cl_SOURCES = opkg-cl.c
--opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
--                $(top_builddir)/libbb/libbb.la 
-+opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \
-+                $(top_builddir)/libbb/libbb.a
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 1a6f565..132c792 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -4,11 +4,11 @@ AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 -I${top_srcdir}/libopkg
- #noinst_PROGRAMS = libopkg_test opkg_active_list_test
- noinst_PROGRAMS = libopkg_test
- 
--#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
-+#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
- #opkg_hash_test_SOURCES = opkg_hash_test.c
- #opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
- 
--#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
-+#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
- #opkg_extract_test_SOURCES = opkg_extract_test.c
- #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
- 
-@@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test
- #opkg_active_list_test_SOURCES = opkg_active_list_test.c
- #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
- 
--libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la
-+libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a
- libopkg_test_SOURCE = libopkg_test.c
- libopkg_test_LDFLAGS = -static
- 
--- 
-1.7.9.5
-