X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/628a773644c5a866608e28752f563f555a954597..f0589f7290ba958bbefaf5394b155d37c72a185e:/package/opkg/patches/007-force_static.patch diff --git a/package/opkg/patches/007-force_static.patch b/package/opkg/patches/007-force_static.patch index b433eed05..12a7cc66e 100644 --- a/package/opkg/patches/007-force_static.patch +++ b/package/opkg/patches/007-force_static.patch @@ -1,8 +1,8 @@ --- a/libopkg/Makefile.am +++ b/libopkg/Makefile.am -@@ -30,15 +30,10 @@ opkg_util_sources = file_util.c file_uti - sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \ - xregex.c xregex.h xsystem.c xsystem.h +@@ -35,16 +35,10 @@ if HAVE_SHA256 + opkg_util_sources += sha256.c sha256.h + endif -lib_LTLIBRARIES = libopkg.la -libopkg_la_SOURCES = \ @@ -12,13 +12,14 @@ $(opkg_cmd_sources) $(opkg_db_sources) \ $(opkg_util_sources) $(opkg_list_sources) --libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) +-libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) +- -# make sure we only export symbols that are for public use --libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*" +-#libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*" - - - -+libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) ++libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) --- a/libbb/Makefile.am +++ b/libbb/Makefile.am @@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@ @@ -33,18 +34,22 @@ libbb.h \ unzip.c \ wfopen.c \ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${AL - bin_PROGRAMS = opkg-cl - - opkg_cl_SOURCES = opkg-frontend.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 --- a/tests/Makefile.am +++ b/tests/Makefile.am +@@ -4,11 +4,11 @@ AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 - + #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) @@ -52,5 +57,15 @@ -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 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${AL + 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