From 1dafb9bb0a1eca99a42c5996075b5885586233c5 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sat, 25 Dec 2021 22:51:16 +0100 Subject: [PATCH] libhdhomerun: make lib static --- .../addon-depends}/libhdhomerun/package.mk | 8 +-- .../patches/shared-to-static.patch | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 7 deletions(-) rename packages/{multimedia => addons/addon-depends}/libhdhomerun/package.mk (79%) create mode 100644 packages/addons/addon-depends/libhdhomerun/patches/shared-to-static.patch diff --git a/packages/multimedia/libhdhomerun/package.mk b/packages/addons/addon-depends/libhdhomerun/package.mk similarity index 79% rename from packages/multimedia/libhdhomerun/package.mk rename to packages/addons/addon-depends/libhdhomerun/package.mk index 28b9719f15..ba6a921516 100644 --- a/packages/multimedia/libhdhomerun/package.mk +++ b/packages/addons/addon-depends/libhdhomerun/package.mk @@ -14,15 +14,9 @@ PKG_LONGDESC="The library provides functionality to setup the HDHomeRun." PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=${TARGET_PREFIX}" makeinstall_target() { - mkdir -p ${INSTALL}/usr/bin - cp -PR hdhomerun_config ${INSTALL}/usr/bin - - mkdir -p ${INSTALL}/usr/lib/ - cp -PR libhdhomerun.so ${INSTALL}/usr/lib/ - mkdir -p ${SYSROOT_PREFIX}/usr/include/hdhomerun cp *.h ${SYSROOT_PREFIX}/usr/include/hdhomerun mkdir -p ${SYSROOT_PREFIX}/usr/lib - cp libhdhomerun.so ${SYSROOT_PREFIX}/usr/lib + cp libhdhomerun.a ${SYSROOT_PREFIX}/usr/lib } diff --git a/packages/addons/addon-depends/libhdhomerun/patches/shared-to-static.patch b/packages/addons/addon-depends/libhdhomerun/patches/shared-to-static.patch new file mode 100644 index 0000000000..7c9e53aca2 --- /dev/null +++ b/packages/addons/addon-depends/libhdhomerun/patches/shared-to-static.patch @@ -0,0 +1,54 @@ +diff --git a/Makefile b/Makefile +index 39cad38c44e1..e98df0336db2 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,16 +1,17 @@ + +-LIBSRCS += hdhomerun_channels.c +-LIBSRCS += hdhomerun_channelscan.c +-LIBSRCS += hdhomerun_control.c +-LIBSRCS += hdhomerun_debug.c +-LIBSRCS += hdhomerun_device.c +-LIBSRCS += hdhomerun_device_selector.c +-LIBSRCS += hdhomerun_discover.c +-LIBSRCS += hdhomerun_os_posix.c +-LIBSRCS += hdhomerun_pkt.c +-LIBSRCS += hdhomerun_sock_posix.c +-LIBSRCS += hdhomerun_video.c ++LIBSRCS += hdhomerun_channels.o ++LIBSRCS += hdhomerun_channelscan.o ++LIBSRCS += hdhomerun_control.o ++LIBSRCS += hdhomerun_debug.o ++LIBSRCS += hdhomerun_device.o ++LIBSRCS += hdhomerun_device_selector.o ++LIBSRCS += hdhomerun_discover.o ++LIBSRCS += hdhomerun_os_posix.o ++LIBSRCS += hdhomerun_pkt.o ++LIBSRCS += hdhomerun_sock_posix.o ++LIBSRCS += hdhomerun_video.o + ++AR := $(CROSS_COMPILE)ar + CC := $(CROSS_COMPILE)gcc + STRIP := $(CROSS_COMPILE)strip + +@@ -38,14 +39,17 @@ else + endif + endif + +-all : hdhomerun_config$(BINEXT) libhdhomerun$(LIBEXT) ++all : hdhomerun_config$(BINEXT) libhdhomerun.a ++ ++%.o: %.c ++ $(CC) $(CFLAGS) -fPIC -c -o $@ $< + + hdhomerun_config$(BINEXT) : hdhomerun_config.c $(LIBSRCS) + $(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@ + $(STRIP) $@ + +-libhdhomerun$(LIBEXT) : $(LIBSRCS) +- $(CC) $(CFLAGS) -fPIC -DDLL_EXPORT $(SHARED) $+ $(LDFLAGS) -o $@ ++libhdhomerun.a : $(LIBSRCS) ++ $(AR) rcs libhdhomerun.a $(LIBSRCS) + + clean : + -rm -f hdhomerun_config$(BINEXT)