Skip to content

Commit a0df101

Browse files
author
theuni
committed
[droid] libs: add a few links to libmath
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.
1 parent 3a17cd7 commit a0df101

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

lib/libdvd/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ else
5656

5757
$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
5858
$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
59-
libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all \
59+
libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
6060
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
6161

6262
$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
63-
$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
63+
$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
6464
-Wl,--unresolved-symbols=ignore-all \
6565
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
6666

lib/libhdhomerun/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
2424
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
2525
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS)
2626
else
27-
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all \
27+
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -shared -o $@ -Wl,--unresolved-symbols=ignore-all -lm \
2828
`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` \
2929
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
3030
endif

lib/nosefart/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
3131
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
3232
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
3333
else
34-
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all \
34+
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) -Wl,--unresolved-symbols=ignore-all -lm \
3535
`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
3636
endif
3737

lib/xbadpcm/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ifeq ($(findstring osx,$(ARCH)), osx)
1212
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o *.o $(BUNDLE1_O)
1313
chmod +x $@
1414
else
15-
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ *.o -Wl,--unresolved-symbols=ignore-all \
15+
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ *.o -Wl,--unresolved-symbols=ignore-all -lm \
1616
`cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
1717
endif
1818

0 commit comments

Comments
 (0)