007-force_static.patch 2.4 KB

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