Package: tla / 1.3.5+dfsg1-2

0009-Remove-rpath-from-libneon.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
From: Tim Gokcen <hexetic@gmail.com>
Date: Sat, 12 Nov 2011 10:34:44 +0100
Subject: Remove -rpath from libneon

---
 src/libneon/configure       |   15 ++++++++++++++-
 src/libneon/configure.in    |   14 +++++++++++++-
 src/libneon/src/Makefile.in |    2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/libneon/configure b/src/libneon/configure
index 45ab19d..a48af77 100755
--- a/src/libneon/configure
+++ b/src/libneon/configure
@@ -8155,10 +8155,23 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+top_builddir=`pwd`
+# by Marcelo Magallon <mmagallo@efis.ucr.ac.cr>
+# Turn around -rpath problem with libtool 1.0c
+# This define should be improbable enough to not conflict with anything
+case ${host} in
+	*-linux-gnu)
+		echo "$as_me:$LINENO: result: Fixing libtool for -rpath problems." >&5
+echo "${ECHO_T}Fixing libtool for -rpath problems." >&6
+		sed <${ofile} >${ofile}-2 \
+			's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
+		mv ${ofile}-2 ${ofile}
+		chmod 755 ${ofile}
+		;;
+esac
 
 
 
-top_builddir=`pwd`
 
 
 # Check whether --enable-webdav or --disable-webdav was given.
diff --git a/src/libneon/configure.in b/src/libneon/configure.in
index 6ba8603..acad847 100644
--- a/src/libneon/configure.in
+++ b/src/libneon/configure.in
@@ -40,10 +40,22 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
 
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
+top_builddir=`pwd`
+# by Marcelo Magallon <mmagallo@efis.ucr.ac.cr>
+# Turn around -rpath problem with libtool 1.0c
+# This define should be improbable enough to not conflict with anything
+case ${host} in
+	*-linux-gnu)
+		AC_MSG_RESULT([Fixing libtool for -rpath problems.])
+		sed <${ofile} >${ofile}-2 \
+			's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
+		mv ${ofile}-2 ${ofile}
+		chmod 755 ${ofile}
+		;;
+esac
 
 AC_EXEEXT
 
-top_builddir=`pwd`
 AC_SUBST(top_builddir)
 
 AC_ARG_ENABLE(webdav,
diff --git a/src/libneon/src/Makefile.in b/src/libneon/src/Makefile.in
index aff1fca..b5d9c74 100644
--- a/src/libneon/src/Makefile.in
+++ b/src/libneon/src/Makefile.in
@@ -67,7 +67,7 @@ all-no:
 	$(COMPILE) -c $< -o $@
 
 libneon.la: $(OBJECTS)
-	$(LINK) -rpath $(libdir) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS)
+	$(LINK) $(NEON_LINK_FLAGS) -o $@ $(OBJECTS) $(LIBS)
 
 libneon.a: $(OBJECTS)
 	$(AR) cru $@ $(addsuffix .o, $(basename $(OBJECTS)))