b433eed05ea9646eb3530fb1fae866bc386d061f
[openwrt/svn-archive/archive.git] / package / opkg / patches / 007-force_static.patch
1 --- a/libopkg/Makefile.am
2 +++ b/libopkg/Makefile.am
3 @@ -30,15 +30,10 @@ opkg_util_sources = file_util.c file_uti
4 sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \
5 xregex.c xregex.h xsystem.c xsystem.h
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)
16 -# make sure we only export symbols that are for public use
17 -libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*"
18 -
19 -
20 -
21 +libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS)
22 --- a/libbb/Makefile.am
23 +++ b/libbb/Makefile.am
24 @@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@
25 BUILD_CPU=@build_cpu@
26 ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@
27
28 -noinst_LTLIBRARIES = libbb.la
29 +noinst_LIBRARIES = libbb.a
30
31 -libbb_la_SOURCES = gz_open.c \
32 +libbb_a_SOURCES = gz_open.c \
33 libbb.h \
34 unzip.c \
35 wfopen.c \
36 --- a/src/Makefile.am
37 +++ b/src/Makefile.am
38 @@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${AL
39 bin_PROGRAMS = opkg-cl
40
41 opkg_cl_SOURCES = opkg-frontend.c
42 -opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
43 - $(top_builddir)/libbb/libbb.la
44 +opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \
45 + $(top_builddir)/libbb/libbb.a
46 --- a/tests/Makefile.am
47 +++ b/tests/Makefile.am
48 @@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test
49 #opkg_active_list_test_SOURCES = opkg_active_list_test.c
50 #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
51
52 -libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la
53 +libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a
54 libopkg_test_SOURCE = libopkg_test.c
55
56