mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 23:17:50 +00:00
libnfs: update to libnfs-9f88cb0
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
3ed9e5d88e
commit
dce4214061
@ -31,12 +31,8 @@ cd $PKG_BUILD
|
|||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--libdir=/usr/lib \
|
--libdir=/usr/lib \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--without-examples \
|
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
$MAKEINSTALL
|
$MAKEINSTALL
|
||||||
ln -sf libnfs.so.1.0.0 $SYSROOT_PREFIX/usr/lib/libnfs.so.1.0
|
|
||||||
ln -sf libnfs.so.1.0 $SYSROOT_PREFIX/usr/lib/libnfs.so.1
|
|
||||||
ln -sf libnfs.so.1 $SYSROOT_PREFIX/usr/lib/libnfs.so
|
|
||||||
|
|
||||||
|
|||||||
@ -23,8 +23,5 @@
|
|||||||
. config/options $1
|
. config/options $1
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp -P $PKG_BUILD/lib/*.so* $INSTALL/usr/lib/
|
cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib/
|
||||||
ln -sf libnfs.so.1.0.0 $INSTALL/usr/lib/libnfs.so.1.0
|
|
||||||
ln -sf libnfs.so.1.0 $INSTALL/usr/lib/libnfs.so.1
|
|
||||||
ln -sf libnfs.so.1 $INSTALL/usr/lib/libnfs.so
|
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="libnfs"
|
PKG_NAME="libnfs"
|
||||||
PKG_VERSION="81132c6"
|
PKG_VERSION="9f88cb0"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
|
|||||||
@ -1,59 +0,0 @@
|
|||||||
From 310bb382d4409c4d561025132c99b8c1850b63ad Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Raue <stephan@openelec.tv>
|
|
||||||
Date: Sat, 11 Jun 2011 23:25:07 +0200
|
|
||||||
Subject: [PATCH] add DESTDIR support, needed for crosscompiling; dont
|
|
||||||
hardcode /usr/include - use --includedir= instead on
|
|
||||||
configure time
|
|
||||||
|
|
||||||
Signed-off-by: Stephan Raue <stephan@openelec.tv>
|
|
||||||
---
|
|
||||||
Makefile.in | 25 ++++++++++---------------
|
|
||||||
1 files changed, 10 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.in b/Makefile.in
|
|
||||||
index 64f03d8..d86a1b7 100644
|
|
||||||
--- a/Makefile.in
|
|
||||||
+++ b/Makefile.in
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
prefix = @prefix@
|
|
||||||
exec_prefix = @exec_prefix@
|
|
||||||
libdir = @libdir@
|
|
||||||
+includedir = @includedir@
|
|
||||||
bindir = @bindir@
|
|
||||||
LIBS=@LIBS@
|
|
||||||
INSTALLCMD = @install@ -c
|
|
||||||
@@ -109,22 +110,16 @@ rquota/libnfs-raw-rquota.o: rquota/libnfs-raw-rquota.c rquota/libnfs-raw-rquota.
|
|
||||||
$(CC) $(CFLAGS) -c rquota/libnfs-raw-rquota.c -o $@
|
|
||||||
|
|
||||||
install: $(LIBNFS_A) $(LIBNFS_SO)
|
|
||||||
-ifeq ("$(LIBDIR)x","x")
|
|
||||||
- mkdir -p $(libdir)
|
|
||||||
- $(INSTALLCMD) -m 755 $(LIBNFS_SO) $(libdir)
|
|
||||||
- $(INSTALLCMD) -m 755 $(LIBNFS_A) $(libdir)
|
|
||||||
+ mkdir -p $(DESTDIR)$(libdir)
|
|
||||||
+ $(INSTALLCMD) -m 755 $(LIBNFS_SO) $(DESTDIR)$(libdir)
|
|
||||||
+ $(INSTALLCMD) -m 755 $(LIBNFS_A) $(DESTDIR)$(libdir)
|
|
||||||
@ldconfig@
|
|
||||||
-else
|
|
||||||
- mkdir -p $(LIBDIR)
|
|
||||||
- $(INSTALLCMD) -m 755 $(LIBISCSI_SO) $(LIBDIR)
|
|
||||||
- $(INSTALLCMD) -m 755 $(LIBNFS_A) $(LIBDIR)
|
|
||||||
-endif
|
|
||||||
- mkdir -p $(prefix)/include/nfsc
|
|
||||||
- $(INSTALLCMD) -m 644 include/libnfs.h $(prefix)/include/nfsc
|
|
||||||
- $(INSTALLCMD) -m 644 include/libnfs-private.h $(prefix)/include/nfsc
|
|
||||||
- $(INSTALLCMD) -m 644 mount/libnfs-raw-mount.h $(prefix)/include/nfsc
|
|
||||||
- $(INSTALLCMD) -m 644 nfs/libnfs-raw-nfs.h $(prefix)/include/nfsc
|
|
||||||
- $(INSTALLCMD) -m 644 portmap/libnfs-raw-portmap.h $(prefix)/include/nfsc
|
|
||||||
+ mkdir -p $(DESTDIR)$(includedir)/nfsc
|
|
||||||
+ $(INSTALLCMD) -m 644 include/libnfs.h $(DESTDIR)$(includedir)/nfsc
|
|
||||||
+ $(INSTALLCMD) -m 644 include/libnfs-private.h $(DESTDIR)$(includedir)/nfsc
|
|
||||||
+ $(INSTALLCMD) -m 644 mount/libnfs-raw-mount.h $(DESTDIR)$(includedir)/nfsc
|
|
||||||
+ $(INSTALLCMD) -m 644 nfs/libnfs-raw-nfs.h $(DESTDIR)$(includedir)/nfsc
|
|
||||||
+ $(INSTALLCMD) -m 644 portmap/libnfs-raw-portmap.h $(DESTDIR)$(includedir)/nfsc
|
|
||||||
|
|
||||||
distclean: clean
|
|
||||||
rm -f config.h config.log config.status configure Makefile
|
|
||||||
--
|
|
||||||
1.7.5.4
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From d20a6d6bcd625d0162cc7158b597e04ef3ee1379 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Raue <stephan@openelec.tv>
|
|
||||||
Date: Sat, 11 Jun 2011 23:22:19 +0200
|
|
||||||
Subject: [PATCH] Disable run of ldconfig if crosscompiling too
|
|
||||||
|
|
||||||
Signed-off-by: Stephan Raue <stephan@openelec.tv>
|
|
||||||
---
|
|
||||||
configure.ac | 4 ++++
|
|
||||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 9973c92..363e671 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -64,6 +64,10 @@ AC_ARG_WITH([ldconfig],
|
|
||||||
[ --without-ldconfig Disable call of ldconfig on make install],
|
|
||||||
[ldconfig='echo ldconfig disabled'])
|
|
||||||
|
|
||||||
+if test x"$cross_compiling" = xyes; then
|
|
||||||
+ ldconfig='echo crosscompiling: ldconfig disabled'
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
AC_CONFIG_HEADER(config.h)
|
|
||||||
|
|
||||||
EXTRA_OBJ=""
|
|
||||||
--
|
|
||||||
1.7.5.4
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user