package/system/opkg/patches/007-force_static.patch

   1 --- a/libopkg/Makefile.am
   2 +++ b/libopkg/Makefile.am
   3 @@ -38,16 +38,10 @@
   4  opkg_util_sources += sha256.c sha256.h
   5  endif
   6
   7 -lib_LTLIBRARIES = libopkg.la
   8 -libopkg_la_SOURCES = \
   9 +noinst_LIBRARIES = libopkg.a
  10 +libopkg_a_SOURCES = \
  11         $(opkg_libcore_sources) \
  12         $(opkg_cmd_sources) $(opkg_db_sources) \
  13         $(opkg_util_sources) $(opkg_list_sources)
  14
  15 -libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
  16 -
  17 -# make sure we only export symbols that are for public use
  18 -#libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*"
  19 -
  20 -
  21 -
  22 +libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a
  23 --- a/libbb/Makefile.am
  24 +++ b/libbb/Makefile.am
  25 @@ -2,9 +2,9 @@
  26  BUILD_CPU=@build_cpu@
  27  ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@
  28
  29 -noinst_LTLIBRARIES = libbb.la
  30 +noinst_LIBRARIES = libbb.a
  31
  32 -libbb_la_SOURCES = gz_open.c \
  33 +libbb_a_SOURCES = gz_open.c \
  34         libbb.h \
  35         unzip.c \
  36         wfopen.c \
  37 --- a/tests/Makefile.am
  38 +++ b/tests/Makefile.am
  39 @@ -4,11 +4,11 @@
  40  #noinst_PROGRAMS = libopkg_test opkg_active_list_test
  41  noinst_PROGRAMS = libopkg_test
  42
  43 -#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
  44 +#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
  45  #opkg_hash_test_SOURCES = opkg_hash_test.c
  46  #opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
  47
  48 -#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
  49 +#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
  50  #opkg_extract_test_SOURCES = opkg_extract_test.c
  51  #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
  52
  53 @@ -16,7 +16,7 @@
  54  #opkg_active_list_test_SOURCES = opkg_active_list_test.c
  55  #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
  56
  57 -libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la
  58 +libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
  59  libopkg_test_SOURCE = libopkg_test.c
  60  libopkg_test_LDFLAGS = -static
  61
  62 --- a/src/Makefile.am
  63 +++ b/src/Makefile.am
  64 @@ -2,5 +2,5 @@
  65  bin_PROGRAMS = opkg-cl
  66
  67  opkg_cl_SOURCES = opkg-cl.c
  68 -opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
  69 -                $(top_builddir)/libbb/libbb.la
  70 +opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \
  71 +                $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)