[droid] libs: add a few links to libmath
authortheuni <theuni-nospam-@xbmc.org>
Sun, 10 Jun 2012 06:47:22 +0000 (02:47 -0400)
committerCory Fields <theuni-nospam-@xbmc.org>
Wed, 8 Aug 2012 22:59:20 +0000 (18:59 -0400)
Since android is so picky about undefined symbols, as a test-build I disabled
--unresolved-symbols=ignore-all
and enabled
-Wl,--no-unresolved

I then changed the wrapper.def to point to the real libxbmc so that our wrapped
symbols could be found. In addition to the previous cmyth commit, these turned
up as needing -lm.

With this, all libs that link against libxbmc as well as the ones we build are
verified as having no undefined symbols.

Curse you bionic.

lib/libdvd/Makefile.in
lib/libhdhomerun/Makefile.in
lib/nosefart/Makefile.in
lib/xbadpcm/Makefile.in

index 1534f33..69d2286 100644 (file)
@@ -56,11 +56,11 @@ else
 
 $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
        $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
-               libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all \
+               libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
                `cat $(WRAPPER:.o=.def)` $(WRAPPER)
 
 $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
-       $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
+       $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
                -Wl,--unresolved-symbols=ignore-all \
                `cat $(WRAPPER:.o=.def)` $(WRAPPER)
 
index 825bbde..ce909c1 100644 (file)
@@ -24,7 +24,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
                -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
                @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
 else
-       $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all \
+       $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all -lm \
                `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \
                @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
 endif
index f8a8397..0da88b6 100644 (file)
@@ -31,7 +31,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
        -bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
        @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
 else
-       $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
+       $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all -lm \
                `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
 endif
 
index 2a53042..0a2bc43 100644 (file)
@@ -12,7 +12,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
        @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o *.o $(BUNDLE1_O)
        chmod +x $@
 else
-       $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ *.o -Wl,--unresolved-symbols=ignore-all \
+       $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ *.o -Wl,--unresolved-symbols=ignore-all -lm \
                `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
 endif