This patch changes the lib from a package to common
lsof 4.98 need this lib for working.
The lib are moved to /lib. This is the recommendation from:
http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libtirpc.html
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
config/rootfiles/{packages => common}/libtirpc | 7 +++----
lfs/libtirpc | 21 ++++++++++-----------
2 files changed, 13 insertions(+), 15 deletions(-)
rename config/rootfiles/{packages => common}/libtirpc (95%)
diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/common/libtirpc
similarity index 95%
rename from config/rootfiles/packages/libtirpc
rename to config/rootfiles/common/libtirpc
index e197563..02cf846 100644
--- a/config/rootfiles/packages/libtirpc
+++ b/config/rootfiles/common/libtirpc
@@ -1,4 +1,6 @@
etc/netconfig
+lib/libtirpc.so.3
+lib/libtirpc.so.3.0.0
#usr/include/tirpc
#usr/include/tirpc/netconfig.h
#usr/include/tirpc/rpc
@@ -33,11 +35,8 @@ etc/netconfig
#usr/include/tirpc/rpcsvc
#usr/include/tirpc/rpcsvc/crypt.h
#usr/include/tirpc/rpcsvc/crypt.x
-#usr/lib/libtirpc.a
#usr/lib/libtirpc.la
-#usr/lib/libtirpc.so
-usr/lib/libtirpc.so.3
-usr/lib/libtirpc.so.3.0.0
+usr/lib/libtirpc.so
#usr/lib/pkgconfig/libtirpc.pc
#usr/share/man/man3/bindresvport.3t
#usr/share/man/man3/des_crypt.3t
diff --git a/lfs/libtirpc b/lfs/libtirpc
index 382d7e5..65466d0 100644
--- a/lfs/libtirpc
+++ b/lfs/libtirpc
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2016 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -31,10 +31,6 @@ DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libtirpc
-PAK_VER = 1
-
-DEPS = ""
###############################################################################
# Top-level Rules
@@ -54,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist:
- @$(PAK)
-
###############################################################################
# Downloading, checking, md5sum
###############################################################################
@@ -76,9 +69,15 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static \
+ --disable-gssapi \
+ --disable-ipv6
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
+ mv -v /usr/lib/libtirpc.so.* /lib
+ ln -sfv /lib/libtirpc.so.3.0.0 /usr/lib/libtirpc.so