From 56cbd1f0df0da62105aae08d404c86d94c9e0edb Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Sun, 13 Dec 2020 15:58:22 -0500 Subject: [PATCH] base: Remove libtirpc from base nfs-kernel-server was moved back to the package feeed a while ago and libtirpc is in the package feed. --- package/libs/libtirpc/Makefile | 60 -------------------- package/libs/libtirpc/patches/001-musl.patch | 18 ------ 2 files changed, 78 deletions(-) delete mode 100644 package/libs/libtirpc/Makefile delete mode 100644 package/libs/libtirpc/patches/001-musl.patch diff --git a/package/libs/libtirpc/Makefile b/package/libs/libtirpc/Makefile deleted file mode 100644 index 84c5f2b9b2..0000000000 --- a/package/libs/libtirpc/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2006-2018 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libtirpc -PKG_VERSION:=1.1.4 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=https://librecmc.org/librecmc/downloads/sources/v1.4 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_HASH:=2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d - -PKG_MAINTAINER:=Andy Walsh -PKG_LICENSE:=BSD-3-Clause - -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES:=autogen.sh aclocal.m4 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk - -define Package/libtirpc - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Library TI RPC for RPC bindings - URL:=http://libtirpc.sourceforge.net/ - DEPENDS:=+libpthread -endef - -CONFIGURE_ARGS += --disable-gssapi -HOST_CONFIGURE_ARGS += --disable-gssapi - -TARGET_CFLAGS += -DGQ -HOST_CFLAGS += -DGQ - -define Package/libtirpc/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtirpc.so* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/netconfig $(1)/etc/ -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtirpc.{a,so*} $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include - $(SED) 's,/usr,${STAGING_DIR}/usr,g' $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtirpc.pc - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtirpc.pc $(1)/usr/lib/pkgconfig/libtirpc.pc -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,libtirpc)) diff --git a/package/libs/libtirpc/patches/001-musl.patch b/package/libs/libtirpc/patches/001-musl.patch deleted file mode 100644 index 0c3ce603ea..0000000000 --- a/package/libs/libtirpc/patches/001-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Consider musl provided built-in defines - -Helps compile libtirpc with musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- ./tirpc/rpc/types.h.orig 2018-03-17 10:23:10.022055255 +0100 -+++ ./tirpc/rpc/types.h 2018-03-17 10:23:30.877751656 +0100 -@@ -66,7 +66,7 @@ - #define mem_free(ptr, bsize) free(ptr) - - --#if defined __APPLE_CC__ || defined __FreeBSD__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) - # define __u_char_defined - # define __daddr_t_defined - #endif -- 2.25.1